[ros-diffs] [greatlrd] 24816: adding some new ddk header, the info are base/got from windows xp ddk kit version 3790.1830

Author: greatlrd
Date: Thu Nov 23 23:19:54 2006
New Revision: 24816

URL: http://svn.reactos.org/svn/reactos?rev=24816&view=rev
Log:
adding some new ddk header, the info are base/got from windows xp ddk kit version
3790.1830 

Added:
    trunk/reactos/include/ddk/objerror.h
Modified:
    trunk/reactos/include/ddk/dmemmgr.h
    trunk/reactos/include/ddk/ntddbeep.h
    trunk/reactos/include/ddk/ntddtdi.h
    trunk/reactos/include/ddk/ntnls.h
    trunk/reactos/include/ddk/usbiodef.h

Modified: trunk/reactos/include/ddk/dmemmgr.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/dmemmgr.h?rev=…
==============================================================================
--- trunk/reactos/include/ddk/dmemmgr.h (original)
+++ trunk/reactos/include/ddk/dmemmgr.h Thu Nov 23 23:19:54 2006
@@ -25,16 +25,16 @@
 #endif
 
 #define SURFACEALIGN_DISCARDABLE 0x00000001
-#define VMEMHEAP_LINEAR			 0x00000001 
-#define VMEMHEAP_RECTANGULAR	 0x00000002
-#define VMEMHEAP_ALIGNMENT  	 0x00000004
+#define VMEMHEAP_LINEAR 0x00000001 
+#define VMEMHEAP_RECTANGULAR 0x00000002
+#define VMEMHEAP_ALIGNMENT 0x00000004
 
 typedef struct _VMEML
 {
   struct _VMEML *next;
   FLATPTR ptr;
   DWORD size;
-  BOOL  bDiscardable;
+  BOOL bDiscardable;
 } VMEML, *LPVMEML, *LPLPVMEML;
 
 typedef struct _VMEMR
@@ -47,16 +47,15 @@
   struct _VMEMR *pLeft;
   struct _VMEMR *pRight;
   FLATPTR  ptr;
-  DWORD		size;
-  DWORD     x;
-  DWORD     y;
-  DWORD     cx;
-  DWORD     cy;
-  DWORD		flags;
-  FLATPTR    pBits;
-  BOOL  bDiscardable;
+  DWORD size;
+  DWORD x;
+  DWORD y;
+  DWORD cx;
+  DWORD cy;
+  DWORD flags;
+  FLATPTR pBits;
+  BOOL bDiscardable;
 } VMEMR,  *LPVMEMR,  *LPLPVMEMR;
-
 
 typedef struct _SURFACEALIGNMENT
 {
@@ -64,10 +63,10 @@
   {
     struct
     {
-      DWORD       dwStartAlignment;
-      DWORD       dwPitchAlignment;
-      DWORD       dwFlags;
-      DWORD       dwReserved2;
+      DWORD dwStartAlignment;
+      DWORD dwPitchAlignment;
+      DWORD dwFlags;
+      DWORD dwReserved2;
     } Linear;
     struct
     {
@@ -81,9 +80,9 @@
 
 typedef struct _HEAPALIGNMENT
 {
-    DWORD            dwSize;
-    DDSCAPS          ddsCaps;
-    DWORD            dwReserved;
+    DWORD dwSize;
+    DDSCAPS ddsCaps;
+    DWORD dwReserved;
     SURFACEALIGNMENT ExecuteBuffer;
     SURFACEALIGNMENT Overlay;
     SURFACEALIGNMENT Texture;
@@ -93,42 +92,40 @@
     SURFACEALIGNMENT FlipTarget;
 } HEAPALIGNMENT, *LPHEAPALIGNMENT;
 
-
 typedef struct _VMEMHEAP
 {
-    DWORD   dwFlags;
-    DWORD   stride;
-    LPVOID  freeList;
-    LPVOID  allocList;
-    DWORD   dwTotalSize;
+    DWORD dwFlags;
+    DWORD stride;
+    LPVOID freeList;
+    LPVOID allocList;
+    DWORD dwTotalSize;
     FLATPTR fpGARTLin;
     FLATPTR fpGARTDev;
-    DWORD   dwCommitedSize;     
-    DWORD   dwCoalesceCount;
+    DWORD dwCommitedSize;     
+    DWORD dwCoalesceCount;
     HEAPALIGNMENT Alignment;
-    DDSCAPSEX   ddsCapsEx;
-    DDSCAPSEX   ddsCapsExAlt;
+    DDSCAPSEX ddsCapsEx;
+    DDSCAPSEX ddsCapsExAlt;
 #ifndef IS_16
     LARGE_INTEGER liPhysAGPBase;
 #endif
-    HANDLE        hdevAGP;
-    LPVOID        pvPhysRsrv;
-    BYTE*         pAgpCommitMask;
-    DWORD         dwAgpCommitMaskSize;
-} VMEMHEAP;
-
-typedef VMEMHEAP FAR *LPVMEMHEAP;
+    HANDLE hdevAGP;
+    LPVOID pvPhysRsrv;
+    BYTE* pAgpCommitMask;
+    DWORD dwAgpCommitMaskSize;
+} VMEMHEAP, *LPVMEMHEAP;
 
 typedef struct _DD_GETHEAPALIGNMENTDATA
 {
-    ULONG_PTR     dwInstance; 
-    DWORD         dwHeap;
-    HRESULT       ddRVal;
-    VOID*         GetHeapAlignment;
+    ULONG_PTR dwInstance; 
+    DWORD dwHeap;
+    HRESULT ddRVal;
+    VOID* GetHeapAlignment;
     HEAPALIGNMENT Alignment;
 } DD_GETHEAPALIGNMENTDATA, *PDD_GETHEAPALIGNMENTDATA;
 
 extern void WINAPI VidMemFree( LPVMEMHEAP pvmh, FLATPTR ptr);
+extern FLATPTR WINAPI VidMemAlloc( LPVMEMHEAP pvmh, DWORD width, DWORD height);
 
 extern FLATPTR WINAPI 
        HeapVidMemAllocAligned(
@@ -139,9 +136,9 @@
                                LPLONG lpNewPitch );
 
 
-#ifndef __NTDDKCOMP__
-extern FLATPTR WINAPI VidMemAlloc( LPVMEMHEAP pvmh, DWORD width, DWORD height);
-#endif
+
+
+
 
 #ifdef __cplusplus
 };

Modified: trunk/reactos/include/ddk/ntddbeep.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntddbeep.h?rev…
==============================================================================
--- trunk/reactos/include/ddk/ntddbeep.h (original)
+++ trunk/reactos/include/ddk/ntddbeep.h Thu Nov 23 23:19:54 2006
@@ -1,52 +1,26 @@
-/*
- * ntddbeep.h
- *
- * Beep device IOCTL interface
- *
- * This file is part of the w32api package.
- *
- * Contributors:
- *   Created by Casper S. Hornstrup <chorns(a)users.sourceforge.net>
- *
- * THIS SOFTWARE IS NOT COPYRIGHTED
- *
- * This source code is offered for use in the public domain. You may
- * use, modify or distribute it freely.
- *
- * This code is distributed in the hope that it will be useful but
- * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- * DISCLAIMED. This includes but is not limited to warranties of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- */
 
-#ifndef __NTDDBEEP_H
-#define __NTDDBEEP_H
+#ifndef _NTDDBEEP_
+#define _NTDDBEEP_
 
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#define DD_BEEP_DEVICE_NAME               "\\Device\\Beep"
-#define DD_BEEP_DEVICE_NAME_U             L"\\Device\\Beep"
+#define DD_BEEP_DEVICE_NAME    "\\Device\\Beep"
+#define DD_BEEP_DEVICE_NAME_U  L"\\Device\\Beep"
+#define BEEP_FREQUENCY_MINIMUM 0x25
+#define BEEP_FREQUENCY_MAXIMUM 0x7FFF
+#define IOCTL_BEEP_SET         CTL_CODE(FILE_DEVICE_BEEP, 0, METHOD_BUFFERED,
FILE_ANY_ACCESS)
 
-#define IOCTL_BEEP_SET \
-  CTL_CODE(FILE_DEVICE_BEEP, 0, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-typedef struct _BEEP_SET_PARAMETERS {
-	ULONG  Frequency;
-	ULONG  Duration;
+typedef struct _BEEP_SET_PARAMETERS 
+{
+   ULONG Frequency;
+   ULONG Duration;
 } BEEP_SET_PARAMETERS, *PBEEP_SET_PARAMETERS;
-
-#define BEEP_FREQUENCY_MINIMUM            0x25
-#define BEEP_FREQUENCY_MAXIMUM            0x7FFF
 
 #ifdef __cplusplus
 }
 #endif
+#endif 
 
-#endif /* __NTDDBEEP_H */

Modified: trunk/reactos/include/ddk/ntddtdi.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntddtdi.h?rev=…
==============================================================================
--- trunk/reactos/include/ddk/ntddtdi.h (original)
+++ trunk/reactos/include/ddk/ntddtdi.h Thu Nov 23 23:19:54 2006
@@ -1,59 +1,30 @@
-/*
- * ntddtdi.h
- *
- * TDI IOCTL interface
- *
- * This file is part of the w32api package.
- *
- * Contributors:
- *   Created by Casper S. Hornstrup <chorns(a)users.sourceforge.net>
- *
- * THIS SOFTWARE IS NOT COPYRIGHTED
- *
- * This source code is offered for use in the public domain. You may
- * use, modify or distribute it freely.
- *
- * This code is distributed in the hope that it will be useful but
- * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- * DISCLAIMED. This includes but is not limited to warranties of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- */
 
-#ifndef __NTDDTDI_H
-#define __NTDDTDI_H
-
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
+#ifndef _NTDDTDI_
+#define _NTDDTDI_
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#define DD_TDI_DEVICE_NAME                "\\Device\\UNKNOWN"
-#define DD_TDI_DEVICE_NAME_U              L"\\Device\\UNKNOWN"
-
-#define _TDI_CONTROL_CODE(Request, Method) \
-  CTL_CODE(FILE_DEVICE_TRANSPORT, Request, Method, FILE_ANY_ACCESS)
-
-#define IOCTL_TDI_ACCEPT                  _TDI_CONTROL_CODE(0,  METHOD_BUFFERED)
-#define IOCTL_TDI_CONNECT                 _TDI_CONTROL_CODE(1,  METHOD_BUFFERED)
-#define IOCTL_TDI_DISCONNECT              _TDI_CONTROL_CODE(2,  METHOD_BUFFERED)
-#define IOCTL_TDI_LISTEN                  _TDI_CONTROL_CODE(3,  METHOD_BUFFERED)
-#define IOCTL_TDI_QUERY_INFORMATION       _TDI_CONTROL_CODE(4,  METHOD_OUT_DIRECT)
-#define IOCTL_TDI_RECEIVE                 _TDI_CONTROL_CODE(5,  METHOD_OUT_DIRECT)
-#define IOCTL_TDI_RECEIVE_DATAGRAM        _TDI_CONTROL_CODE(6,  METHOD_OUT_DIRECT)
-#define IOCTL_TDI_SEND                    _TDI_CONTROL_CODE(7,  METHOD_IN_DIRECT)
-#define IOCTL_TDI_SEND_DATAGRAM           _TDI_CONTROL_CODE(8,  METHOD_IN_DIRECT)
-#define IOCTL_TDI_SET_EVENT_HANDLER       _TDI_CONTROL_CODE(9,  METHOD_BUFFERED)
-#define IOCTL_TDI_SET_INFORMATION         _TDI_CONTROL_CODE(10, METHOD_IN_DIRECT)
-#define IOCTL_TDI_ASSOCIATE_ADDRESS       _TDI_CONTROL_CODE(11, METHOD_BUFFERED)
-#define IOCTL_TDI_DISASSOCIATE_ADDRESS    _TDI_CONTROL_CODE(12, METHOD_BUFFERED)
-#define IOCTL_TDI_ACTION                  _TDI_CONTROL_CODE(13, METHOD_OUT_DIRECT)
+#define DD_TDI_DEVICE_NAME "\\Device\\UNKNOWN"
+#define _TDI_CONTROL_CODE(request,method)   CTL_CODE(FILE_DEVICE_TRANSPORT, request,
method, FILE_ANY_ACCESS)
+#define IOCTL_TDI_ACCEPT                    _TDI_CONTROL_CODE( 0, METHOD_BUFFERED )
+#define IOCTL_TDI_CONNECT                   _TDI_CONTROL_CODE( 1, METHOD_BUFFERED )
+#define IOCTL_TDI_DISCONNECT                _TDI_CONTROL_CODE( 2, METHOD_BUFFERED )
+#define IOCTL_TDI_LISTEN                    _TDI_CONTROL_CODE( 3, METHOD_BUFFERED )
+#define IOCTL_TDI_QUERY_INFORMATION         _TDI_CONTROL_CODE( 4, METHOD_OUT_DIRECT )
+#define IOCTL_TDI_RECEIVE                   _TDI_CONTROL_CODE( 5, METHOD_OUT_DIRECT )
+#define IOCTL_TDI_RECEIVE_DATAGRAM          _TDI_CONTROL_CODE( 6, METHOD_OUT_DIRECT )
+#define IOCTL_TDI_SEND                      _TDI_CONTROL_CODE( 7, METHOD_IN_DIRECT )
+#define IOCTL_TDI_SEND_DATAGRAM             _TDI_CONTROL_CODE( 8, METHOD_IN_DIRECT )
+#define IOCTL_TDI_SET_EVENT_HANDLER         _TDI_CONTROL_CODE( 9, METHOD_BUFFERED )
+#define IOCTL_TDI_SET_INFORMATION           _TDI_CONTROL_CODE( 10, METHOD_IN_DIRECT )
+#define IOCTL_TDI_ASSOCIATE_ADDRESS         _TDI_CONTROL_CODE( 11, METHOD_BUFFERED )
+#define IOCTL_TDI_DISASSOCIATE_ADDRESS      _TDI_CONTROL_CODE( 12, METHOD_BUFFERED )
+#define IOCTL_TDI_ACTION                    _TDI_CONTROL_CODE( 13, METHOD_OUT_DIRECT )
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif /* __NTDDTDI_H */
+#endif 

Modified: trunk/reactos/include/ddk/ntnls.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntnls.h?rev=24…
==============================================================================
--- trunk/reactos/include/ddk/ntnls.h (original)
+++ trunk/reactos/include/ddk/ntnls.h Thu Nov 23 23:19:54 2006
@@ -1,52 +1,37 @@
-/*
- * ntnls.h
- *
- * Structures and definitions for NLS data types.
- *
- * This file is part of the w32api package.
- *
- * Contributors:
- *   Created by Alex Ionescu <alex(a)relsoft.net>
- *
- * THIS SOFTWARE IS NOT COPYRIGHTED
- *
- * This source code is offered for use in the public domain. You may
- * use, modify or distribute it freely.
- *
- * This code is distributed in the hope that it will be useful but
- * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- * DISCLAIMED. This includes but is not limited to warranties of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- */
 
-#ifndef __NTNLS_H
-#define __NTNLS_H
+#ifndef _NTNLS_
+#define _NTNLS_
 
+
+#ifdef __cplusplus
+extern "C" {
+#endif
 #define MAXIMUM_LEADBYTES 12
-
 typedef struct _CPTABLEINFO 
 {
-  USHORT  CodePage;
-  USHORT  MaximumCharacterSize;
-  USHORT  DefaultChar;
-  USHORT  UniDefaultChar;
-  USHORT  TransDefaultChar;
-  USHORT  TransUniDefaultChar;
-  USHORT  DBCSCodePage;
-  UCHAR  LeadByte[MAXIMUM_LEADBYTES];
-  PUSHORT  MultiByteTable;
-  PVOID  WideCharTable;
-  PUSHORT  DBCSRanges;
-  PUSHORT  DBCSOffsets;
+   USHORT  CodePage;
+   USHORT  MaximumCharacterSize;
+   USHORT  DefaultChar;
+   USHORT  UniDefaultChar;
+   USHORT  TransDefaultChar;
+   USHORT  TransUniDefaultChar;
+   USHORT  DBCSCodePage;
+   UCHAR LeadByte[MAXIMUM_LEADBYTES];
+   PUSHORT MultiByteTable;
+   PVOID WideCharTable;
+   PUSHORT DBCSRanges;
+   PUSHORT DBCSOffsets;
 } CPTABLEINFO, *PCPTABLEINFO;
 
 typedef struct _NLSTABLEINFO 
 {
-  CPTABLEINFO  OemTableInfo;
-  CPTABLEINFO  AnsiTableInfo;
-  PUSHORT  UpperCaseTable;
-  PUSHORT  LowerCaseTable;
+   CPTABLEINFO OemTableInfo;
+   CPTABLEINFO AnsiTableInfo;
+   PUSHORT UpperCaseTable;
+   PUSHORT LowerCaseTable;
 } NLSTABLEINFO, *PNLSTABLEINFO;
 
-#endif /* __NTNLS_H */
+#ifdef __cplusplus
+}
+#endif
+#endif 

Added: trunk/reactos/include/ddk/objerror.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/objerror.h?rev…
==============================================================================
--- trunk/reactos/include/ddk/objerror.h (added)
+++ trunk/reactos/include/ddk/objerror.h Thu Nov 23 23:19:54 2006
@@ -1,0 +1,13 @@
+
+/* $Id$
+ *
+ * COPYRIGHT:            See COPYING in the top level directory
+ * PROJECT:              ReactOS kernel
+ * FILE:                 
+ * PURPOSE:              Directx headers
+ * PROGRAMMER:           Magnus Olsen (greatlrd)
+ *
+ */
+
+#include <winerror.h>
+

Modified: trunk/reactos/include/ddk/usbiodef.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/usbiodef.h?rev…
==============================================================================
--- trunk/reactos/include/ddk/usbiodef.h (original)
+++ trunk/reactos/include/ddk/usbiodef.h Thu Nov 23 23:19:54 2006
@@ -1,104 +1,52 @@
-/*
- * usbiodef.h
- *
- * USB IOCTL definitions
- *
- * This file is part of the w32api package.
- *
- * Contributors:
- *   Created by Casper S. Hornstrup &lt;chorns(a)users.sourceforge.net&gt;
- *
- * THIS SOFTWARE IS NOT COPYRIGHTED
- *
- * This source code is offered for use in the public domain. You may
- * use, modify or distribute it freely.
- *
- * This code is distributed in the hope that it will be useful but
- * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- * DISCLAIMED. This includes but is not limited to warranties of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- */
 
-#ifndef __USBIODEF_H
-#define __USBIODEF_H
 
-#if __GNUC__ >=3
-#pragma GCC system_header
+#ifndef   __USBIODEF_H__
+#define   __USBIODEF_H__
+
+DEFINE_GUID(GUID_DEVINTERFACE_USB_HUB, 0xF18A0E88, 0xc30C, 0x11D0, 0x88, 0x15, 0x00,
0xA0, 0xC9, 0x06, 0xBE, 0xD8);
+DEFINE_GUID(GUID_DEVINTERFACE_USB_DEVICE, 0xA5DCBF10L, 0x6530, 0x11D2, 0x90, 0x1F, 0x00,
0xC0, 0x4F, 0xB9, 0x51, 0xED);
+DEFINE_GUID(GUID_DEVINTERFACE_USB_HOST_CONTROLLER, 0x3ABF6F2D, 0x71C4, 0x462A, 0x8A,
0x92, 0x1E, 0x68, 0x61, 0xE6, 0xAF, 0x27);
+DEFINE_GUID(GUID_USB_WMI_STD_DATA, 0x4E623B20L, 0xCB14, 0x11D1, 0xB3, 0x31, 0x00, 0xA0,
0xC9, 0x59, 0xBB, 0xD2);
+DEFINE_GUID(GUID_USB_WMI_STD_NOTIFICATION, 0x4E623B20L, 0xCB14, 0x11D1, 0xB3, 0x31, 0x00,
0xA0, 0xC9, 0x59, 0xBB, 0xD2);
+
+#define GUID_CLASS_USBHUB GUID_DEVINTERFACE_USB_HUB
+#define GUID_CLASS_USB_DEVICE GUID_DEVINTERFACE_USB_DEVICE
+#define GUID_CLASS_USB_HOST_CONTROLLER GUID_DEVINTERFACE_USB_HOST_CONTROLLER
+#define HCD_GET_STATS_1 255
+#define HCD_DIAGNOSTIC_MODE_ON 256
+#define HCD_DIAGNOSTIC_MODE_OFF 257
+#define HCD_GET_ROOT_HUB_NAME 258
+#define HCD_GET_DRIVERKEY_NAME 265
+#define HCD_GET_STATS_2 266
+#define HCD_DISABLE_PORT 268
+#define HCD_ENABLE_PORT 269
+#define HCD_USER_REQUEST 270
+#define USB_SUBMIT_URB 0
+#define USB_RESET_PORT 1
+#define USB_GET_ROOTHUB_PDO 3
+#define USB_GET_PORT_STATUS 4
+#define USB_ENABLE_PORT 5
+#define USB_GET_HUB_COUNT 6
+#define USB_CYCLE_PORT 7
+#define USB_GET_HUB_NAME 8
+#define USB_IDLE_NOTIFICATION 9
+#define USB_GET_BUS_INFO 264
+#define USB_GET_CONTROLLER_NAME 265
+#define USB_GET_BUSGUID_INFO 266
+#define USB_GET_PARENT_HUB_INFO 267
+#define USB_GET_DEVICE_HANDLE 268
+#define USB_GET_NODE_INFORMATION 258
+#define USB_GET_NODE_CONNECTION_INFORMATION 259
+#define USB_GET_DESCRIPTOR_FROM_NODE_CONNECTION 260
+#define USB_GET_NODE_CONNECTION_NAME 261
+#define USB_DIAG_IGNORE_HUBS_ON 262
+#define USB_DIAG_IGNORE_HUBS_OFF 263
+#define USB_GET_NODE_CONNECTION_DRIVERKEY_NAME 264
+#define USB_GET_HUB_CAPABILITIES 271
+#define USB_GET_NODE_CONNECTION_ATTRIBUTES 272
+#define	USB_HUB_CYCLE_PORT 273
+#define USB_GET_NODE_CONNECTION_INFORMATION_EX 274
+#define FILE_DEVICE_USB         FILE_DEVICE_UNKNOWN
+#define USB_CTL(id)  CTL_CODE(FILE_DEVICE_USB, (id), METHOD_BUFFERED, FILE_ANY_ACCESS)
+#define USB_KERNEL_CTL(id)  CTL_CODE(FILE_DEVICE_USB, (id), METHOD_NEITHER,
FILE_ANY_ACCESS)
 #endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-DEFINE_GUID(GUID_DEVINTERFACE_USB_HUB, \
-  0xf18a0e88, 0xc30c, 0x11d0, 0x88, 0x15, 0x00, 0xa0, 0xc9, 0x06, 0xbe, 0xd8);
-
-DEFINE_GUID(GUID_DEVINTERFACE_USB_DEVICE,
-  0xA5DCBF10L, 0x6530, 0x11D2, 0x90, 0x1F, 0x00, 0xC0, 0x4F, 0xB9, 0x51, 0xED);
-
-DEFINE_GUID(GUID_DEVINTERFACE_USB_HOST_CONTROLLER,
-  0x3abf6f2d, 0x71c4, 0x462a, 0x8a, 0x92, 0x1e, 0x68, 0x61, 0xe6, 0xaf, 0x27);
-
-DEFINE_GUID(GUID_USB_WMI_STD_DATA,
-  0x4E623B20L, 0xCB14, 0x11D1, 0xB3, 0x31, 0x00, 0xA0, 0xC9, 0x59, 0xBB, 0xD2);
-
-DEFINE_GUID(GUID_USB_WMI_STD_NOTIFICATION,
-  0x4E623B20L, 0xCB14, 0x11D1, 0xB3, 0x31, 0x00, 0xA0, 0xC9, 0x59, 0xBB, 0xD2);
-
-#define GUID_CLASS_USBHUB                 GUID_DEVINTERFACE_USB_HUB
-#define GUID_CLASS_USB_DEVICE             GUID_DEVINTERFACE_USB_DEVICE
-#define GUID_CLASS_USB_HOST_CONTROLLER    GUID_DEVINTERFACE_USB_HOST_CONTROLLER
-
-#define USB_SUBMIT_URB                    0
-#define USB_RESET_PORT                    1
-#define USB_GET_ROOTHUB_PDO               3
-#define USB_GET_PORT_STATUS               4
-#define USB_ENABLE_PORT                   5
-#define USB_GET_HUB_COUNT                 6
-#define USB_CYCLE_PORT                    7
-#define USB_GET_HUB_NAME                  8
-#define USB_IDLE_NOTIFICATION             9
-#define USB_GET_BUS_INFO                  264
-#define USB_GET_CONTROLLER_NAME           265
-#define USB_GET_BUSGUID_INFO              266
-#define USB_GET_PARENT_HUB_INFO           267
-#define USB_GET_DEVICE_HANDLE             268
-
-#define HCD_GET_STATS_1                   255
-#define HCD_DIAGNOSTIC_MODE_ON            256
-#define HCD_DIAGNOSTIC_MODE_OFF           257
-#define HCD_GET_ROOT_HUB_NAME             258
-#define HCD_GET_DRIVERKEY_NAME            265
-#define HCD_GET_STATS_2                   266
-#define HCD_DISABLE_PORT                  268
-#define HCD_ENABLE_PORT                   269
-#define HCD_USER_REQUEST                  270
-
-#define USB_GET_NODE_INFORMATION                258
-#define USB_GET_NODE_CONNECTION_INFORMATION     259
-#define USB_GET_DESCRIPTOR_FROM_NODE_CONNECTION 260
-#define USB_GET_NODE_CONNECTION_NAME            261
-#define USB_DIAG_IGNORE_HUBS_ON                 262
-#define USB_DIAG_IGNORE_HUBS_OFF                263
-#define USB_GET_NODE_CONNECTION_DRIVERKEY_NAME  264
-#define USB_GET_HUB_CAPABILITIES                271
-#define USB_GET_NODE_CONNECTION_ATTRIBUTES      272
-
-#define FILE_DEVICE_USB                   FILE_DEVICE_UNKNOWN
-
-#define USB_CTL(id) CTL_CODE(FILE_DEVICE_USB, \
-														 (id), \
-														 METHOD_BUFFERED, \
-														 FILE_ANY_ACCESS)
-
-#define USB_KERNEL_CTL(id) CTL_CODE(FILE_DEVICE_USB, \
-                                    (id), \
-                                    METHOD_NEITHER, \
-                                    FILE_ANY_ACCESS)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __USBIODEF_H */