Changeset 5528 in vbox

Timestamp:

Oct 26, 2007 6:28:10 PM (17 years ago)

Author:

vboxsync

Message:

Added PortVersion and Version attributes for obtaining the major USB version of the port and the device respectively.

Location:

trunk/src/VBox/Main

Files:

• HostUSBDeviceImpl.cpp (modified) (1 diff)
• RemoteUSBDeviceImpl.cpp (modified) (2 diffs)
• USBDeviceImpl.cpp (modified) (3 diffs)
• idl/VirtualBox.xidl (modified) (2 diffs)
• include/HostUSBDeviceImpl.h (modified) (1 diff)
• include/RemoteUSBDeviceImpl.h (modified) (2 diffs)
• include/USBDeviceImpl.h (modified) (2 diffs)

trunk/src/VBox/Main/HostUSBDeviceImpl.cpp

@@ -273 +273 @@
     ///@todo implement
     aPort = 0;
+
+    return S_OK;
+}
+
+STDMETHODIMP HostUSBDevice::COMGETTER(Version)(USHORT *aVersion)
+{
+    if (!aVersion)
+        return E_INVALIDARG;
+
+    AutoCaller autoCaller (this);
+    CheckComRCReturnRC (autoCaller.rc());
+
+    AutoReaderLock alock (this);
+
+    *aVersion = mUsb->bcdUSB >> 8;
+
+    return S_OK;
+}
+
+STDMETHODIMP HostUSBDevice::COMGETTER(PortVersion)(USHORT *aPortVersion)
+{
+    if (!aPortVersion)
+        return E_INVALIDARG;
+
+    AutoCaller autoCaller (this);
+    CheckComRCReturnRC (autoCaller.rc());
+
+    AutoReaderLock alock (this);
+
+    /** @todo implement this correctly or things just won't work right, see the vista defect. */
+    *aPortVersion = mUsb->bcdUSB >> 8;
 
     return S_OK;

trunk/src/VBox/Main/RemoteUSBDeviceImpl.cpp

@@ -70 +70 @@
 
     mPort         = pDevDesc->idPort;
+    mVersion      = pDevDesc->bcdUSB >> 8;
+    mPortVersion  = mVersion; /** @todo fix this */
 
     mState        = USBDeviceState_USBDeviceAvailable;
@@ -208 +210 @@
 }
 
+STDMETHODIMP RemoteUSBDevice::COMGETTER(Version) (USHORT *aVersion)
+{
+    if (!aVersion)
+        return E_INVALIDARG;
+
+    AutoLock alock (this);
+    CHECK_READY();
+
+    *aVersion = mVersion;
+    return S_OK;
+}
+
+STDMETHODIMP RemoteUSBDevice::COMGETTER(PortVersion) (USHORT *aPortVersion)
+{
+    if (!aPortVersion)
+        return E_INVALIDARG;
+
+    AutoLock alock (this);
+    CHECK_READY();
+
+    *aPortVersion = mPortVersion;
+    return S_OK;
+}
+
 STDMETHODIMP RemoteUSBDevice::COMGETTER(Remote) (BOOL *aRemote)
 {

trunk/src/VBox/Main/USBDeviceImpl.cpp

@@ -29 +29 @@
 
     mPort = 0;
+    mVersion = mPortVersion = 1;
     mRemote = FALSE;
 }
@@ -77 +78 @@
     ComAssertComRCRet (hrc, hrc);
 
+    hrc = aUSBDevice->COMGETTER(Port)(&mVersion);
+    ComAssertComRCRet (hrc, hrc);
+
+    hrc = aUSBDevice->COMGETTER(Port)(&mPortVersion);
+    ComAssertComRCRet (hrc, hrc);
+
     hrc = aUSBDevice->COMGETTER(Remote)(&mRemote);
     ComAssertComRCRet (hrc, hrc);
@@ -253 +260 @@
 }
 
+STDMETHODIMP OUSBDevice::COMGETTER(Version)(USHORT *aVersion)
+{
+    if (!aVersion)
+        return E_POINTER;
+
+    AutoLock lock(this);
+    CHECK_READY();
+
+    *aVersion = mVersion;
+    return S_OK;
+}
+
+STDMETHODIMP OUSBDevice::COMGETTER(PortVersion)(USHORT *aPortVersion)
+{
+    if (!aPortVersion)
+        return E_POINTER;
+
+    AutoLock lock(this);
+    CHECK_READY();
+
+    *aPortVersion = mPortVersion;
+    return S_OK;
+}
+
 STDMETHODIMP OUSBDevice::COMGETTER(Remote)(BOOL *aRemote)
 {

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -7886 +7886 @@
   <interface
      name="IUSBDevice" extends="$unknown"
-     uuid="c5ab8d05-1999-4e48-ae34-cdeb235aacf0"
+     uuid="850af07b-9ee8-48c2-b6b0-f6d0acbf63c3"
      wsmap="managed"
      >
@@ -7938 +7938 @@
         Host USB port number the device is physically
         coonected to.
+      </desc>
+    </attribute>
+
+    <attribute name="version" type="unsigned short" readonly="yes">
+      <desc>
+        The major USB version of the device - 1 or 2.
+      </desc>
+    </attribute>
+
+    <attribute name="portVersion" type="unsigned short" readonly="yes">
+      <desc>
+        The major USB version of the host USB port the device is
+        physically coonected to - 1 or 2. For devices not connected to
+        anything this will have the same value as the version attribute.
       </desc>
     </attribute>

trunk/src/VBox/Main/include/HostUSBDeviceImpl.h

@@ -74 +74 @@
     STDMETHOD(COMGETTER(Address))(BSTR *aAddress);
     STDMETHOD(COMGETTER(Port))(USHORT *aPort);
+    STDMETHOD(COMGETTER(Version))(USHORT *aVersion);
+    STDMETHOD(COMGETTER(PortVersion))(USHORT *aPortVersion);
     STDMETHOD(COMGETTER(Remote))(BOOL *aRemote);
 

trunk/src/VBox/Main/include/RemoteUSBDeviceImpl.h

@@ -63 +63 @@
     STDMETHOD(COMGETTER(Address)) (BSTR *aAddress);
     STDMETHOD(COMGETTER(Port)) (USHORT *aPort);
+    STDMETHOD(COMGETTER(Version)) (USHORT *aVersion);
+    STDMETHOD(COMGETTER(PortVersion)) (USHORT *aPortVersion);
     STDMETHOD(COMGETTER(Remote)) (BOOL *aRemote);
 
@@ -108 +110 @@
 
     uint16_t mPort;
+    uint16_t mVersion;
+    uint16_t mPortVersion;
 
     USBDeviceState_T mState;

trunk/src/VBox/Main/include/USBDeviceImpl.h

@@ -62 +62 @@
     STDMETHOD(COMGETTER(Address))(BSTR *aAddress);
     STDMETHOD(COMGETTER(Port))(USHORT *aPort);
+    STDMETHOD(COMGETTER(Version))(USHORT *aVersion);
+    STDMETHOD(COMGETTER(PortVersion))(USHORT *aPortVersion);
     STDMETHOD(COMGETTER(Remote))(BOOL *aRemote);
 
@@ -89 +91 @@
     /** The host specific address of the device. */
     Bstr mAddress;
-
+    /** The host port number. */
     USHORT mPort;
+    /** The major USB version number of the device. */
+    USHORT mVersion;
+    /** The major USB version number of the port the device is attached to. */
+    USHORT mPortVersion;
+    /** Remote (VRDP) or local device. */
     BOOL mRemote;
 };