Changeset 5956

Timestamp:

12/04/07 20:30:38 (1 year ago)

Author:

vboxsync

Message:

Made VUSBDEV internal to VUSB.

Files:

• trunk/include/VBox/pdmusb.h (modified) (2 diffs)
• trunk/include/VBox/vusb.h (modified) (2 diffs)

trunk/include/VBox/pdmusb.h

@@ -313 +313 @@
-     *
-     * @returns VBox status code.
+     * @retval  VINF_SUCCESS on success.
+     * @retval  VERR_VUSB_DEVICE_NOT_ATTACHED if the device has been disconnected.
+     * @retval  VERR_VUSB_FAILED_TO_QUEUE_URB as a general failure kind of thing.
+     * @retval  TBD - document new stuff!
+     *
-     * @param   pUsbIns             The USB device instance.
-     * @param   pUrb                The URB to process.
@@ -594 +599 @@
-    R3PTRTYPE(void *)           pvInstanceDataR3;
-    /** Pointer to the VUSB Device structure.
-The constructor sets this
-Integrate VUSBDEV into this structure
-
+Internal to VUSB, don't touch
+Moved this to PDMUSBINSINT
+2
-    /** Device name for using when logging.
-     * The constructor sets this and the destructor frees it. */

trunk/include/VBox/vusb.h

@@ -885 +885 @@
-        /** Pointer to the original for control messages. */
-        PVUSBURB        pCtrlUrb;
+        /** Pointer to the VUSB device.
+         * This may be NULL if the destination address is invalid. */
+        struct VUSBDEV *pDev;
-        /** Sepcific to the pfnFree function. */
-        void           *pvFreeCtx;
@@ -933 +936 @@
-    } Dev;
-
-device - NULL until a submit has been is attempted
-set when allocating the URB
-struct VUSBDEV *pDev
+USB device instance this belongs to
+NULL if the device address is invalid, in which case this belongs to the hub
+PPDMUSBINS      pUsbIns
-    /** The device address.
-     * This is set at allocation time. */