Author: akhaldi Date: Fri Mar 5 02:07:08 2010 New Revision: 45854
URL: http://svn.reactos.org/svn/reactos?rev=45854&view=rev Log: More work on USB related definitions
Added: branches/header-work/include/psdk/usbiodef.h - copied, changed from r45846, branches/header-work/include/ddk/usbiodef.h Removed: branches/header-work/include/ddk/usbiodef.h
Removed: branches/header-work/include/ddk/usbiodef.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/usbiodef... ============================================================================== --- branches/header-work/include/ddk/usbiodef.h [iso-8859-1] (original) +++ branches/header-work/include/ddk/usbiodef.h (removed) @@ -1,52 +1,0 @@ - - -#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
Copied: branches/header-work/include/psdk/usbiodef.h (from r45846, branches/header-work/include/ddk/usbiodef.h) URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/psdk/usbiode... ============================================================================== --- branches/header-work/include/ddk/usbiodef.h [iso-8859-1] (original) +++ branches/header-work/include/psdk/usbiodef.h [iso-8859-1] Fri Mar 5 02:07:08 2010 @@ -1,17 +1,42 @@ +#pragma once
+#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_RECORD_FAILURE 10 +#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_DEVICE_HANDLE_EX 269 +#define USB_GET_TT_DEVICE_HANDLE 270 +#define USB_GET_TOPOLOGY_ADDRESS 271 +#define USB_IDLE_NOTIFICATION_EX 272 +#define USB_REQ_GLOBAL_SUSPEND 273 +#define USB_REQ_GLOBAL_RESUME 274 +#define USB_GET_HUB_CONFIG_INFO 275
-#ifndef __USBIODEF_H__ -#define __USBIODEF_H__ +#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 USB_RESET_HUB 275 +#define USB_GET_HUB_CAPABILITIES_EX 276
-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 @@ -21,32 +46,43 @@ #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 HCD_TRACE_READ_REQUEST 275 + #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) +#define USB_KERNEL_CTL_BUFFERED(id) CTL_CODE(FILE_DEVICE_USB, (id), METHOD_BUFFERED, FILE_ANY_ACCESS) + +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); + +#if (_WIN32_WINNT >= 0x0600) + +DEFINE_GUID(GUID_USB_WMI_DEVICE_PERF_INFO, 0x66c1aa3c, 0x499f, 0x49a0, 0xa9, 0xa5, 0x61, 0xe2, 0x35, 0x9f, 0x64, 0x7); +DEFINE_GUID(GUID_USB_WMI_NODE_INFO, 0x9c179357, 0xdc7a, 0x4f41, 0xb6, 0x6b, 0x32, 0x3b, 0x9d, 0xdc, 0xb5, 0xb1); +DEFINE_GUID(GUID_USB_WMI_HUB_DIAGNOSTICS, 0xad0379e4, 0x72db, 0x42ed, 0xba, 0x6e, 0x67, 0x57, 0x4, 0x79, 0x7, 0xd); +DEFINE_GUID(GUID_USB_WMI_TRACING, 0x3a61881b, 0xb4e6, 0x4bf9, 0xae, 0xf, 0x3c, 0xd8, 0xf3, 0x94, 0xe5, 0x2f); +DEFINE_GUID(GUID_USB_TRANSFER_TRACING, 0x681eb8aa, 0x403d, 0x452c, 0x9f, 0x8a, 0xf0, 0x61, 0x6f, 0xac, 0x95, 0x40); +DEFINE_GUID(GUID_USB_PERFORMANCE_TRACING, 0xd5de77a6, 0x6ae9, 0x425c, 0xb1, 0xe2, 0xf5, 0x61, 0x5f, 0xd3, 0x48, 0xa9); + #endif + +#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 + +#if (_WIN32_WINNT >= 0x0501) + +typedef VOID +(NTAPI *USB_IDLE_CALLBACK)( + IN PVOID Context); + +typedef struct _USB_IDLE_CALLBACK_INFO { + USB_IDLE_CALLBACK IdleCallback; + PVOID IdleContext; +} USB_IDLE_CALLBACK_INFO, *PUSB_IDLE_CALLBACK_INFO; + +#endif