Patchwork [1/3] usb-linux: Store devpath into USBHostDevice when usb_fs_type == USB_FS_SYS

login
register
mail settings
Submitter Hans de Goede
Date Nov. 8, 2010, 4:26 p.m.
Message ID <1289233570-6529-2-git-send-email-hdegoede@redhat.com>
Download mbox | patch
Permalink /patch/70433/
State New
Headers show

Comments

Hans de Goede - Nov. 8, 2010, 4:26 p.m.
This allows us to recreate the sysfspath used during scanning later
(which will be used in a later patch in this series).
---
 usb-linux.c |   29 +++++++++++++++++++----------
 1 files changed, 19 insertions(+), 10 deletions(-)
Yuriy Kaminskiy - Nov. 9, 2010, 8:43 p.m.
Hans de Goede wrote:
> This allows us to recreate the sysfspath used during scanning later
> (which will be used in a later patch in this series).
> ---
>  usb-linux.c |   29 +++++++++++++++++++----------
>  1 files changed, 19 insertions(+), 10 deletions(-)
> 
> diff --git a/usb-linux.c b/usb-linux.c
> index c3c38ec..61e8ec6 100644
> --- a/usb-linux.c
> +++ b/usb-linux.c
[...]
> @@ -1300,6 +1302,13 @@ static int usb_host_scan_sys(void *opaque, USBScanFunc *func)
>              if (sscanf(line, "%d", &addr) != 1) {
>                  goto the_end;
>              }
> +            if (!usb_host_read_file(line, sizeof(line), "devpath",
> +                                    de->d_name)) {
> +                goto the_end;
> +            }

FYI: "devpath" attribute was introduced in 2.6.33 kernel.
Hans de Goede - Nov. 10, 2010, 8:46 a.m.
Hi,

On 11/09/2010 09:43 PM, Yuriy Kaminskiy wrote:
> Hans de Goede wrote:
>> This allows us to recreate the sysfspath used during scanning later
>> (which will be used in a later patch in this series).
>> ---
>>   usb-linux.c |   29 +++++++++++++++++++----------
>>   1 files changed, 19 insertions(+), 10 deletions(-)
>>
>> diff --git a/usb-linux.c b/usb-linux.c
>> index c3c38ec..61e8ec6 100644
>> --- a/usb-linux.c
>> +++ b/usb-linux.c
> [...]
>> @@ -1300,6 +1302,13 @@ static int usb_host_scan_sys(void *opaque, USBScanFunc *func)
>>               if (sscanf(line, "%d",&addr) != 1) {
>>                   goto the_end;
>>               }
>> +            if (!usb_host_read_file(line, sizeof(line), "devpath",
>> +                                    de->d_name)) {
>> +                goto the_end;
>> +            }
>
> FYI: "devpath" attribute was introduced in 2.6.33 kernel.
>

Ah I did not know that, well the same information is available in de->d_name, and has
been so for much longer. So I'll do a new version getting it from de->d_name instead.

Thanks,

Hans

Patch

diff --git a/usb-linux.c b/usb-linux.c
index c3c38ec..61e8ec6 100644
--- a/usb-linux.c
+++ b/usb-linux.c
@@ -62,8 +62,8 @@  struct usb_ctrlrequest {
     uint16_t wLength;
 };
 
-typedef int USBScanFunc(void *opaque, int bus_num, int addr, int class_id,
-                        int vendor_id, int product_id,
+typedef int USBScanFunc(void *opaque, int bus_num, int addr, int devpath,
+                        int class_id, int vendor_id, int product_id,
                         const char *product_name, int speed);
 
 //#define DEBUG
@@ -141,6 +141,7 @@  typedef struct USBHostDevice {
     /* Host side address */
     int bus_num;
     int addr;
+    int devpath;
     struct USBAutoFilter match;
 
     QTAILQ_ENTRY(USBHostDevice) next;
@@ -885,7 +886,7 @@  static int usb_linux_update_endp_table(USBHostDevice *s)
 }
 
 static int usb_host_open(USBHostDevice *dev, int bus_num,
-                         int addr, const char *prod_name)
+                         int addr, int devpath, const char *prod_name)
 {
     int fd = -1, ret;
     struct usbdevfs_connectinfo ci;
@@ -911,6 +912,7 @@  static int usb_host_open(USBHostDevice *dev, int bus_num,
 
     dev->bus_num = bus_num;
     dev->addr = addr;
+    dev->devpath = devpath;
     dev->fd = fd;
 
     /* read the device description */
@@ -1173,7 +1175,7 @@  static int usb_host_scan_dev(void *opaque, USBScanFunc *func)
         if (line[0] == 'T' && line[1] == ':') {
             if (device_count && (vendor_id || product_id)) {
                 /* New device.  Add the previously discovered device.  */
-                ret = func(opaque, bus_num, addr, class_id, vendor_id,
+                ret = func(opaque, bus_num, addr, 0, class_id, vendor_id,
                            product_id, product_name, speed);
                 if (ret) {
                     goto the_end;
@@ -1226,7 +1228,7 @@  static int usb_host_scan_dev(void *opaque, USBScanFunc *func)
     }
     if (device_count && (vendor_id || product_id)) {
         /* Add the last device.  */
-        ret = func(opaque, bus_num, addr, class_id, vendor_id,
+        ret = func(opaque, bus_num, addr, 0, class_id, vendor_id,
                    product_id, product_name, speed);
     }
  the_end:
@@ -1275,7 +1277,7 @@  static int usb_host_scan_sys(void *opaque, USBScanFunc *func)
 {
     DIR *dir = NULL;
     char line[1024];
-    int bus_num, addr, speed, class_id, product_id, vendor_id;
+    int bus_num, addr, devpath, speed, class_id, product_id, vendor_id;
     int ret = 0;
     char product_name[512];
     struct dirent *de;
@@ -1300,6 +1302,13 @@  static int usb_host_scan_sys(void *opaque, USBScanFunc *func)
             if (sscanf(line, "%d", &addr) != 1) {
                 goto the_end;
             }
+            if (!usb_host_read_file(line, sizeof(line), "devpath",
+                                    de->d_name)) {
+                goto the_end;
+            }
+            if (sscanf(line, "%d", &devpath) != 1) {
+                goto the_end;
+            }
             if (!usb_host_read_file(line, sizeof(line), "bDeviceClass",
                                     de->d_name)) {
                 goto the_end;
@@ -1343,7 +1352,7 @@  static int usb_host_scan_sys(void *opaque, USBScanFunc *func)
                 speed = USB_SPEED_FULL;
             }
 
-            ret = func(opaque, bus_num, addr, class_id, vendor_id,
+            ret = func(opaque, bus_num, addr, devpath, class_id, vendor_id,
                        product_id, product_name, speed);
             if (ret) {
                 goto the_end;
@@ -1434,7 +1443,7 @@  static int usb_host_scan(void *opaque, USBScanFunc *func)
 
 static QEMUTimer *usb_auto_timer;
 
-static int usb_host_auto_scan(void *opaque, int bus_num, int addr,
+static int usb_host_auto_scan(void *opaque, int bus_num, int addr, int devpath,
                               int class_id, int vendor_id, int product_id,
                               const char *product_name, int speed)
 {
@@ -1470,7 +1479,7 @@  static int usb_host_auto_scan(void *opaque, int bus_num, int addr,
         }
         DPRINTF("husb: auto open: bus_num %d addr %d\n", bus_num, addr);
 
-        usb_host_open(s, bus_num, addr, product_name);
+        usb_host_open(s, bus_num, addr, devpath, product_name);
     }
 
     return 0;
@@ -1630,7 +1639,7 @@  static void usb_info_device(Monitor *mon, int bus_num, int addr, int class_id,
 }
 
 static int usb_host_info_device(void *opaque, int bus_num, int addr,
-                                int class_id,
+                                int devpath, int class_id,
                                 int vendor_id, int product_id,
                                 const char *product_name,
                                 int speed)