Changeset 60375 in vbox for trunk/src/VBox/ValidationKit

Timestamp:

Apr 7, 2016 2:42:20 PM (9 years ago)

Author:

vboxsync

Message:

ValidationKit/usb/UsbTestService: laptop -> desktop

Location:

trunk/src/VBox/ValidationKit/utils/usb

Files:

• Makefile.kmk (modified) (1 diff)
• UsbTestServiceGadget.cpp (modified) (3 diffs)
• UsbTestServiceGadgetClassTest.cpp (added)
• UsbTestServiceGadgetHost.cpp (modified) (1 diff)
• UsbTestServiceGadgetHostUsbIp.cpp (modified) (2 diffs)
• UsbTestServiceGadgetInternal.h (added)

trunk/src/VBox/ValidationKit/utils/usb/Makefile.kmk

@@ -46 +46 @@
         UsbTestServiceCfg.cpp \
         UsbTestServiceGadgetCfg.cpp \
+        UsbTestServiceGadgetClassTest.cpp \
         UsbTestServiceGadgetHost.cpp \
         UsbTestServiceGadgetHostUsbIp.cpp \

trunk/src/VBox/ValidationKit/utils/usb/UsbTestServiceGadget.cpp

@@ -21 +21 @@
 *********************************************************************************************************************************/
 
+#include <iprt/asm.h>
 #include <iprt/cdefs.h>
 #include <iprt/ctype.h>
@@ -27 +28 @@
 #include <iprt/types.h>
 
-#include "UsbTestServiceGadget.h"
-
+#include "UsbTestServiceGadgetInternal.h"
 
 /*********************************************************************************************************************************
@@ -34 +34 @@
 *********************************************************************************************************************************/
 
+/**
+ * Internal UTS gadget host instance data.
+ */
+typedef struct UTSGADGETINT
+{
+    /** Reference counter. */
+    volatile uint32_t         cRefs;
+    /** Pointer to the gadget class callback table. */
+    PCUTSGADGETCLASSIF        pClassIf;
+    /** The gadget host handle. */
+    UTSGADGETHOST             hGadgetHost;
+    /** Class specific instance data - variable in size. */
+    uint8_t                   abClassInst[1];
+} UTSGADGETINT;
+/** Pointer to the internal gadget host instance data. */
+typedef UTSGADGETINT *PUTSGADGETINT;
+
+
+/*********************************************************************************************************************************
+*   Global variables                                                                                                             *
+*********************************************************************************************************************************/
+
+/** Known gadget host interfaces. */
+static const PCUTSGADGETCLASSIF g_apUtsGadgetClass[] =
+{
+    &g_UtsGadgetClassTest
+};
+
 
 /*********************************************************************************************************************************
 *   Internal Functions                                                                                                           *
 *********************************************************************************************************************************/
+
+
+/**
+ * Destroys a gadget instance.
+ *
+ * @returns nothing.
+ * @param   pThis    The gadget instance.
+ */
+static void utsGadgetDestroy(PUTSGADGETINT pThis)
+{
+    pThis->pClassIf->pfnTerm((PUTSGADGETCLASSINT)&pThis->abClassInst[0]);
+    RTMemFree(pThis);
+}
+
+
+DECLHIDDEN(int) utsGadgetCreate(UTSGADGETHOST hGadgetHost, UTSGADGETCLASS enmClass,
+                                PCUTSGADGETCFGITEM paCfg, PUTSGADET phGadget)
+{
+    int rc = VINF_SUCCESS;
+    PCUTSGADGETCLASSIF pClassIf = NULL;
+
+    /* Get the interface. */
+    for (unsigned i = 0; i < RT_ELEMENTS(g_apUtsGadgetClass); i++)
+    {
+        if (g_apUtsGadgetClass[i]->enmClass == enmClass)
+        {
+            pClassIf = g_apUtsGadgetClass[i];
+            break;
+        }
+    }
+
+    if (RT_LIKELY(pClassIf))
+    {
+        PUTSGADGETINT pThis = (PUTSGADGETINT)RTMemAllocZ(RT_OFFSETOF(UTSGADGETINT, abClassInst[pClassIf->cbClass]));
+        if (RT_LIKELY(pThis))
+        {
+            pThis->cRefs       = 1;
+            pThis->hGadgetHost = hGadgetHost;
+            pThis->pClassIf    = pClassIf;
+            rc = pClassIf->pfnInit((PUTSGADGETCLASSINT)&pThis->abClassInst[0], paCfg);
+            if (RT_SUCCESS(rc))
+                *phGadget = pThis;
+            else
+                RTMemFree(pThis);
+        }
+        else
+            rc = VERR_NO_MEMORY;
+    }
+    else
+        rc = VERR_INVALID_PARAMETER;
+
+    return rc;
+}
+
+
+DECLHIDDEN(uint32_t) utsGadgetRetain(UTSGADGET hGadget)
+{
+    PUTSGADGETINT pThis = hGadget;
+
+    AssertPtrReturn(pThis, 0);
+
+    return ASMAtomicIncU32(&pThis->cRefs);
+}
+
+
+DECLHIDDEN(uint32_t) utsGadgetRelease(UTSGADGET hGadget)
+{
+    PUTSGADGETINT pThis = hGadget;
+
+    AssertPtrReturn(pThis, 0);
+
+    uint32_t cRefs = ASMAtomicDecU32(&pThis->cRefs);
+    if (!cRefs)
+        utsGadgetDestroy(pThis);
+
+    return cRefs;
+}
+

trunk/src/VBox/ValidationKit/utils/usb/UsbTestServiceGadgetHost.cpp

@@ -141 +141 @@
     return cRefs;
 }
+

trunk/src/VBox/ValidationKit/utils/usb/UsbTestServiceGadgetHostUsbIp.cpp

@@ -158 +158 @@
 {
     /* Nothing to do so far. */
-    return VINF_SUCCESS;  
+    return VINF_SUCCESS;
 }
 
@@ -167 +167 @@
 static DECLCALLBACK(int) utsGadgetHostUsbIpGadgetConnect(PUTSGADGETHOSTTYPEINT pIf, UTSGADGET hGadget)
 {
-   return VINF_SUCCESS; 
+   return VINF_SUCCESS;
 }