Merge freeldr from amd64 branch:

[reactos.git] / reactos / boot / freeldr / freeldr / include / disk.h

diff --git a/reactos/boot/freeldr/freeldr/include/disk.h b/reactos/boot/freeldr/freeldr/include/disk.h
index 3ecbef1..d9f6138 100644 (file)
--- a/reactos/boot/freeldr/freeldr/include/disk.h
+++ b/reactos/boot/freeldr/freeldr/include/disk.h
@@ -20,6 +20,7 @@
 #ifndef __DISK_H
 #define __DISK_H
 
+#include <reactos/rosioctl.h>
 
 typedef struct _GEOMETRY
 {
@@ -79,7 +80,7 @@ typedef struct _MASTER_BOOT_RECORD
 #include <poppack.h>
 
 //
-// Partition type defines
+// Partition type defines (of PSDK)
 //
 #define PARTITION_ENTRY_UNUSED          0x00      // Entry unused
 #define PARTITION_FAT_12                0x01      // 12-bit FAT entries
@@ -89,7 +90,6 @@ typedef struct _MASTER_BOOT_RECORD
 #define PARTITION_EXTENDED              0x05      // Extended partition entry
 #define PARTITION_HUGE                  0x06      // Huge partition MS-DOS V4
 #define PARTITION_IFS                   0x07      // IFS Partition
-#define PARTITION_OS2BOOTMGR            0x0A      // OS/2 Boot Manager/OPUS/Coherent swap
 #define PARTITION_FAT32                 0x0B      // FAT32
 #define PARTITION_FAT32_XINT13          0x0C      // FAT32 using extended int13 services
 #define PARTITION_XINT13                0x0E      // Win95 partition using extended int13 services
@@ -98,22 +98,20 @@ typedef struct _MASTER_BOOT_RECORD
 #define PARTITION_PREP                  0x41      // PowerPC Reference Platform (PReP) Boot Partition
 #define PARTITION_LDM                   0x42      // Logical Disk Manager partition
 #define PARTITION_UNIX                  0x63      // Unix
-#define PARTITION_LINUX_SWAP                   0x82      // Linux Swap Partition
-#define PARTITION_EXT2                                 0x83      // Linux Ext2/Ext3
 
 ///////////////////////////////////////////////////////////////////////////////////////
 //
 // i386 BIOS Disk Functions (i386disk.c)
 //
 ///////////////////////////////////////////////////////////////////////////////////////
-#ifdef __i386__
+#if defined(__i386__) || defined(_M_AMD64)
 
 BOOLEAN        DiskResetController(ULONG DriveNumber);
 BOOLEAN        DiskInt13ExtensionsSupported(ULONG DriveNumber);
 //VOID DiskStopFloppyMotor(VOID);
 BOOLEAN        DiskGetExtendedDriveParameters(ULONG DriveNumber, PVOID Buffer, USHORT BufferSize);
 
-#endif // defined __i386__
+#endif // defined __i386__ || defined(_M_AMD64)
 
 ///////////////////////////////////////////////////////////////////////////////////////
 //