Discovery aids for Gate in USB EP

examples/CMakeLists.txt

@@ -54,3 +54,6 @@ if (UNIX AND !APPLE)
     add_example(xlink_client_local xlink_client_local.cpp)
 endif (UNIX AND !APPLE)
 
+# EP example
+add_example(xlink_usb_server xlink_usb_server.cpp)
+add_example(xlink_usb_client xlink_usb_client.cpp)

examples/xlink_usb_client.cpp

@@ -0,0 +1,54 @@
+#include <cstdio>
+#include <string>
+#include <vector>
+#include <array>
+#include <thread>
+#include <stdexcept>
+#include <iostream>
+#include <cassert>
+#include <chrono>
+#include <thread>
+#include <algorithm>
+#include <cstring>
+#include <atomic>
+
+#include "XLink/XLink.h"
+#include "XLink/XLinkPublicDefines.h"
+#include "XLink/XLinkLog.h"
+
+// Common constants
+const uint8_t DUMMY_DATA[1024*128] = {};
+
+int main(int argc, char** argv) {
+    XLinkGlobalHandler_t gHandler;
+    XLinkInitialize(&gHandler);
+
+    mvLogDefaultLevelSet(MVLOG_DEBUG);
+
+    deviceDesc_t deviceDesc;
+    strcpy(deviceDesc.name, "usbdev");
+    deviceDesc.protocol = X_LINK_USB_EP;
+
+    printf("Device name: %s\n", deviceDesc.name);
+
+    XLinkHandler_t handler;
+    handler.devicePath = deviceDesc.name;
+    handler.protocol = deviceDesc.protocol;
+    auto connRet = XLinkConnect(&handler);
+    printf("Connection returned: %s\n", XLinkErrorToStr(connRet));
+    if(connRet != X_LINK_SUCCESS) {
+	return -1;
+    }
+
+    auto s = XLinkOpenStream(handler.linkId, "test_0", sizeof(DUMMY_DATA) * 2);
+    if(s == INVALID_STREAM_ID){
+	printf("Open stream failed...\n");
+    } else {
+	printf("Open stream OK - id: 0x%08X\n",  s);
+    }
+
+    auto w = XLinkWriteData(s, (uint8_t*) &s, sizeof(s));
+    assert(w == X_LINK_SUCCESS);
+
+    return 0;
+}

examples/xlink_usb_server.cpp

@@ -0,0 +1,62 @@
+#include <cstdio>
+#include <string>
+#include <vector>
+#include <array>
+#include <thread>
+#include <stdexcept>
+#include <iostream>
+#include <cassert>
+#include <chrono>
+#include <thread>
+#include <algorithm>
+#include <cstring>
+#include <atomic>
+
+#include "XLink/XLink.h"
+#include "XLink/XLinkPublicDefines.h"
+#include "XLink/XLinkLog.h"
+
+// Common constants
+constexpr static auto NUM_STREAMS = 16;
+constexpr static auto NUM_PACKETS = 120;
+const uint8_t DUMMY_DATA[1024*128] = {};
+XLinkGlobalHandler_t xlinkGlobalHandler = {};
+
+// Server
+//
+
+int main(int argc, const char** argv){
+
+    xlinkGlobalHandler.protocol = X_LINK_USB_EP;
+
+    // Initialize and suppress XLink logs
+    mvLogDefaultLevelSet(MVLOG_DEBUG);
+    auto status = XLinkInitialize(&xlinkGlobalHandler);
+    if(X_LINK_SUCCESS != status) {
+	throw std::runtime_error("Couldn't initialize XLink");
+    }
+
+    XLinkHandler_t handler;
+    handler.devicePath = "/dev/usb-ffs/device";
+    handler.protocol = X_LINK_USB_EP;
+    XLinkServerOnly(&handler);
+
+
+    // loop through streams
+    auto s = XLinkOpenStream(0, "test_0", sizeof(DUMMY_DATA) * 2);
+    assert(s != INVALID_STREAM_ID);
+
+    //    auto w = XLinkWriteData2(s, (uint8_t*) &s, sizeof(s/2), ((uint8_t*) &s) + sizeof(s/2), sizeof(s) - sizeof(s/2));
+    //    assert(w == X_LINK_SUCCESS);
+
+    auto w = XLinkWriteData(s, (uint8_t*) &s, sizeof(s));
+    assert(w == X_LINK_SUCCESS);
+
+
+    streamPacketDesc_t p;
+    w = XLinkReadMoveData(s, &p);
+    assert(w == X_LINK_SUCCESS);
+    XLinkDeallocateMoveData(p.data, p.length);
+
+    return 0;
+}

include/XLink/XLink.h

@@ -306,6 +306,17 @@ XLinkError_t XLinkWriteData(streamId_t const streamId, const uint8_t* buffer, in
 
 XLinkError_t XLinkWriteData_(streamId_t streamId, const uint8_t* buffer, int size, XLinkTimespec* outTSend);
 
+/**
+ * @brief Sends/Receives a message to Gate via USB
+ * @param[in] name - Device name/path
+ * @param[in] data - Data to be transmitted/collected
+ * @param[in] size - The data size
+ * @param[in] size - USB timeout
+ * @return Status code of the operation: X_LINK_SUCCESS (0) for success
+ */
+XLinkError_t XLinkGateWrite(const char *name, void *data, int size, int timeout);
+XLinkError_t XLinkGateRead(const char *name, void *data, int size, int timeout);
+
 /**
  * @brief Sends a package to initiate the writing of a file descriptor
  * @warning Actual size of the written data is ALIGN_UP(size, 64)

include/XLink/XLinkPlatform.h

@@ -37,6 +37,7 @@ typedef enum {
     X_LINK_PLATFORM_LOCAL_SHDMEM_DRIVER_NOT_LOADED = X_LINK_PLATFORM_DRIVER_NOT_LOADED+X_LINK_LOCAL_SHDMEM,
     X_LINK_PLATFORM_TCP_IP_OR_LOCAL_SHDMEM_DRIVER_NOT_LOADED = X_LINK_PLATFORM_DRIVER_NOT_LOADED+X_LINK_TCP_IP_OR_LOCAL_SHDMEM,
     X_LINK_PLATFORM_PCIE_DRIVER_NOT_LOADED = X_LINK_PLATFORM_DRIVER_NOT_LOADED+X_LINK_PCIE,
+    X_LINK_PLATFORM_USB_EP_DRIVER_NOT_LOADED = X_LINK_PLATFORM_DRIVER_NOT_LOADED+X_LINK_USB_EP,
 } xLinkPlatformErrorCode_t;
 
 // ------------------------------------
@@ -90,6 +91,8 @@ xLinkPlatformErrorCode_t XLinkPlatformCloseRemote(xLinkDeviceHandle_t* deviceHan
 int XLinkPlatformWrite(xLinkDeviceHandle_t *deviceHandle, void *data, int size);
 int XLinkPlatformWriteFd(xLinkDeviceHandle_t *deviceHandle, const long fd, void *data2, int size2);
 int XLinkPlatformRead(xLinkDeviceHandle_t *deviceHandle, void *data, int size, long *fd);
+int XLinkPlatformGateWrite(const char *name, void *data, int size, int timeout);
+int XLinkPlatformGateRead(const char *name, void *data, int size, int timeout);
 
 void* XLinkPlatformAllocateData(uint32_t size, uint32_t alignment);
 void XLinkPlatformDeallocateData(void *ptr, uint32_t size, uint32_t alignment);

include/XLink/XLinkPublicDefines.h

@@ -68,6 +68,7 @@ typedef enum{
     X_LINK_TCP_IP,
     X_LINK_LOCAL_SHDMEM,
     X_LINK_TCP_IP_OR_LOCAL_SHDMEM,
+    X_LINK_USB_EP,
     X_LINK_NMB_OF_PROTOCOLS,
     X_LINK_ANY_PROTOCOL
 } XLinkProtocol_t;

src/pc/PlatformData.c

@@ -56,10 +56,12 @@
 #include <termios.h>
 
 #include "usb_host.h"
+#endif  /*USE_USB_VSC*/
 
 extern int usbFdWrite;
 extern int usbFdRead;
-#endif  /*USE_USB_VSC*/
+extern int usbGateFdWrite;
+extern int usbGateFdRead;
 
 // ------------------------------------
 // Wrappers declaration. Begin.
@@ -87,7 +89,8 @@ int XLinkPlatformWrite(xLinkDeviceHandle_t *deviceHandle, void *data, int size)
     switch (deviceHandle->protocol) {
         case X_LINK_USB_VSC:
         case X_LINK_USB_CDC:
-            return usbPlatformWrite(deviceHandle->xLinkFD, data, size);
+        case X_LINK_USB_EP:
+            return usbPlatformWrite(deviceHandle->protocol, deviceHandle->xLinkFD, data, size);
 
         case X_LINK_PCIE:
             return pciePlatformWrite(deviceHandle->xLinkFD, data, size);
@@ -134,7 +137,8 @@ int XLinkPlatformRead(xLinkDeviceHandle_t *deviceHandle, void *data, int size, l
     switch (deviceHandle->protocol) {
         case X_LINK_USB_VSC:
         case X_LINK_USB_CDC:
-            return usbPlatformRead(deviceHandle->xLinkFD, data, size);
+        case X_LINK_USB_EP:
+            return usbPlatformRead(deviceHandle->protocol, deviceHandle->xLinkFD, data, size);
 
         case X_LINK_PCIE:
             return pciePlatformRead(deviceHandle->xLinkFD, data, size);
@@ -153,6 +157,26 @@ int XLinkPlatformRead(xLinkDeviceHandle_t *deviceHandle, void *data, int size, l
     }
 }
 
+int XLinkPlatformGateWrite(const char *name, void *data, int size, int timeout)
+{
+    if(!XLinkIsProtocolInitialized(X_LINK_USB_EP)) {
+        return X_LINK_PLATFORM_DRIVER_NOT_LOADED+X_LINK_USB_EP;
+    }
+
+    return usbPlatformGateWrite(name, data, size, timeout);
+}
+
+int XLinkPlatformGateRead(const char *name, void *data, int size, int timeout)
+{
+    if(!XLinkIsProtocolInitialized(X_LINK_USB_EP)) {
+        return X_LINK_PLATFORM_DRIVER_NOT_LOADED+X_LINK_USB_EP;
+    }
+
+    return usbPlatformGateRead(name, data, size, timeout);
+}
+
+
+
 void* XLinkPlatformAllocateData(uint32_t size, uint32_t alignment)
 {
     void* ret = NULL;

src/pc/PlatformDeviceControl.c

@@ -24,10 +24,12 @@
 #include <sys/ioctl.h>
 #include <termios.h>
 #include <fcntl.h>
+#endif  /*USE_USB_VSC*/
 
 int usbFdWrite = -1;
 int usbFdRead = -1;
-#endif  /*USE_USB_VSC*/
+int usbGateFdWrite = -1;
+int usbGateFdRead = -1;
 
 #include "XLinkPublicDefines.h"
 
@@ -90,6 +92,7 @@ xLinkPlatformErrorCode_t XLinkPlatformInit(XLinkGlobalHandler_t* globalHandler)
     // check for failed initialization; LIBUSB_SUCCESS = 0
     if (usbInitialize(globalHandler->options) != 0) {
         xlinkSetProtocolInitialized(X_LINK_USB_VSC, 0);
+        xlinkSetProtocolInitialized(X_LINK_USB_EP, 0);
     }
 
     // Initialize tcpip protocol if necessary
@@ -103,7 +106,7 @@ xLinkPlatformErrorCode_t XLinkPlatformInit(XLinkGlobalHandler_t* globalHandler)
 	xlinkSetProtocolInitialized(X_LINK_LOCAL_SHDMEM, 0);
     }
 #endif
-	
+
     xlinkSetProtocolInitialized(X_LINK_TCP_IP_OR_LOCAL_SHDMEM, 1);
 
     return X_LINK_PLATFORM_SUCCESS;
@@ -185,7 +188,8 @@ xLinkPlatformErrorCode_t XLinkPlatformConnect(const char* devPathRead, const cha
     switch (*protocol) {
         case X_LINK_USB_VSC:
         case X_LINK_USB_CDC:
-            return usbPlatformConnect(devPathRead, devPathWrite, fd);
+        case X_LINK_USB_EP:
+            return usbPlatformConnect(*protocol, devPathRead, devPathWrite, fd);
 
         case X_LINK_PCIE:
             return pciePlatformConnect(devPathRead, devPathWrite, fd);
@@ -209,6 +213,11 @@ xLinkPlatformErrorCode_t XLinkPlatformConnect(const char* devPathRead, const cha
 xLinkPlatformErrorCode_t XLinkPlatformServer(const char* devPathRead, const char* devPathWrite, XLinkProtocol_t *protocol, void** fd)
 {
     switch (*protocol) {
+        case X_LINK_USB_VSC:
+        case X_LINK_USB_CDC:
+        case X_LINK_USB_EP:
+            return usbPlatformServer(devPathRead, devPathWrite, fd);
+
         case X_LINK_TCP_IP:
             return tcpipPlatformServer(devPathRead, devPathWrite, fd, NULL);
 
@@ -260,7 +269,8 @@ xLinkPlatformErrorCode_t XLinkPlatformCloseRemote(xLinkDeviceHandle_t* deviceHan
     switch (deviceHandle->protocol) {
         case X_LINK_USB_VSC:
         case X_LINK_USB_CDC:
-            return usbPlatformClose(deviceHandle->xLinkFD);
+        case X_LINK_USB_EP:
+            return usbPlatformClose(deviceHandle->protocol, deviceHandle->xLinkFD);
 
         case X_LINK_PCIE:
             return pciePlatformClose(deviceHandle->xLinkFD);

src/pc/PlatformDeviceSearch.c

@@ -64,6 +64,7 @@ xLinkPlatformErrorCode_t XLinkPlatformFindDevices(const deviceDesc_t in_deviceRe
     switch (in_deviceRequirements.protocol){
         case X_LINK_USB_CDC:
         case X_LINK_USB_VSC:
+        case X_LINK_USB_EP:
             if(!XLinkIsProtocolInitialized(in_deviceRequirements.protocol)) {
                 return X_LINK_PLATFORM_DRIVER_NOT_LOADED+in_deviceRequirements.protocol;
             }