Changeset 13659 in vbox for trunk/src/VBox/Main/include/RemoteUSBDeviceImpl.h

Timestamp:

Oct 29, 2008 3:45:03 PM (16 years ago)

Author:

vboxsync

Message:

Main: Moved last USB classes to the new locking scheme.

File:

• trunk/src/VBox/Main/include/RemoteUSBDeviceImpl.h (modified) (5 diffs)

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

@@ +1 @@
+/* $Id$ */
+
 /** @file
  *
@@ -6 +8 @@
 
 /*
- * Copyright (C) 2006-2007 Sun Microsystems, Inc.
+ * Copyright (C) 2006-2008 Sun Microsystems, Inc.
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -26 +28 @@
 #include "VirtualBoxBase.h"
 #include "Collection.h"
-#include <VBox/vrdpapi.h>
+
+struct _VRDPUSBDEVICEDESC;
+typedef _VRDPUSBDEVICEDESC VRDPUSBDEVICEDESC;
 
 class ATL_NO_VTABLE RemoteUSBDevice :
+    public VirtualBoxBaseNEXT,
     public VirtualBoxSupportErrorInfoImpl <RemoteUSBDevice, IHostUSBDevice>,
     public VirtualBoxSupportTranslation <RemoteUSBDevice>,
-    public VirtualBoxBase,
     public IHostUSBDevice
 {
 public:
 
-    DECLARE_NOT_AGGREGATABLE(RemoteUSBDevice)
+    VIRTUALBOXBASE_ADD_ERRORINFO_SUPPORT (OUSBDevice)
+
+    DECLARE_NOT_AGGREGATABLE (RemoteUSBDevice)
 
     DECLARE_PROTECT_FINAL_CONSTRUCT()
 
-    BEGIN_COM_MAP(RemoteUSBDevice)
-        COM_INTERFACE_ENTRY(ISupportErrorInfo)
-        COM_INTERFACE_ENTRY(IHostUSBDevice)
-        COM_INTERFACE_ENTRY(IUSBDevice)
+    BEGIN_COM_MAP (RemoteUSBDevice)
+        COM_INTERFACE_ENTRY (ISupportErrorInfo)
+        COM_INTERFACE_ENTRY (IHostUSBDevice)
+        COM_INTERFACE_ENTRY (IUSBDevice)
     END_COM_MAP()
 
@@ -75 +81 @@
 
     // public methods only for internal purposes
-    bool dirty (void) { return mDirty; }
-    void dirty (bool aDirty) { mDirty = aDirty; }
-
-    uint16_t devId (void) { return mDevId; }
-    uint32_t clientId (void) { return mClientId; }
-
-    bool captured (void) { return mState == USBDeviceState_Captured; }
+    bool dirty (void) const { return mData.dirty; }
+    void dirty (bool aDirty) { mData.dirty = aDirty; }
+
+    uint16_t devId (void) const { return mData.devId; }
+    uint32_t clientId (void) { return mData.clientId; }
+
+    bool captured (void) const { return mData.state == USBDeviceState_Captured; }
     void captured (bool aCaptured)
     {
         if (aCaptured)
         {
-            Assert(mState == USBDeviceState_Available);
-            mState = USBDeviceState_Captured;
+            Assert(mData.state == USBDeviceState_Available);
+            mData.state = USBDeviceState_Captured;
         }
         else
         {
-            Assert(mState == USBDeviceState_Captured);
-            mState = USBDeviceState_Available;
+            Assert(mData.state == USBDeviceState_Captured);
+            mData.state = USBDeviceState_Available;
         }
     }
@@ -101 +107 @@
 private:
 
-    Guid mId;
-
-    uint16_t mVendorId;
-    uint16_t mProductId;
-    uint16_t mRevision;
-
-    Bstr mManufacturer;
-    Bstr mProduct;
-    Bstr mSerialNumber;
-
-    Bstr mAddress;
-
-    uint16_t mPort;
-    uint16_t mVersion;
-    uint16_t mPortVersion;
-
-    USBDeviceState_T mState;
-
-    bool mDirty;
-    uint16_t mDevId;
-    uint32_t mClientId;
+    struct Data
+    {
+        Data() : vendorId (0), productId (0), revision (0), port (0), version (1),
+                 portVersion (1), dirty (FALSE), devId (0), clientId (0) {}
+
+        const Guid id;
+
+        const uint16_t vendorId;
+        const uint16_t productId;
+        const uint16_t revision;
+
+        const Bstr manufacturer;
+        const Bstr product;
+        const Bstr serialNumber;
+
+        const Bstr address;
+
+        const uint16_t port;
+        const uint16_t version;
+        const uint16_t portVersion;
+
+        USBDeviceState_T state;
+        bool dirty;
+
+        const uint16_t devId;
+        const uint32_t clientId;
+    };
+
+    Data mData;
 };