[ros-diffs] [mkupfer] 37458: - revert winioctl.h to previous version (for compatibility) - add additional partition types to rosioctl.h - adapt freeloader to rosioctl.h

[mkupfer at svn.reactos.org]

Author: mkupfer
Date: Wed Nov 19 08:28:24 2008
New Revision: 37458

URL: http://svn.reactos.org/svn/reactos?rev=37458&view=rev
Log:
- revert winioctl.h to previous version (for compatibility)
- add additional partition types to rosioctl.h
- adapt freeloader to rosioctl.h

Added:
    trunk/reactos/include/reactos/rosioctl.h   (with props)
Modified:
    trunk/reactos/boot/freeldr/freeldr/include/disk.h
    trunk/reactos/include/psdk/winioctl.h

Modified: trunk/reactos/boot/freeldr/freeldr/include/disk.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/include/disk.h?rev=37458&r1=37457&r2=37458&view=diff
==============================================================================
--- trunk/reactos/boot/freeldr/freeldr/include/disk.h [iso-8859-1] (original)
+++ trunk/reactos/boot/freeldr/freeldr/include/disk.h [iso-8859-1] Wed Nov 19 08:28:24 2008
@@ -20,6 +20,7 @@
 #ifndef __DISK_H
 #define __DISK_H
 
+#include <reactos/rosioctl.h>
 
 typedef struct _GEOMETRY
 {
@@ -79,7 +80,7 @@
 #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 @@
 #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 @@
 #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
 
 ///////////////////////////////////////////////////////////////////////////////////////
 //

Modified: trunk/reactos/include/psdk/winioctl.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winioctl.h?rev=37458&r1=37457&r2=37458&view=diff
==============================================================================
--- trunk/reactos/include/psdk/winioctl.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/winioctl.h [iso-8859-1] Wed Nov 19 08:28:24 2008
@@ -159,9 +159,6 @@
 #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

Added: trunk/reactos/include/reactos/rosioctl.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/rosioctl.h?rev=37458&view=auto
==============================================================================
--- trunk/reactos/include/reactos/rosioctl.h (added)
+++ trunk/reactos/include/reactos/rosioctl.h [iso-8859-1] Wed Nov 19 08:28:24 2008
@@ -1,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 at 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 */
+

Propchange: trunk/reactos/include/reactos/rosioctl.h
------------------------------------------------------------------------------
    svn:eol-style = native