vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Move OS-dependent file definitions to include/grub/osdep/hostfile*.h.

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2013-10-09 08:20:20 +02:00
parent 37149a2f20
commit 761c718b52
8 changed files with 154 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

42
include/grub/emu/hostdisk.h
View file

@ -23,41 +23,7 @@
#include <grub/disk.h>
#include <grub/partition.h>
#include <sys/types.h>
#if defined (__AROS__)
struct grub_util_fd
{
enum { GRUB_UTIL_FD_FILE, GRUB_UTIL_FD_DISK } type;
grub_uint64_t off;
union
{
int fd;
struct {
struct IOExtTD *ioreq;
struct MsgPort *mp;
unsigned int is_floppy:1;
unsigned int is_64:1;
};
};
};
typedef struct grub_util_fd *grub_util_fd_t;
#define GRUB_UTIL_FD_INVALID NULL
#define GRUB_UTIL_FD_IS_VALID(x) ((x) != GRUB_UTIL_FD_INVALID)
#define GRUB_UTIL_FD_STAT_IS_FUNCTIONAL 0
#elif defined (__CYGWIN__) || defined (__MINGW32__)
#include <windows.h>
typedef HANDLE grub_util_fd_t;
#define GRUB_UTIL_FD_INVALID INVALID_HANDLE_VALUE
#define GRUB_UTIL_FD_IS_VALID(x) ((x) != GRUB_UTIL_FD_INVALID)
#define GRUB_UTIL_FD_STAT_IS_FUNCTIONAL 0
#else
typedef int grub_util_fd_t;
#define GRUB_UTIL_FD_INVALID -1
#define GRUB_UTIL_FD_IS_VALID(x) ((x) >= 0)
#define GRUB_UTIL_FD_STAT_IS_FUNCTIONAL 1
#endif
#include <grub/osdep/hostfile.h>
grub_util_fd_t
grub_util_fd_open (const char *os_dev, int flags);
@ -124,12 +90,6 @@ grub_hostdisk_find_partition_start_os (const char *dev);
void
grub_hostdisk_flush_initial_buffer (const char *os_dev);
#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__APPLE__) || defined(__NetBSD__) || defined (__sun__) || defined(__OpenBSD__)
#define GRUB_DISK_DEVS_ARE_CHAR 1
#else
#define GRUB_DISK_DEVS_ARE_CHAR 0
#endif
struct grub_util_hostdisk_data
{
char *dev;

20
include/grub/emu/misc.h
View file

@ -24,19 +24,7 @@
#include <grub/symbol.h>
#include <grub/types.h>
#if defined (__AROS__)
# define DEFAULT_DIRECTORY "SYS:" GRUB_BOOT_DIR_NAME "/" GRUB_DIR_NAME
#elif defined __CYGWIN__ || defined (__MINGW32__)
# define DEFAULT_DIRECTORY "C:\\"GRUB_BOOT_DIR_NAME"\\"GRUB_DIR_NAME
#elif defined (__NetBSD__)
/* NetBSD uses /boot for its boot block. */
# define DEFAULT_DIRECTORY "/"GRUB_DIR_NAME
#else
# define DEFAULT_DIRECTORY "/"GRUB_BOOT_DIR_NAME"/"GRUB_DIR_NAME
#endif
#define DEFAULT_DEVICE_MAP DEFAULT_DIRECTORY "/device.map"
#include <grub/osdep/hostfile.h>
extern int verbosity;
extern const char *program_name;
@ -63,12 +51,6 @@ void EXPORT_FUNC(grub_util_error) (const char *fmt, ...) __attribute__ ((format
extern char * canonicalize_file_name (const char *path);
#ifdef __MINGW32__
int fsync (int fno);
#endif
#ifdef HAVE_DEVICE_MAPPER
int grub_device_mapper_supported (void);
#endif