Changeset 8769 in vbox

Timestamp:

May 12, 2008 1:41:10 AM (17 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

30754

Message:

Unifying the USBLib stuff.

Location:

trunk/include/VBox

Files:

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

trunk/include/VBox/usblib-win.h

@@ -134 +134 @@
     int             rc;     /* The return code. */
 } USBSUP_FLTADDOUT, *PUSBSUP_FLTADDOUT;
-    
+
 typedef struct
 {
@@ -223 +223 @@
     void                    *buf;           /* [in/out] depends on dir */
     uint32_t                numIsoPkts;     /* [in] number of isochronous packets (8 max) */
-    USBSUP_ISOCPKT          aIsoPkts[8];    /* [in/out] isochronous packet descriptors */    
+    USBSUP_ISOCPKT          aIsoPkts[8];    /* [in/out] isochronous packet descriptors */
 } USBSUP_URB, *PUSBSUP_URB;
 
@@ -236 +236 @@
  * @{
  */
-
-/**
- * Initialize the USB library
- *
- * @returns VBox status code.
- */
-VBOXDDU_DECL(int) usbLibInit();
-
-/**
- * Terminate the USB library
- *
- * @returns VBox status code.
- */
-VBOXDDU_DECL(int) usbLibTerm();
-
-/**
- * Add USB device filter
- *
- * @returns VBox status code.
- * @param   pFilter         USB filter structure
- * @param   ppID            Pointer to filter id
- */
-VBOXDDU_DECL(int) usbLibInsertFilter(PCUSBFILTER pFilter, void **ppID);
-
-/**
- * Remove USB device filter
- *
- * @returns VBox status code.
- * @param   aID             Filter id
- */
-VBOXDDU_DECL(int) usbLibRemoveFilter (void *aID);
 
 /**
@@ -275 +244 @@
  * @param pcbNumDevices     Number of USB devices in the list
  */
-VBOXDDU_DECL(int) usbLibGetDevices(PUSBDEVICE *ppDevices,  uint32_t *pcbNumDevices);
+VBOXDDU_DECL(int) USBLibGetDevices(PUSBDEVICE *ppDevices,  uint32_t *pcbNumDevices);
 
 /**
@@ -282 +251 @@
  * @returns boolean
  */
-VBOXDDU_DECL(bool) usbLibHasPendingDeviceChanges();
-
+VBOXDDU_DECL(bool) USBLibHasPendingDeviceChanges(void);
 
 /**
@@ -293 +261 @@
  * @param usRevision        Revision
  */
-VBOXDDU_DECL(int) usbLibCaptureDevice(uint16_t usVendorId, uint16_t usProductId, uint16_t usRevision);
+VBOXDDU_DECL(int) USBLibCaptureDevice(uint16_t usVendorId, uint16_t usProductId, uint16_t usRevision);
 
 /**
@@ -303 +271 @@
  * @param usRevision        Revision
  */
-VBOXDDU_DECL(int) usbLibReleaseDevice(uint16_t usVendorId, uint16_t usProductId, uint16_t usRevision);
-
+VBOXDDU_DECL(int) USBLibReleaseDevice(uint16_t usVendorId, uint16_t usProductId, uint16_t usRevision);
 
 /** @} */

trunk/include/VBox/usblib.h

@@ -54 +54 @@
  */
 
-#ifndef RT_OS_WINDOWS
 #ifdef IN_RING3
 /**
@@ -107 +106 @@
 
 #endif /* IN_RING3 */
-#endif /* !RT_OS_WINDOWS */
 
 /** @} */