Changeset 909 for trunk/src/ifd

Timestamp:

11/05/06 22:47:02 (6 years ago)

Author:

aj

Message:

add usb reset patch by andrey jivsov.

Location:

trunk/src/ifd

Files:

• internal.h (modified) (1 diff)
• sys-linux.c (modified) (1 diff)
• usb.c (modified) (2 diffs)

trunk/src/ifd/internal.h

@@ -177 +177 @@
 extern int ifd_sysdep_usb_end_capture(ifd_device_t *, ifd_usb_capture_t * cap);
 extern int ifd_sysdep_usb_open(const char *device);
+extern int ifd_sysdep_usb_reset(ifd_device_t *);
 
 /* module.c */

trunk/src/ifd/sys-linux.c

@@ -223 +223 @@
 }
 
+int ifd_sysdep_usb_reset(ifd_device_t * dev)
+{
+        if (ioctl(dev->fd, USBDEVFS_RESET, NULL) < 0) {
+                ct_error(40, "usb_reset failed: %m");
+                return IFD_ERROR_COMM_ERROR;
+        }
+        return 0;
+}
+
 /*
  * USB bulk transfer

trunk/src/ifd/usb.c

@@ -167 +167 @@
 }
 
+static int usb_reset(ifd_device_t * dev)
+{
+        int rc;
+
+        rc = ifd_sysdep_usb_reset( dev );
+
+        return rc;
+}
+
+
+
 static struct ifd_device_ops ifd_usb_ops;
 
@@ -186 +197 @@
         ifd_usb_ops.send = usb_send;
         ifd_usb_ops.recv = usb_recv;
+        ifd_usb_ops.reset = usb_reset;
 
         dev = ifd_device_new(device, &ifd_usb_ops, sizeof(*dev));