儲存庫 vbox 的更動 12297

時間撮記:

2008-9-9 下午01:59:00 (16 年 以前)

作者:

vboxsync

訊息:

Version 2 of remote USB protocol.

位置:

trunk

檔案:

• include/VBox/vrdpapi.h (修改) (4 筆差異)
• src/VBox/Main/include/RemoteUSBBackend.h (修改) (2 筆差異)

trunk/include/VBox/vrdpapi.h

@@ -104 +104 @@
  */
 
-/* The version of Remote USB Protocol. */
-#define VRDP_USB_VERSION (1)
+/* The initial version 1. */
+#define VRDP_USB_VERSION_1 (1)
+/* Version 2: look for VRDP_USB_VERSION_2 comments in the code. */
+#define VRDP_USB_VERSION_2 (2)
+
+/* The default VRDP server version of Remote USB Protocol. */
+#define VRDP_USB_VERSION VRDP_USB_VERSION_2
+
 
 /** USB backend operations. */
@@ -323 +329 @@
 #define VRDP_USB_XFER_DNR   (2)
 #define VRDP_USB_XFER_CRC   (3)
+/* VRDP_USB_VERSION_2: New error codes. */
+#define VRDP_USB_XFER_BS    (4)
+#define VRDP_USB_XFER_DTM   (5)
+#define VRDP_USB_XFER_PCF   (6)
+#define VRDP_USB_XFER_UPID  (7)
+#define VRDP_USB_XFER_DO    (8)
+#define VRDP_USB_XFER_DU    (9)
+#define VRDP_USB_XFER_BO    (10)
+#define VRDP_USB_XFER_BU    (11)
+#define VRDP_USB_XFER_ERR   (12) /* VBox protocol error. */ 
 
 #define VRDP_USB_REAP_FLAG_CONTINUED (0x0)
@@ -440 +456 @@
 #define VRDP_USB_CAPS_FLAG_ASYNC    (0x0)
 #define VRDP_USB_CAPS_FLAG_POLL     (0x1)
+/* VRDP_USB_VERSION_2: New flag. */
+#define VRDP_USB_CAPS2_FLAG_VERSION (0x2) /* The client is negotiating the protocol version. */
+
 
 #define VRDP_USB_CAPS_VALID_FLAGS   (VRDP_USB_CAPS_FLAG_POLL)
+/* VRDP_USB_VERSION_2: A set of valid flags. */
+#define VRDP_USB_CAPS2_VALID_FLAGS  (VRDP_USB_CAPS_FLAG_POLL | VRDP_USB_CAPS2_FLAG_VERSION)
 
 typedef struct _VRDPUSBREQNEGOTIATERET
@@ -447 +468 @@
     uint8_t flags;
 } VRDPUSBREQNEGOTIATERET;
+
+typedef struct _VRDPUSBREQNEGOTIATERET_2
+{
+    uint8_t flags;
+    uint32_t u32Version; /* This field presents only if the VRDP_USB_CAPS2_FLAG_VERSION flag is set. */ 
+} VRDPUSBREQNEGOTIATERET_2;
 #pragma pack()
 

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

@@ -80 +80 @@
         int saveDeviceList (const void *pvList, uint32_t cbList);
         
-        int negotiateResponse (const VRDPUSBREQNEGOTIATERET *pret);
+        int negotiateResponse (const VRDPUSBREQNEGOTIATERET *pret, uint32_t cbRet);
 
         int reapURB (const void *pvBody, uint32_t cbBody);
@@ -130 +130 @@
         
         Guid aGuids[VRDP_MAX_USB_DEVICES_PER_CLIENT];
+
+        /* VRDP_USB_VERSION_2: the client version. */
+        uint32_t mClientVersion;
 };