Changeset 53210 in vbox for trunk/include

Timestamp:

Nov 4, 2014 6:07:07 PM (10 years ago)

Author:

vboxsync

Message:

PDM/VUSB: Provide port/device speed to HCs (and emulated devices).

Location:

trunk/include/VBox

Files:

• vmm/pdmusb.h (modified) (2 diffs)
• vusb.h (modified) (3 diffs)

trunk/include/VBox/vmm/pdmusb.h

@@ -784 +784 @@
     /** The tracing ID of this device.  */
     uint32_t                    idTracing;
-    /** The USB version of the hub this device is attached to. Used to
-     * determine whether the device communicates at high-speed or full-/low-speed. */
-    uint32_t                    iUsbHubVersion;
+    /** The port/device speed. HCs and emulated devices need to know. */
+    VUSBSPEED                   enmSpeed;
 
     /** Padding to make achInstanceData aligned at 32 byte boundary. */
@@ -797 +796 @@
 
 /** Current USBINS version number. */
-#define PDM_USBINS_VERSION                      PDM_VERSION_MAKE(0xeefd, 2, 0)
+#define PDM_USBINS_VERSION                      PDM_VERSION_MAKE(0xeefd, 3, 0)
 
 /**

trunk/include/VBox/vusb.h

@@ -479 +479 @@
 /** @} */
 
+/**
+ * USB port/device speeds.
+ */
+typedef enum VUSBSPEED
+{
+    /** Undetermined/unknown speed. */
+    VUSB_SPEED_UNKNOWN = 0,
+    /** Low-speed (LS), 1.5 Mbit/s, USB 1.0. */
+    VUSB_SPEED_LOW,
+    /** Full-speed (FS), 12 Mbit/s, USB 1.1. */
+    VUSB_SPEED_FULL,
+    /** High-speed (HS), 480 Mbit/s, USB 2.0. */
+    VUSB_SPEED_HIGH,
+    /** Variable speed, wireless USB 2.5. */
+    VUSB_SPEED_VARIABLE,
+    /** SuperSpeed (SS), 5.0 Gbit/s, USB 3.0. */
+    VUSB_SPEED_SUPER,
+    /** SuperSpeed+ (SS+), 10.0 Gbit/s, USB 3.1. */
+    VUSB_SPEED_SUPERPLUS,
+    /** The usual 32-bit hack. */
+    VUSB_SPEED_32BIT_HACK = 0x7fffffff
+} VUSBSPEED;
 
 /** Pointer to a VBox USB device interface. */
@@ -808 +830 @@
      */
     VUSB_DEVICE_STATE_RESET,
-    /** The device has been destroy. */
+    /** The device has been destroyed. */
     VUSB_DEVICE_STATE_DESTROYED,
     /** The usual 32-bit hack. */
@@ -882 +904 @@
      */
     DECLR3CALLBACKMEMBER(bool, pfnIsEmulated,(PVUSBIDEVICE pInterface));
+
+    /**
+     * Get the speed the device is operating at.
+     *
+     * @returns Device state.
+     * @param   pInterface      Pointer to the device interface structure.
+     */
+    DECLR3CALLBACKMEMBER(VUSBSPEED, pfnGetSpeed,(PVUSBIDEVICE pInterface));
 
 } VUSBIDEVICE;