儲存庫 vbox 的更動 62823

時間撮記:

2016-8-1 下午03:11:03 (8 年 以前)

作者:

vboxsync

訊息:

UsbWebcam cleanups, part 3.

位置:

trunk

檔案:

• include/VBox/vmm/pdmwebcaminfs.h (修改) (6 筆差異)
• src/VBox/Main/src-client/UsbWebcamInterface.cpp (修改) (2 筆差異)

trunk/include/VBox/vmm/pdmwebcaminfs.h

@@ -43 +43 @@
 typedef struct PDMIWEBCAMDOWN *PPDMIWEBCAMDOWN;
 /**
- * Web camera driver up interface.
+ * Web camera driver up (facing in the direction of the device) interface.
  * @todo correct name.
  */
@@ -74 +74 @@
 #define PDMIWEBCAMDOWN_IID "0d29b9a1-f4cd-4719-a564-38d5634ba9f8"
 
+
 /** Pointer to the web camera driver/device down interface. */
-typedef struct PDMIWEBCAMUP *PPDMIWEBCAMUP;
+typedef struct PDMIWEBCAMDEV *PPDMIWEBCAMDEV;
 /**
- * Web camera driver/device down interface.
- * @todo correct name.
+ * Web camera device(/driver) down interface.
  */
-typedef struct PDMIWEBCAMUP
+typedef struct PDMIWEBCAMDEV
 {
     /**
@@ -93 +93 @@
      * @param   fCapabilities   The remote video input protocol capabilities.
      */
-    DECLR3CALLBACKMEMBER(int, pfnAttached,(PPDMIWEBCAMUP pInterface, uint64_t idDevice,
+    DECLR3CALLBACKMEMBER(int, pfnAttached,(PPDMIWEBCAMDEV pInterface, uint64_t idDevice,
                                            struct VRDEVIDEOINDEVICEDESC const *pDeviceDesc, uint32_t cbDeviceDesc,
                                            uint32_t uVersion, uint32_t fCapabilities));
@@ -104 +104 @@
      *                          driver.
      */
-    DECLR3CALLBACKMEMBER(void, pfnDetached,(PPDMIWEBCAMUP pInterface, uint64_t idDevice));
+    DECLR3CALLBACKMEMBER(void, pfnDetached,(PPDMIWEBCAMDEV pInterface, uint64_t idDevice));
 
     /**
@@ -117 +117 @@
      * @param   cbCtrl          The size of the control data.
      */
-    DECLR3CALLBACKMEMBER(void, pfnControl,(PPDMIWEBCAMUP pInterface, bool fResponse, void *pvUser,
+    DECLR3CALLBACKMEMBER(void, pfnControl,(PPDMIWEBCAMDEV pInterface, bool fResponse, void *pvUser,
                                            uint64_t idDevice, struct VRDEVIDEOINCTRLHDR const *pCtrl, uint32_t cbCtrl));
 
@@ -130 +130 @@
      * @param   cbFrame         Size of the image data.
      */
-    DECLR3CALLBACKMEMBER(void, pfnFrame,(PPDMIWEBCAMUP pInterface, uint64_t idDevice,
+    DECLR3CALLBACKMEMBER(void, pfnFrame,(PPDMIWEBCAMDEV pInterface, uint64_t idDevice,
                                          struct VRDEVIDEOINPAYLOADHDR const *pHeader, uint32_t cbHeader,
                                          const void *pvFrame, uint32_t cbFrame));
-} PDMIWEBCAMUP;
-/** Interface ID for PDMIWEBCAMUP. */
-#define PDMIWEBCAMUP_IID "6ac03e3c-f56c-4a35-80af-c13ce47a9dd7"
+} PDMIWEBCAMDEV;
+/** Interface ID for PDMIWEBCAMDEV. */
+#define PDMIWEBCAMDEV_IID "6ac03e3c-f56c-4a35-80af-c13ce47a9dd7"
 
 /** @} */

trunk/src/VBox/Main/src-client/UsbWebcamInterface.cpp

@@ -45 +45 @@
 {
     EMWEBCAMREMOTE *pRemote;
-    PPDMIWEBCAMUP  pIWebcamUp;
+    PPDMIWEBCAMDEV  pIWebcamUp;
     PDMIWEBCAMDOWN IWebcamDown;
 } EMWEBCAMDRV, *PEMWEBCAMDRV;
@@ -394 +394 @@
 
     /* Check early that there is a device. No need to init anything if there is no device. */
-    pThis->pIWebcamUp = PDMIBASE_QUERY_INTERFACE(pDrvIns->pUpBase, PDMIWEBCAMUP);
+    pThis->pIWebcamUp = PDMIBASE_QUERY_INTERFACE(pDrvIns->pUpBase, PDMIWEBCAMDEV);
     if (pThis->pIWebcamUp == NULL)
     {