Convert line endings to LF
In r33670 the svn:eol-style property was dropped, which took care of locally converting the line endings to the user's native style. While most files use Unix-style LF line endings, some files have Windows-style CR LF line endings. Assure that the following r37262 directories use Unix-style line endings: src/system/boot/ src/system/boot/arch/ src/system/boot/arch/ppc/ src/system/boot/loader/ src/system/boot/loader/net/ src/system/boot/platform/ src/system/boot/platform/openfirmware/ src/system/boot/platform/openfirmware/arch/ src/system/boot/platform/openfirmware/arch/ppc/ src/system/kernel/ src/system/kernel/arch/ src/system/kernel/arch/ppc/ src/system/kernel/platform/ src/system/kernel/platform/openfirmware/ headers/private/kernel/ headers/private/kernel/arch/ headers/private/kernel/arch/ppc/ headers/private/kernel/platform/ headers/private/kernel/platform/openfirmware/ headers/private/kernel/boot/ headers/private/kernel/boot/net/ headers/private/kernel/boot/platform/ headers/private/kernel/boot/platform/openfirmware/ This avoids patches containing irrelevant lines unintentionally converted. No functional changes. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@37265 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Andreas Färber
@@ -1,79 +1,79 @@
|
||||
/*
|
||||
* Copyright 2008, François Revol <[email protected]>.
|
||||
* All rights reserved. Distributed under the terms of the MIT License.
|
||||
*/
|
||||
|
||||
#ifndef _BOOT_FILE_MAP_DISK_H
|
||||
#define _BOOT_FILE_MAP_DISK_H
|
||||
|
||||
#include <boot/vfs.h>
|
||||
#include <boot/partitions.h>
|
||||
|
||||
#define FMAP_FOLDER_NAME "BEOS"
|
||||
#define FMAP_IMAGE_NAME "IMAGE.BE"
|
||||
//#define FMAP_FOLDER_NAME "HAIKU"
|
||||
//#define FMAP_IMAGE_NAME "IMAGE.BFS"
|
||||
|
||||
#define FMAP_MAX_RUNS 128
|
||||
|
||||
struct file_map_run {
|
||||
off_t offset;
|
||||
off_t block;
|
||||
off_t len;
|
||||
};
|
||||
|
||||
struct file_map_boot_item {
|
||||
int32 block_size;
|
||||
int32 num_runs;
|
||||
struct file_map_run runs[FMAP_MAX_RUNS];
|
||||
};
|
||||
|
||||
#ifdef _BOOT_MODE
|
||||
|
||||
class FileMap {
|
||||
public:
|
||||
FileMap();
|
||||
~FileMap();
|
||||
void AddRun(off_t offset, off_t block, off_t len);
|
||||
|
||||
private:
|
||||
struct file_map_run fRuns[FMAP_MAX_RUNS];
|
||||
};
|
||||
|
||||
class FileMapDisk : public Node {
|
||||
public:
|
||||
FileMapDisk();
|
||||
virtual ~FileMapDisk();
|
||||
|
||||
status_t Init(Node *node/*Partition *partition, FileMap *map, off_t imageSize*/);
|
||||
|
||||
virtual status_t Open(void **_cookie, int mode);
|
||||
virtual status_t Close(void *cookie);
|
||||
|
||||
|
||||
virtual ssize_t ReadAt(void *cookie, off_t pos, void *buffer,
|
||||
size_t bufferSize);
|
||||
virtual ssize_t WriteAt(void *cookie, off_t pos, const void *buffer,
|
||||
size_t bufferSize);
|
||||
|
||||
virtual status_t GetName(char *nameBuffer, size_t bufferSize) const;
|
||||
virtual status_t GetFileMap(struct file_map_run *runs, int32 *count);
|
||||
virtual off_t Size() const;
|
||||
|
||||
static FileMapDisk *FindAnyFileMapDisk(Directory *volume);
|
||||
|
||||
status_t RegisterFileMapBootItem();
|
||||
|
||||
private:
|
||||
Node *fNode;
|
||||
/*
|
||||
Partition *fPartition;
|
||||
FileMap *fMap;
|
||||
off_t fImageSize;
|
||||
*/
|
||||
|
||||
};
|
||||
|
||||
#endif // _BOOT_MODE
|
||||
|
||||
#endif // _BOOT_FILE_MAP_DISK_H
|
||||
/*
|
||||
* Copyright 2008, François Revol <[email protected]>.
|
||||
* All rights reserved. Distributed under the terms of the MIT License.
|
||||
*/
|
||||
|
||||
#ifndef _BOOT_FILE_MAP_DISK_H
|
||||
#define _BOOT_FILE_MAP_DISK_H
|
||||
|
||||
#include <boot/vfs.h>
|
||||
#include <boot/partitions.h>
|
||||
|
||||
#define FMAP_FOLDER_NAME "BEOS"
|
||||
#define FMAP_IMAGE_NAME "IMAGE.BE"
|
||||
//#define FMAP_FOLDER_NAME "HAIKU"
|
||||
//#define FMAP_IMAGE_NAME "IMAGE.BFS"
|
||||
|
||||
#define FMAP_MAX_RUNS 128
|
||||
|
||||
struct file_map_run {
|
||||
off_t offset;
|
||||
off_t block;
|
||||
off_t len;
|
||||
};
|
||||
|
||||
struct file_map_boot_item {
|
||||
int32 block_size;
|
||||
int32 num_runs;
|
||||
struct file_map_run runs[FMAP_MAX_RUNS];
|
||||
};
|
||||
|
||||
#ifdef _BOOT_MODE
|
||||
|
||||
class FileMap {
|
||||
public:
|
||||
FileMap();
|
||||
~FileMap();
|
||||
void AddRun(off_t offset, off_t block, off_t len);
|
||||
|
||||
private:
|
||||
struct file_map_run fRuns[FMAP_MAX_RUNS];
|
||||
};
|
||||
|
||||
class FileMapDisk : public Node {
|
||||
public:
|
||||
FileMapDisk();
|
||||
virtual ~FileMapDisk();
|
||||
|
||||
status_t Init(Node *node/*Partition *partition, FileMap *map, off_t imageSize*/);
|
||||
|
||||
virtual status_t Open(void **_cookie, int mode);
|
||||
virtual status_t Close(void *cookie);
|
||||
|
||||
|
||||
virtual ssize_t ReadAt(void *cookie, off_t pos, void *buffer,
|
||||
size_t bufferSize);
|
||||
virtual ssize_t WriteAt(void *cookie, off_t pos, const void *buffer,
|
||||
size_t bufferSize);
|
||||
|
||||
virtual status_t GetName(char *nameBuffer, size_t bufferSize) const;
|
||||
virtual status_t GetFileMap(struct file_map_run *runs, int32 *count);
|
||||
virtual off_t Size() const;
|
||||
|
||||
static FileMapDisk *FindAnyFileMapDisk(Directory *volume);
|
||||
|
||||
status_t RegisterFileMapBootItem();
|
||||
|
||||
private:
|
||||
Node *fNode;
|
||||
/*
|
||||
Partition *fPartition;
|
||||
FileMap *fMap;
|
||||
off_t fImageSize;
|
||||
*/
|
||||
|
||||
};
|
||||
|
||||
#endif // _BOOT_MODE
|
||||
|
||||
#endif // _BOOT_FILE_MAP_DISK_H
|
||||
|
||||
@@ -1,28 +1,28 @@
|
||||
/*
|
||||
* Copyright 2005, Ingo Weinhold <[email protected]>.
|
||||
* Distributed under the terms of the MIT License.
|
||||
*/
|
||||
#ifndef KERNEL_BOOT_ARCH_H
|
||||
#define KERNEL_BOOT_ARCH_H
|
||||
|
||||
#include <SupportDefs.h>
|
||||
#include <boot/elf.h>
|
||||
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
/* ELF support */
|
||||
|
||||
extern status_t boot_arch_elf_relocate_rel(struct preloaded_image *image,
|
||||
struct Elf32_Rel *rel, int rel_len);
|
||||
extern status_t boot_arch_elf_relocate_rela(struct preloaded_image *image,
|
||||
struct Elf32_Rela *rel, int rel_len);
|
||||
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif /* KERNEL_BOOT_ARCH_H */
|
||||
/*
|
||||
* Copyright 2005, Ingo Weinhold <[email protected]>.
|
||||
* Distributed under the terms of the MIT License.
|
||||
*/
|
||||
#ifndef KERNEL_BOOT_ARCH_H
|
||||
#define KERNEL_BOOT_ARCH_H
|
||||
|
||||
#include <SupportDefs.h>
|
||||
#include <boot/elf.h>
|
||||
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
/* ELF support */
|
||||
|
||||
extern status_t boot_arch_elf_relocate_rel(struct preloaded_image *image,
|
||||
struct Elf32_Rel *rel, int rel_len);
|
||||
extern status_t boot_arch_elf_relocate_rela(struct preloaded_image *image,
|
||||
struct Elf32_Rela *rel, int rel_len);
|
||||
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif /* KERNEL_BOOT_ARCH_H */
|
||||
|
||||
@@ -1,54 +1,54 @@
|
||||
/*
|
||||
* Copyright 2005, Ingo Weinhold <[email protected]>.
|
||||
* All rights reserved. Distributed under the terms of the MIT License.
|
||||
*/
|
||||
|
||||
#ifndef _BOOT_REMOTE_DISK_H
|
||||
#define _BOOT_REMOTE_DISK_H
|
||||
|
||||
#include <boot/vfs.h>
|
||||
#include <boot/net/NetDefs.h>
|
||||
#include <boot/net/RemoteDiskDefs.h>
|
||||
|
||||
class UDPPacket;
|
||||
class UDPSocket;
|
||||
|
||||
class RemoteDisk : public Node {
|
||||
public:
|
||||
RemoteDisk();
|
||||
~RemoteDisk();
|
||||
|
||||
status_t Init(ip_addr_t serverAddress, uint16 serverPort, off_t imageSize);
|
||||
|
||||
virtual ssize_t ReadAt(void *cookie, off_t pos, void *buffer,
|
||||
size_t bufferSize);
|
||||
virtual ssize_t WriteAt(void *cookie, off_t pos, const void *buffer,
|
||||
size_t bufferSize);
|
||||
|
||||
virtual status_t GetName(char *nameBuffer, size_t bufferSize) const;
|
||||
virtual off_t Size() const;
|
||||
|
||||
ip_addr_t ServerIPAddress() const;
|
||||
uint16 ServerPort() const;
|
||||
|
||||
static RemoteDisk *FindAnyRemoteDisk();
|
||||
|
||||
private:
|
||||
ssize_t _ReadFromPacket(off_t &pos, uint8 *&buffer, size_t &bufferSize);
|
||||
|
||||
static status_t _SendRequest(UDPSocket *socket, ip_addr_t serverAddress,
|
||||
uint16 serverPort, remote_disk_header *request, size_t size,
|
||||
uint8 expectedReply, UDPPacket **packet);
|
||||
status_t _SendRequest(remote_disk_header *request, size_t size,
|
||||
uint8 expectedReply, UDPPacket **packet);
|
||||
|
||||
private:
|
||||
ip_addr_t fServerAddress;
|
||||
uint16 fServerPort;
|
||||
off_t fImageSize;
|
||||
uint64 fRequestID;
|
||||
UDPSocket *fSocket;
|
||||
UDPPacket *fPacket;
|
||||
};
|
||||
|
||||
#endif // _BOOT_REMOTE_DISK_H
|
||||
/*
|
||||
* Copyright 2005, Ingo Weinhold <[email protected]>.
|
||||
* All rights reserved. Distributed under the terms of the MIT License.
|
||||
*/
|
||||
|
||||
#ifndef _BOOT_REMOTE_DISK_H
|
||||
#define _BOOT_REMOTE_DISK_H
|
||||
|
||||
#include <boot/vfs.h>
|
||||
#include <boot/net/NetDefs.h>
|
||||
#include <boot/net/RemoteDiskDefs.h>
|
||||
|
||||
class UDPPacket;
|
||||
class UDPSocket;
|
||||
|
||||
class RemoteDisk : public Node {
|
||||
public:
|
||||
RemoteDisk();
|
||||
~RemoteDisk();
|
||||
|
||||
status_t Init(ip_addr_t serverAddress, uint16 serverPort, off_t imageSize);
|
||||
|
||||
virtual ssize_t ReadAt(void *cookie, off_t pos, void *buffer,
|
||||
size_t bufferSize);
|
||||
virtual ssize_t WriteAt(void *cookie, off_t pos, const void *buffer,
|
||||
size_t bufferSize);
|
||||
|
||||
virtual status_t GetName(char *nameBuffer, size_t bufferSize) const;
|
||||
virtual off_t Size() const;
|
||||
|
||||
ip_addr_t ServerIPAddress() const;
|
||||
uint16 ServerPort() const;
|
||||
|
||||
static RemoteDisk *FindAnyRemoteDisk();
|
||||
|
||||
private:
|
||||
ssize_t _ReadFromPacket(off_t &pos, uint8 *&buffer, size_t &bufferSize);
|
||||
|
||||
static status_t _SendRequest(UDPSocket *socket, ip_addr_t serverAddress,
|
||||
uint16 serverPort, remote_disk_header *request, size_t size,
|
||||
uint8 expectedReply, UDPPacket **packet);
|
||||
status_t _SendRequest(remote_disk_header *request, size_t size,
|
||||
uint8 expectedReply, UDPPacket **packet);
|
||||
|
||||
private:
|
||||
ip_addr_t fServerAddress;
|
||||
uint16 fServerPort;
|
||||
off_t fImageSize;
|
||||
uint64 fRequestID;
|
||||
UDPSocket *fSocket;
|
||||
UDPPacket *fPacket;
|
||||
};
|
||||
|
||||
#endif // _BOOT_REMOTE_DISK_H
|
||||
|
||||
@@ -1,64 +1,64 @@
|
||||
/*
|
||||
* Copyright 2005-2007, Ingo Weinhold <[email protected]>.
|
||||
* All rights reserved. Distributed under the terms of the MIT License.
|
||||
*/
|
||||
#ifndef _BOOT_REMOTE_DISK_DEFS_H
|
||||
#define _BOOT_REMOTE_DISK_DEFS_H
|
||||
|
||||
|
||||
#include <inttypes.h>
|
||||
|
||||
|
||||
enum {
|
||||
REMOTE_DISK_SERVER_PORT = 8765,
|
||||
REMOTE_DISK_BLOCK_SIZE = 1024,
|
||||
};
|
||||
|
||||
enum {
|
||||
// requests
|
||||
|
||||
REMOTE_DISK_HELLO_REQUEST = 0,
|
||||
// port: client port
|
||||
|
||||
REMOTE_DISK_READ_REQUEST = 1,
|
||||
// port: client port
|
||||
// offset: byte offset of data to read
|
||||
// size: number of bytes to read (server might serve more, though)
|
||||
|
||||
REMOTE_DISK_WRITE_REQUEST = 2,
|
||||
// port: client port
|
||||
// offset: byte offset of data to write
|
||||
// size: number of bytes to write
|
||||
// data: the data
|
||||
|
||||
// replies
|
||||
|
||||
REMOTE_DISK_HELLO_REPLY = 3,
|
||||
// offset: disk size
|
||||
|
||||
REMOTE_DISK_READ_REPLY = 4, // port unused
|
||||
// offset: byte offset of read data
|
||||
// size: number of bytes of data read; < 0 => error
|
||||
// data: read data
|
||||
|
||||
REMOTE_DISK_WRITE_REPLY = 5, // port, data unused
|
||||
// offset: byte offset of data written
|
||||
// size: number of bytes of data written; < 0 => error
|
||||
};
|
||||
|
||||
// errors
|
||||
enum {
|
||||
REMOTE_DISK_IO_ERROR = -1,
|
||||
REMOTE_DISK_BAD_REQUEST = -2,
|
||||
};
|
||||
|
||||
struct remote_disk_header {
|
||||
uint64_t offset;
|
||||
uint64_t request_id;
|
||||
int16_t size;
|
||||
uint16_t port;
|
||||
uint8_t command;
|
||||
uint8_t data[0];
|
||||
} __attribute__ ((__packed__));
|
||||
|
||||
#endif // _BOOT_REMOTE_DISK_DEFS_H
|
||||
/*
|
||||
* Copyright 2005-2007, Ingo Weinhold <[email protected]>.
|
||||
* All rights reserved. Distributed under the terms of the MIT License.
|
||||
*/
|
||||
#ifndef _BOOT_REMOTE_DISK_DEFS_H
|
||||
#define _BOOT_REMOTE_DISK_DEFS_H
|
||||
|
||||
|
||||
#include <inttypes.h>
|
||||
|
||||
|
||||
enum {
|
||||
REMOTE_DISK_SERVER_PORT = 8765,
|
||||
REMOTE_DISK_BLOCK_SIZE = 1024,
|
||||
};
|
||||
|
||||
enum {
|
||||
// requests
|
||||
|
||||
REMOTE_DISK_HELLO_REQUEST = 0,
|
||||
// port: client port
|
||||
|
||||
REMOTE_DISK_READ_REQUEST = 1,
|
||||
// port: client port
|
||||
// offset: byte offset of data to read
|
||||
// size: number of bytes to read (server might serve more, though)
|
||||
|
||||
REMOTE_DISK_WRITE_REQUEST = 2,
|
||||
// port: client port
|
||||
// offset: byte offset of data to write
|
||||
// size: number of bytes to write
|
||||
// data: the data
|
||||
|
||||
// replies
|
||||
|
||||
REMOTE_DISK_HELLO_REPLY = 3,
|
||||
// offset: disk size
|
||||
|
||||
REMOTE_DISK_READ_REPLY = 4, // port unused
|
||||
// offset: byte offset of read data
|
||||
// size: number of bytes of data read; < 0 => error
|
||||
// data: read data
|
||||
|
||||
REMOTE_DISK_WRITE_REPLY = 5, // port, data unused
|
||||
// offset: byte offset of data written
|
||||
// size: number of bytes of data written; < 0 => error
|
||||
};
|
||||
|
||||
// errors
|
||||
enum {
|
||||
REMOTE_DISK_IO_ERROR = -1,
|
||||
REMOTE_DISK_BAD_REQUEST = -2,
|
||||
};
|
||||
|
||||
struct remote_disk_header {
|
||||
uint64_t offset;
|
||||
uint64_t request_id;
|
||||
int16_t size;
|
||||
uint16_t port;
|
||||
uint8_t command;
|
||||
uint8_t data[0];
|
||||
} __attribute__ ((__packed__));
|
||||
|
||||
#endif // _BOOT_REMOTE_DISK_DEFS_H
|
||||
|
||||
@@ -1,22 +1,22 @@
|
||||
/*
|
||||
* Copyright 2005-2006, Ingo Weinhold <[email protected]>.
|
||||
* All rights reserved. Distributed under the terms of the MIT License.
|
||||
*/
|
||||
|
||||
#ifndef _KERNEL_OPEN_FIRMWARE_DEVICES_H
|
||||
#define _KERNEL_OPEN_FIRMWARE_DEVICES_H
|
||||
|
||||
#include <SupportDefs.h>
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
status_t of_get_next_device(int *_cookie, int root, const char *type,
|
||||
char *path, size_t pathSize);
|
||||
|
||||
#ifdef __cplusplus
|
||||
} // extern "C"
|
||||
#endif
|
||||
|
||||
#endif /* _KERNEL_OPEN_FIRMWARE_DEVICES_H */
|
||||
/*
|
||||
* Copyright 2005-2006, Ingo Weinhold <[email protected]>.
|
||||
* All rights reserved. Distributed under the terms of the MIT License.
|
||||
*/
|
||||
|
||||
#ifndef _KERNEL_OPEN_FIRMWARE_DEVICES_H
|
||||
#define _KERNEL_OPEN_FIRMWARE_DEVICES_H
|
||||
|
||||
#include <SupportDefs.h>
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
status_t of_get_next_device(int *_cookie, int root, const char *type,
|
||||
char *path, size_t pathSize);
|
||||
|
||||
#ifdef __cplusplus
|
||||
} // extern "C"
|
||||
#endif
|
||||
|
||||
#endif /* _KERNEL_OPEN_FIRMWARE_DEVICES_H */
|
||||
|
||||
Reference in New Issue
Block a user