Changeset 60517 in vbox for trunk/src/VBox/ValidationKit/utils/usb/UsbTestServiceGadgetClassTest.cpp

Timestamp:

Apr 15, 2016 12:20:51 PM (9 years ago)

Author:

vboxsync

Message:

ValidationKit/usb: Updates for UsbTestService

File:

• trunk/src/VBox/ValidationKit/utils/usb/UsbTestServiceGadgetClassTest.cpp (modified) (5 diffs)

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

@@ -37 +37 @@
 
 #include "UsbTestServiceGadgetInternal.h"
+#include "UsbTestServicePlatform.h"
 
 /*********************************************************************************************************************************
@@ -253 +254 @@
     /* Finally delete the gadget template. */
     utsGadgetClassTestDirRemove(pClass->pszGadgetPath);
+
+    /* Release the UDC. */
+    if (pClass->pszUdc)
+    {
+        rc = utsPlatformLnxReleaseUDC(pClass->pszUdc);
+        AssertRC(rc);
+        RTStrFree(pClass->pszUdc);
+    }
 }
 
@@ -343 +352 @@
 
                 /* Finally enable the gadget by attaching it to a UDC. */
-                /** @todo: Figure out a free UDC dynamically. */
-                if (RT_SUCCESS(rc))
-                    rc = RTLinuxSysFsWriteStrFile("dummy_udc.0", 0, NULL, "%s/UDC", pClass->pszGadgetPath);
+                if (RT_SUCCESS(rc))
+                {
+                    pClass->pszUdc = NULL;
+
+                    rc = utsPlatformLnxAcquireUDC(&pClass->pszUdc, &pClass->uBusId);
+                    if (RT_SUCCESS(rc))
+                        rc = RTLinuxSysFsWriteStrFile(pClass->pszUdc, 0, NULL, "%s/UDC", pClass->pszGadgetPath);
+                }
             }
 
@@ -378 +392 @@
 
 
+/**
+ * @interface_method_impl{UTSGADGETCLASS,pfnGetBusId}
+ */
+static DECLCALLBACK(uint32_t) utsGadgetClassTestGetBusId(PUTSGADGETCLASSINT pClass)
+{
+    return pClass->uBusId;
+}
+
+
+/**
+ * @interface_method_impl{UTSGADGETCLASS,pfnConnect}
+ */
+static DECLCALLBACK(int) utsGadgetClassTestConnect(PUTSGADGETCLASSINT pClass)
+{
+    return RTLinuxSysFsWriteStrFile("connect", 0, NULL, "/sys/class/udc/%s/soft_connect", pClass->pszUdc);
+}
+
+
+/**
+ * @interface_method_impl{UTSGADGETCLASS,pfnDisconnect}
+ */
+static DECLCALLBACK(int) utsGadgetClassTestDisconnect(PUTSGADGETCLASSINT pClass)
+{
+    return RTLinuxSysFsWriteStrFile("disconnect", 0, NULL, "/sys/class/udc/%s/soft_connect", pClass->pszUdc);}
+
+
 
 /**
@@ -393 +433 @@
     utsGadgetClassTestInit,
     /** pfnTerm */
-    utsGadgetClassTestTerm
+    utsGadgetClassTestTerm,
+    /** pfnGetBusId */
+    utsGadgetClassTestGetBusId,
+    /** pfnConnect */
+    utsGadgetClassTestConnect,
+    /** pfnDisconnect. */
+    utsGadgetClassTestDisconnect
 };