Changeset 1039

Timestamp:

05/08/08 00:01:33 (7 months ago)

Author:

alonbl

Message:

Linux - Allow minimal usb coldplug using sysfs
Drop libusb requirement for most of cases.

Scan one level of /sys/bus/usb/devices, search for
valid and known usb devices.

Location:

trunk

Files:

• etc/openct_usb.mdev.in (modified) (2 diffs)
• src/ifd/sys-linux.c (modified) (3 diffs)

trunk/etc/openct_usb.mdev.in

@@ -11 +11 @@
 [ "$ACTION" = "add" ] || exit 0
 [ "$DEVTYPE" = "usb_device" ] || exit 0
-[ -e /var/run/openct/status ] || exit 0
 
 DEVICE="$(echo "${DEVICE}" | sed 's/proc/dev/')"
@@ -20 +19 @@
 fi
 
+[ -e /var/run/openct/status ] || exit 0
+
 # Don't know why...
 sleep 1

trunk/src/ifd/sys-linux.c

@@ -18 +18 @@
 #include <sys/stat.h>
 #include <sys/file.h>
+#include <dirent.h>
 #include <string.h>
 #include <stdio.h>
@@ -379 +380 @@
         return open(device, O_RDWR);
 }
+
+#ifndef ENABLE_LIBUSB
+static int read_number (const char *base, const char *name, const char *file, const char *format) {
+        char full[PATH_MAX];
+        FILE *fp = NULL;
+        int n = -1;
+
+        snprintf (full, sizeof (full), "%s/%s/%s", base, name, file);
+
+        if ((fp = fopen (full, "r")) == NULL) {
+                goto out;
+        }
+
+        fscanf (fp, format, &n);
+
+out:
+        if (fp != NULL) {
+                fclose (fp);
+        }
+
+        return n;
+}
+#endif
 
 /*
@@ -450 +474 @@
                 }
         }
+#else
+        const char *base = "/sys/bus/usb/devices";
+        DIR *dir = NULL;
+        struct dirent *ent;
+
+        dir = opendir (base);
+
+        if (dir == NULL) {
+                goto out;
+        }
+
+        while ((ent = readdir (dir)) != NULL) {
+                if (ent->d_name[0] != '.') {
+                        char buffer[1024];
+                        FILE *fp = NULL;
+                        int idProduct = -1;
+                        int idVendor = -1;
+                        int busnum = -1;
+                        int devnum = -1;
+
+                        idProduct = read_number (base, ent->d_name, "idProduct", "%x");
+                        idVendor = read_number (base, ent->d_name, "idVendor", "%x");
+                        busnum = read_number (base, ent->d_name, "busnum", "%d");
+                        devnum = read_number (base, ent->d_name, "devnum", "%d");
+
+                        ifd_debug (6, "coldplug: %s usb: %04x:%04x bus: %03d:%03d\n", ent->d_name, idProduct, idVendor, busnum, devnum);
+
+                        if (idProduct != -1 && idVendor != -1 && busnum != -1 && devnum != -1) {
+                                const char *driver;
+                                ifd_devid_t id;
+
+                                id.type = IFD_DEVICE_TYPE_USB;
+                                id.num = 2;
+                                id.val[0] = idVendor;
+                                id.val[1] = idProduct;
+
+                                if ((driver = ifd_driver_for_id(&id)) != NULL) {
+                                        char typedev[1024];
+
+                                        snprintf(typedev, sizeof(typedev),
+                                                "usb:/dev/bus/usb/%03d/%03d",
+                                                busnum, devnum);
+                                        ifd_spawn_handler(driver, typedev, -1);
+                                }
+                        }
+                }
+        }
+
+out:
+        if (dir != NULL) {
+                closedir (dir);
+        }
 #endif
         return 0;