Merge duplicate definitions Modified: trunk/reactos/ntoskrnl/ex/resource.c Modified: trunk/reactos/ntoskrnl/include/internal/io.h Modified: trunk/reactos/ntoskrnl/io/arcname.c Modified: trunk/reactos/ntoskrnl/io/disk.c _____
Modified: trunk/reactos/ntoskrnl/ex/resource.c --- trunk/reactos/ntoskrnl/ex/resource.c 2005-11-25 14:38:59 UTC (rev 19554) +++ trunk/reactos/ntoskrnl/ex/resource.c 2005-11-25 14:40:28 UTC (rev 19555) @@ -32,7 +32,6 @@
* */
-#define ResourceOwnedExclusive 0x80 #define ResourceDisableBoost 0x08
/* INCLUDES *****************************************************************/ _____
Modified: trunk/reactos/ntoskrnl/include/internal/io.h --- trunk/reactos/ntoskrnl/include/internal/io.h 2005-11-25 14:38:59 UTC (rev 19554) +++ trunk/reactos/ntoskrnl/include/internal/io.h 2005-11-25 14:40:28 UTC (rev 19555) @@ -3,6 +3,46 @@
#include <ddk/ntdddisk.h>
+/* STRUCTURES ***************************************************************/ + +typedef struct _DISKENTRY +{ + LIST_ENTRY ListEntry; + ULONG DiskNumber; + ULONG Signature; + ULONG Checksum; + PDEVICE_OBJECT DeviceObject; +} DISKENTRY, *PDISKENTRY; + +#define PARTITION_TBL_SIZE 4 + +#include <pshpack1.h> + +typedef struct _PARTITION +{ + unsigned char BootFlags; /* bootable? 0=no, 128=yes */ + unsigned char StartingHead; /* beginning head number */ + unsigned char StartingSector; /* beginning sector number */ + unsigned char StartingCylinder; /* 10 bit nmbr, with high 2 bits put in begsect */ + unsigned char PartitionType; /* Operating System type indicator code */ + unsigned char EndingHead; /* ending head number */ + unsigned char EndingSector; /* ending sector number */ + unsigned char EndingCylinder; /* also a 10 bit nmbr, with same high 2 bit trick */ + unsigned int StartingBlock; /* first sector relative to start of disk */ + unsigned int SectorCount; /* number of sectors in partition */ +} PARTITION, *PPARTITION; + +typedef struct _PARTITION_SECTOR +{ + UCHAR BootCode[440]; /* 0x000 */ + ULONG Signature; /* 0x1B8 */ + UCHAR Reserved[2]; /* 0x1BC */ + PARTITION Partition[PARTITION_TBL_SIZE]; /* 0x1BE */ + USHORT Magic; /* 0x1FE */ +} PARTITION_SECTOR, *PPARTITION_SECTOR; + +#include <poppack.h> + #define IO_METHOD_FROM_CTL_CODE(ctlCode) (ctlCode&0x00000003)
extern POBJECT_TYPE IoCompletionType; _____
Modified: trunk/reactos/ntoskrnl/io/arcname.c --- trunk/reactos/ntoskrnl/io/arcname.c 2005-11-25 14:38:59 UTC (rev 19554) +++ trunk/reactos/ntoskrnl/io/arcname.c 2005-11-25 14:40:28 UTC (rev 19555) @@ -19,46 +19,6 @@
#define FS_VOLUME_BUFFER_SIZE (MAX_PATH + sizeof(FILE_FS_VOLUME_INFORMATION))
-/* STRUCTURES ***************************************************************/ - -typedef struct _DISKENTRY -{ - LIST_ENTRY ListEntry; - ULONG DiskNumber; - ULONG Signature; - ULONG Checksum; - PDEVICE_OBJECT DeviceObject; -} DISKENTRY, *PDISKENTRY; - -#define PARTITION_TBL_SIZE 4 - -#include <pshpack1.h> - -typedef struct _PARTITION -{ - unsigned char BootFlags; /* bootable? 0=no, 128=yes */ - unsigned char StartingHead; /* beginning head number */ - unsigned char StartingSector; /* beginning sector number */ - unsigned char StartingCylinder; /* 10 bit nmbr, with high 2 bits put in begsect */ - unsigned char PartitionType; /* Operating System type indicator code */ - unsigned char EndingHead; /* ending head number */ - unsigned char EndingSector; /* ending sector number */ - unsigned char EndingCylinder; /* also a 10 bit nmbr, with same high 2 bit trick */ - unsigned int StartingBlock; /* first sector relative to start of disk */ - unsigned int SectorCount; /* number of sectors in partition */ -} PARTITION, *PPARTITION; - -typedef struct _PARTITION_SECTOR -{ - UCHAR BootCode[440]; /* 0x000 */ - ULONG Signature; /* 0x1B8 */ - UCHAR Reserved[2]; /* 0x1BC */ - PARTITION Partition[PARTITION_TBL_SIZE]; /* 0x1BE */ - USHORT Magic; /* 0x1FE */ -} PARTITION_SECTOR, *PPARTITION_SECTOR; - -#include <poppack.h> - /* FUNCTIONS ****************************************************************/
STATIC _____
Modified: trunk/reactos/ntoskrnl/io/disk.c --- trunk/reactos/ntoskrnl/io/disk.c 2005-11-25 14:38:59 UTC (rev 19554) +++ trunk/reactos/ntoskrnl/io/disk.c 2005-11-25 14:40:28 UTC (rev 19555) @@ -16,38 +16,12 @@
/* LOCAL MACROS and TYPES ***************************************************/
-#define AUTO_DRIVE ((ULONG)-1) +#define AUTO_DRIVE ((ULONG)-1)
-#define PARTITION_MAGIC 0xaa55 +#define PARTITION_MAGIC 0xaa55
-#define PARTITION_TBL_SIZE 4 - #include <pshpack1.h>
-typedef struct _PARTITION -{ - unsigned char BootFlags; /* bootable? 0=no, 128=yes */ - unsigned char StartingHead; /* beginning head number */ - unsigned char StartingSector; /* beginning sector number */ - unsigned char StartingCylinder; /* 10 bit nmbr, with high 2 bits put in begsect */ - unsigned char PartitionType; /* Operating System type indicator code */ - unsigned char EndingHead; /* ending head number */ - unsigned char EndingSector; /* ending sector number */ - unsigned char EndingCylinder; /* also a 10 bit nmbr, with same high 2 bit trick */ - unsigned int StartingBlock; /* first sector relative to start of disk */ - unsigned int SectorCount; /* number of sectors in partition */ -} PARTITION, *PPARTITION; - - -typedef struct _PARTITION_SECTOR -{ - UCHAR BootCode[440]; /* 0x000 */ - ULONG Signature; /* 0x1B8 */ - UCHAR Reserved[2]; /* 0x1BC */ - PARTITION Partition[PARTITION_TBL_SIZE]; /* 0x1BE */ - USHORT Magic; /* 0x1FE */ -} PARTITION_SECTOR, *PPARTITION_SECTOR; - typedef struct _REG_DISK_MOUNT_INFO { ULONG Signature; @@ -56,7 +30,6 @@
#include <poppack.h>
- typedef enum _DISK_MANAGER { NoDiskManager,