- revert winioctl.h to previous version (for compatibility)

- add additional partition types to rosioctl.h
- adapt freeloader to rosioctl.h

svn path=/trunk/; revision=37458
This commit is contained in:
Matthias Kupfer 2008-11-19 14:28:24 +00:00
parent 5fef6df569
commit 141eb9a2df
3 changed files with 25 additions and 7 deletions

View file

@ -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,8 +98,6 @@ 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
///////////////////////////////////////////////////////////////////////////////////////
//

View file

@ -159,9 +159,6 @@ extern "C" {
#define PARTITION_PREP 0x41
#define PARTITION_LDM 0x42
#define PARTITION_UNIX 0x63
#define PARTITION_LINUX_SWAP 0x82
#define PARTITION_LINUX 0x83
#define PARTITION_LINUX_LVM 0x8E
#define PARTITION_NTFT 128
#define VALID_NTFT 0xC0
#define METHOD_BUFFERED 0

View file

@ -0,0 +1,23 @@
/*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS PSDK extensions
* FILE: include/reactos/rosioctl.h
* PURPOSE: Additional partition types
* (partition types not covered by winioctl.h of PSDK)
*
* PROGRAMMERS: Matthias Kupfer (mkupfer@reactos.com)
*/
#ifndef __ROSIOCTL_H
#define __ROSIOCTL_H
#define PARTITION_OS2BOOTMGR 0x0A // OS/2 Boot Manager/OPUS/Coherent swap
#define PARTITION_LINUX_SWAP 0x82 // Linux Swap Partition
#define PARTITION_LINUX 0x83 // Linux Partition Ext2/Ext3/Ext4
#define PARTITION_EXT2 PARTITION_LINUX // some apps use this identifier
#define PARTITION_LINUX_LVM 0x8E
#endif /* __ROSIOCTL_H */
/* EOF */