Changeset 36941 in vbox for trunk/include

Timestamp:

May 3, 2011 2:56:08 PM (14 years ago)

Author:

vboxsync

Message:

usb rework

Location:

trunk/include/VBox

Files:

• VBoxDrvCfg-win.h (modified) (2 diffs)
• usblib-win.h (modified) (7 diffs)

trunk/include/VBox/VBoxDrvCfg-win.h

@@ -52 +52 @@
 VBOXDRVCFG_DECL(void) VBoxDrvCfgPanicSet(PFNVBOXDRVCFG_PANIC pfnPanic, void *pvPanic);
 
+/* Driver package API*/
 VBOXDRVCFG_DECL(HRESULT) VBoxDrvCfgInfInstall(IN LPCWSTR lpszInfPath);
 VBOXDRVCFG_DECL(HRESULT) VBoxDrvCfgInfUninstall(IN LPCWSTR lpszInfPath, IN DWORD fFlags);
@@ -57 +58 @@
 VBOXDRVCFG_DECL(HRESULT) VBoxDrvCfgInfUninstallAllF(IN LPCWSTR lpszClassName, IN LPCWSTR lpszPnPId, IN DWORD fFlags);
 
+/* Service API */
+VBOXDRVCFG_DECL(HRESULT) VBoxDrvCfgSvcStart(LPCWSTR lpszSvcName);
+
 RT_C_DECLS_END
 

trunk/include/VBox/usblib-win.h

@@ -42 +42 @@
 #define USBFLT_SYMBOLIC_NAME_STRING      L"\\DosDevices\\VBoxUSBFlt"
 
-#define USBMON_SERVICE_NAME              "VBoxUSBMon"
+#define USBMON_SERVICE_NAME_W              L"VBoxUSBMon"
 #define USBMON_DEVICE_NAME               "\\\\.\\VBoxUSBMon"
 #define USBMON_DEVICE_NAME_NT            L"\\Device\\VBoxUSBMon"
@@ -74 +74 @@
 #define USBFLT_MINOR_VERSION              3
 
-#define USBMON_MAJOR_VERSION              1
-#define USBMON_MINOR_VERSION              1
-
-#define USBDRV_MAJOR_VERSION              3
-#define USBDRV_MINOR_VERSION              1
+#define USBMON_MAJOR_VERSION              4
+#define USBMON_MINOR_VERSION              0
+
+#define USBDRV_MAJOR_VERSION              4
+#define USBDRV_MINOR_VERSION              0
 
 #define SUPUSB_IOCTL_TEST                 CTL_CODE(FILE_DEVICE_UNKNOWN, 0x601, METHOD_BUFFERED, FILE_WRITE_ACCESS)
@@ -103 +103 @@
 #define SUPUSBFLT_IOCTL_CAPTURE_DEVICE    CTL_CODE(FILE_DEVICE_UNKNOWN, 0x613, METHOD_BUFFERED, FILE_WRITE_ACCESS)
 #define SUPUSBFLT_IOCTL_RELEASE_DEVICE    CTL_CODE(FILE_DEVICE_UNKNOWN, 0x614, METHOD_BUFFERED, FILE_WRITE_ACCESS)
+#define SUPUSBFLT_IOCTL_RUN_FILTERS       CTL_CODE(FILE_DEVICE_UNKNOWN, 0x615, METHOD_BUFFERED, FILE_WRITE_ACCESS)
+#define SUPUSBFLT_IOCTL_SET_NOTIFY_EVENT  CTL_CODE(FILE_DEVICE_UNKNOWN, 0x616, METHOD_BUFFERED, FILE_WRITE_ACCESS)
+#define SUPUSBFLT_IOCTL_GET_DEVICE        CTL_CODE(FILE_DEVICE_UNKNOWN, 0x617, METHOD_BUFFERED, FILE_WRITE_ACCESS)
 
 #pragma pack(4)
@@ -109 +112 @@
 #define MAX_USB_SERIAL_STRING           64
 
-typedef struct
-{
+/* a user-mode handle that could be used for retriving device information
+ * from the monitor driver */
+typedef void* HVBOXUSBDEVUSR;
+
+typedef struct
+{
+    HVBOXUSBDEVUSR  hDevice;
     uint16_t        vid, did, rev;
     char            serial_hash[MAX_USB_SERIAL_STRING];
@@ -117 +125 @@
     uint8_t         fHiSpeed;
 } USBSUP_GETDEV, *PUSBSUP_GETDEV;
+
+typedef struct
+{
+    USBDEVICESTATE enmState;
+} USBSUP_GETDEV_MON, *PUSBSUP_GETDEV_MON;
 
 typedef struct
@@ -231 +244 @@
 } USBSUP_URB, *PUSBSUP_URB;
 
+typedef struct
+{
+    union
+    {
+        /* in: event handle */
+        void* hEvent;
+        /* out: result */
+        int rc;
+    } u;
+} USBSUP_SET_NOTIFY_EVENT, *PUSBSUP_SET_NOTIFY_EVENT;
+
+typedef struct
+{
+    uint16_t        usVendorId;
+    uint16_t        usProductId;
+    uint16_t        usRevision;
+    uint16_t        usAlignment;
+    char            DrvKeyName[512];
+} USBSUP_DEVID, *PUSBSUP_DEVID;
+
+typedef struct
+{
+        USBSUP_DEVID DevId;
+        char szName[512];
+        USBDEVICESTATE enmState;
+    bool fHiSpeed;
+} USBSUP_DEVINFO, *PUSBSUP_DEVINFO;
+
+typedef struct
+{
+    int rc;
+    uint32_t cDevices;
+    USBSUP_DEVINFO aDevices[1];
+} USBSUP_GET_DEVICES, *PUSBSUP_GET_DEVICES;
+
 #pragma pack()                          /* paranoia */
 
@@ -249 +297 @@
  * @param pcbNumDevices     Number of USB devices in the list
  */
-USBLIB_DECL(int) USBLibGetDevices(PUSBDEVICE *ppDevices,  uint32_t *pcbNumDevices);
-
-/**
- * Check for USB device arrivals or removals
- *
- * @returns boolean
- */
-USBLIB_DECL(bool) USBLibHasPendingDeviceChanges(void);
-
-/**
- * Capture specified USB device
- *
- * @returns VBox status code
- * @param usVendorId        Vendor id
- * @param usProductId       Product id
- * @param usRevision        Revision
- */
-USBLIB_DECL(int) USBLibCaptureDevice(uint16_t usVendorId, uint16_t usProductId, uint16_t usRevision);
-
-/**
- * Release specified USB device to the host.
- *
- * @returns VBox status code
- * @param usVendorId        Vendor id
- * @param usProductId       Product id
- * @param usRevision        Revision
- */
-USBLIB_DECL(int) USBLibReleaseDevice(uint16_t usVendorId, uint16_t usProductId, uint16_t usRevision);
+USBLIB_DECL(int) USBLibGetDevices(PUSBDEVICE *ppDevices, uint32_t *pcbNumDevices);
+
+USBLIB_DECL(int) USBLibWaitChange(RTMSINTERVAL cMillies);
+
+USBLIB_DECL(int) USBLibInterruptWaitChange();
+
+USBLIB_DECL(int) USBLibRunFilters();
 
 /** @} */