[ros-diffs] [sir_richard] 48865: [PSDK/DDK]: Last couple of fixes to headers. Classpnp can compile (and link) now.

Author: sir_richard
Date: Sat Sep 25 05:46:31 2010
New Revision: 48865

URL: http://svn.reactos.org/svn/reactos?rev=48865&view=rev
Log:
[PSDK/DDK]: Last couple of fixes to headers. Classpnp can compile (and link) now.

Modified:
    trunk/reactos/include/ddk/classpnp.h
    trunk/reactos/include/psdk/ntddstor.h

Modified: trunk/reactos/include/ddk/classpnp.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/classpnp.h?rev…
==============================================================================
--- trunk/reactos/include/ddk/classpnp.h [iso-8859-1] (original)
+++ trunk/reactos/include/ddk/classpnp.h [iso-8859-1] Sat Sep 25 05:46:31 2010
@@ -17,6 +17,12 @@
 #define SRB_CLASS_FLAGS_PERSISTANT        0x20000000
 #define SRB_CLASS_FLAGS_PAGING            0x40000000
 #define SRB_CLASS_FLAGS_FREE_MDL          0x80000000
+
+#define ASSERT_FDO(x) \
+    ASSERT(((PCOMMON_DEVICE_EXTENSION) (x)->DeviceExtension)->IsFdo)
+
+#define ASSERT_PDO(x) \
+    ASSERT(!(((PCOMMON_DEVICE_EXTENSION) (x)->DeviceExtension)->IsFdo))
 
 #define IS_CLEANUP_REQUEST(majorFunction)   \
   ((majorFunction == IRP_MJ_CLOSE) ||       \
@@ -177,6 +183,17 @@
 #define GUID_CLASSPNP_WORKING_SET     {0x105701b0, 0x9e9b, 0x47cb, {0x97, 0x80, 0x81,
0x19, 0x8a, 0xf7, 0xb5, 0x24}}
 
 #define DEFAULT_FAILURE_PREDICTION_PERIOD 60 * 60 * 1
+
+static inline ULONG CountOfSetBitsUChar(UCHAR _X)
+{ ULONG i = 0; while (_X) { _X &= _X - 1; i++; } return i; }
+static inline ULONG CountOfSetBitsULong(ULONG _X)
+{ ULONG i = 0; while (_X) { _X &= _X - 1; i++; } return i; }
+static inline ULONG CountOfSetBitsULong32(ULONG32 _X)
+{ ULONG i = 0; while (_X) { _X &= _X - 1; i++; } return i; }
+static inline ULONG CountOfSetBitsULong64(ULONG64 _X)
+{ ULONG i = 0; while (_X) { _X &= _X - 1; i++; } return i; }
+static inline ULONG CountOfSetBitsUlongPtr(ULONG_PTR _X)
+{ ULONG i = 0; while (_X) { _X &= _X - 1; i++; } return i; }
 
 typedef enum _MEDIA_CHANGE_DETECTION_STATE {
   MediaUnknown,
@@ -772,6 +789,14 @@
   PVOID Context);
 
 SCSIPORTAPI
+NTSTATUS
+NTAPI
+ClassIoCompleteAssociated(
+  PDEVICE_OBJECT DeviceObject,
+  PIRP Irp,
+  PVOID Context);
+
+SCSIPORTAPI
 BOOLEAN
 NTAPI
 ClassInterpretSenseInfo(
@@ -860,6 +885,13 @@
 ClassClaimDevice(
   PDEVICE_OBJECT LowerDeviceObject,
   BOOLEAN Release);
+  
+SCSIPORTAPI
+NTSTATUS
+NTAPI
+ClassInternalIoControl (
+  PDEVICE_OBJECT DeviceObject,
+  PIRP Irp);
 
 SCSIPORTAPI
 VOID

Modified: trunk/reactos/include/psdk/ntddstor.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntddstor.h?re…
==============================================================================
--- trunk/reactos/include/psdk/ntddstor.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/ntddstor.h [iso-8859-1] Sat Sep 25 05:46:31 2010
@@ -124,10 +124,10 @@
   CTL_CODE(IOCTL_STORAGE_BASE, 0x0301, METHOD_BUFFERED, FILE_ANY_ACCESS)
 
 #define IOCTL_STORAGE_RESET_BUS \
-  CTL_CODE(IOCTL_STORAGE_BASE, 0x0400, METHOD_BUFFERED, FILE_READ_ACCESS |
FILE_WRITE_ACCESS)
+  CTL_CODE(IOCTL_STORAGE_BASE, 0x0400, METHOD_BUFFERED, FILE_READ_ACCESS)
 
 #define IOCTL_STORAGE_RESET_DEVICE \
-  CTL_CODE(IOCTL_STORAGE_BASE, 0x0401, METHOD_BUFFERED, FILE_READ_ACCESS |
FILE_WRITE_ACCESS)
+  CTL_CODE(IOCTL_STORAGE_BASE, 0x0401, METHOD_BUFFERED, FILE_READ_ACCESS)
 
 #define IOCTL_STORAGE_GET_DEVICE_NUMBER \
   CTL_CODE(IOCTL_STORAGE_BASE, 0x0420, METHOD_BUFFERED, FILE_ANY_ACCESS)