move card_type into xpcu_s

[usb-driver] / xpcu.c

diff --git a/xpcu.c b/xpcu.c
index a37826b46b63dd06bce0143b80832f0f6c05f86f..de23d9eb8f69009d73362e3c6ce8fcde92c4a387 100644 (file)
--- a/xpcu.c
+++ b/xpcu.c
@@ -3,8 +3,8 @@
 #include <unistd.h>
 #include <strings.h>
 #include <usb.h>
-#include "xpcu.h"
 #include "usb-driver.h"
+#include "xpcu.h"
 
 int xpcu_deviceinfo(struct xpcu_s *xpcu, unsigned char *buf) {
        int i,j,k,l;
@@ -166,7 +166,7 @@ int xpcu_deviceinfo(struct xpcu_s *xpcu, unsigned char *buf) {
        return len;
 }
 
-int xpcu_claim(struct xpcu_s *xpcu, int claim) {
+static int xpcu_claim(struct xpcu_s *xpcu, int claim) {
        int ret = 0;
        static int claimed = 0;
 
@@ -199,6 +199,56 @@ int xpcu_claim(struct xpcu_s *xpcu, int claim) {
        return ret;
 }
 
+int xpcu_transfer(struct xpcu_s *xpcu, struct usb_transfer *ut) {
+       int ret = 0;
+
+       xpcu_claim(xpcu, XPCU_CLAIM);
+       /* http://www.jungo.com/support/documentation/windriver/802/wdusb_man_mhtml/node55.html#SECTION001213000000000000000 */
+       if (ut->dwPipeNum == 0) { /* control pipe */
+               int requesttype, request, value, index, size;
+               requesttype = ut->SetupPacket[0];
+               request = ut->SetupPacket[1];
+               value = ut->SetupPacket[2] | (ut->SetupPacket[3] << 8);
+               index = ut->SetupPacket[4] | (ut->SetupPacket[5] << 8);
+               size = ut->SetupPacket[6] | (ut->SetupPacket[7] << 8);
+               DPRINTF("requesttype: %x, request: %x, value: %u, index: %u, size: %u\n", requesttype, request, value, index, size);
+               ret = usb_control_msg(xpcu->handle, requesttype, request, value, index, ut->pBuffer, size, ut->dwTimeout);
+       } else {
+               if (ut->fRead) {
+                       ret = usb_bulk_read(xpcu->handle, ut->dwPipeNum, ut->pBuffer, ut->dwBufferSize, ut->dwTimeout);
+               } else {
+                       ret = usb_bulk_write(xpcu->handle, ut->dwPipeNum, ut->pBuffer, ut->dwBufferSize, ut->dwTimeout);
+               }
+               xpcu_claim(xpcu, XPCU_RELEASE);
+       }
+
+       if (ret < 0) {
+               fprintf(stderr, "usb_transfer: %d (%s)\n", ret, usb_strerror());
+       } else {
+               ut->dwBytesTransferred = ret;
+               ret = 0;
+       }
+
+       return ret;
+}
+
+void xpcu_set_interface(struct xpcu_s *xpcu, struct usb_set_interface *usi) {
+       if (xpcu->dev) {
+               if (!xpcu->handle) {
+                       xpcu->handle = usb_open(xpcu->dev);
+#ifndef NO_USB_RESET
+                       if (xpcu->handle) {
+                               usb_reset(xpcu->handle);
+                               xpcu->handle = usb_open(xpcu->dev);
+                       }
+#endif
+               }
+
+               xpcu->interface = xpcu->dev->config[0].interface[usi->dwInterfaceNum].altsetting[usi->dwAlternateSetting].bInterfaceNumber;
+               xpcu->alternate = usi->dwAlternateSetting;
+       }
+}
+
 struct xpcu_s *xpcu_open(void) {
        static struct xpcu_s xpcu;
 
@@ -214,3 +264,14 @@ struct xpcu_s *xpcu_open(void) {
 
        return &xpcu;
 }
+
+void xpcu_close(struct xpcu_s *xpcu) {
+       if (xpcu->handle) {
+               xpcu_claim(xpcu, XPCU_RELEASE);
+               usb_close(xpcu->handle);
+       }
+
+       xpcu->handle = NULL;
+       xpcu->interface = -1;
+       xpcu->alternate = -1;
+}