Changeset 409 for trunk/src/ifd/sys-bsd.c

Timestamp:

10/18/03 21:09:43 (9 years ago)

Author:

aet

Message:

• Remove obsolete ifd_device_open_channel / ifd_sysdep_channel_to_name
• Some polishing for sysdep usb layer, as not all usb api implementations work on top of a file descriptor

File:

• trunk/src/ifd/sys-bsd.c (modified) (12 diffs)

trunk/src/ifd/sys-bsd.c

@@ -54 +54 @@
 }
 
-const char *
-ifd_sysdep_channel_to_name(unsigned int num)
-{
-        static char     namebuf[256];
-
-        switch (num >> 24) {
-        case 0:
-                sprintf(namebuf, "/dev/ttyS%u", num);
-                break;
-        case 1:
-#ifdef __FreeBSD__
-                sprintf(namebuf, "/dev/ugen%d", num);
-#else
-                sprintf(namebuf, "/dev/ugen%d.00", num);
-#endif
-                break;
-        default:
-                ct_error("Unknown device channel 0x%x\n", num);
-                return NULL;
-        }
-
-        return namebuf;
-}
-
 /*
  * USB control command
  */
 int
-ifd_sysdep_usb_control(int fd,
+ifd_sysdep_usb_control(ifd_device_t *dev,
                 unsigned int requesttype,
                 unsigned int request,
@@ -105 +81 @@
 
         val = timeout;
-        rc = ioctl(fd, USB_SET_TIMEOUT, &val);
+        rc = ioctl(dev->fd, USB_SET_TIMEOUT, &val);
         if (rc < 0) {
                 ct_error("usb_set_timeout failed: %m");
@@ -111 +87 @@
         }
  
-        if ((rc = ioctl(fd, USB_DO_REQUEST, &ctrl)) < 0) {
+        if ((rc = ioctl(dev->fd, USB_DO_REQUEST, &ctrl)) < 0) {
                 ct_error("usb_control failed: %m");
                 return IFD_ERROR_COMM_ERROR;
@@ -144 +120 @@
 
 int
-ifd_sysdep_usb_begin_capture(int fd,
+ifd_sysdep_usb_begin_capture(ifd_device_t *dev,
                 int type, int endpoint, size_t maxpacket,
                 ifd_usb_capture_t **capret)
@@ -155 +131 @@
         /* Assume the interface # is 0 */
         cap->interface = 0;
-        rc = ioctl(fd, USBDEVFS_CLAIMINTERFACE, &cap->interface);
+        rc = ioctl(dev->fd, USBDEVFS_CLAIMINTERFACE, &cap->interface);
         if (rc < 0) {
                 ct_error("usb_claiminterface failed: %m");
@@ -166 +142 @@
         cap->maxpacket = maxpacket;
 
-        if (usb_submit_urb(fd, cap) < 0) {
+        if (usb_submit_urb(dev->fd, cap) < 0) {
                 ct_error("usb_submiturb failed: %m");
-                ifd_sysdep_usb_end_capture(fd, cap);
+                ifd_sysdep_usb_end_capture(dev, cap);
                 return IFD_ERROR_COMM_ERROR;
         }
@@ -177 +153 @@
 
 int
-ifd_sysdep_usb_capture(int fd,
+ifd_sysdep_usb_capture(ifd_device_t *dev,
                 ifd_usb_capture_t *cap,
                 void *buffer, size_t len,
@@ -198 +174 @@
                         return IFD_ERROR_TIMEOUT;
 
-                pfd.fd = fd;
+                pfd.fd = dev->fd;
                 pfd.events = POLLOUT;
                 if (poll(&pfd, 1, wait) != 1)
@@ -204 +180 @@
 
                 purb = NULL;
-                rc = ioctl(fd, USBDEVFS_REAPURBNDELAY, &purb);
+                rc = ioctl(dev->fd, USBDEVFS_REAPURBNDELAY, &purb);
                 if (rc < 0) {
                         if (errno == EAGAIN)
@@ -235 +211 @@
 
 int
-ifd_sysdep_usb_end_capture(int fd, ifd_usb_capture_t *cap)
+ifd_sysdep_usb_end_capture(ifd_device_t *dev, ifd_usb_capture_t *cap)
 {
         int     rc = 0;
 
-        if (ioctl(fd, USBDEVFS_DISCARDURB, &cap->urb) < 0 && errno != EINVAL) {
+        if (ioctl(dev->fd, USBDEVFS_DISCARDURB, &cap->urb) < 0 && errno != EINVAL) {
                 ct_error("usb_discardurb failed: %m");
                 rc = IFD_ERROR_COMM_ERROR;
@@ -248 +224 @@
          * clobbering random memory.
          */
-        (void) ioctl(fd, USBDEVFS_REAPURBNDELAY, &cap->urb);
-        if (ioctl(fd, USBDEVFS_RELEASEINTERFACE, &cap->interface) < 0) {
+        (void) ioctl(dev->fd, USBDEVFS_REAPURBNDELAY, &cap->urb);
+        if (ioctl(dev->fd, USBDEVFS_RELEASEINTERFACE, &cap->interface) < 0) {
                 ct_error("usb_releaseinterface failed: %m");
                 rc = IFD_ERROR_COMM_ERROR;
@@ -259 +235 @@
 /*
  * Scan all usb devices to see if there is one we support
- * This function is called at start-up because we can't be
- * sure the hotplug system notifies us of devices that were
- * attached at startup time already.
  */
 int
 ifd_scan_usb(void)
 {
-        /* do some cold plugging here */ 
-
         return 0;
 }