Changeset 8e10ef4 in mainline

Timestamp:

2013-01-26T18:13:25Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

b208b3b

Parents:

ad97131

Message:

libusbdev: Interface number and alternate interfaces wrappers.

Location:

uspace

Files:

• drv/bus/usb/usbflbk/main.c (modified) (1 diff)
• drv/bus/usb/usbhid/kbd/kbddev.c (modified) (3 diffs)
• drv/bus/usb/usbhid/main.c (modified) (1 diff)
• drv/bus/usb/usbhid/mouse/mousedev.c (modified) (2 diffs)
• drv/bus/usb/usbmast/bo_trans.c (modified) (2 diffs)
• lib/usbdev/include/usb/dev/driver.h (modified) (2 diffs)
• lib/usbdev/src/devdrv.c (modified) (2 diffs)

uspace/drv/bus/usb/usbflbk/main.c

@@ -49 +49 @@
 {
         usb_log_info("Pretending to control %s `%s'.\n",
-            dev->interface_no < 0 ? "device" : "interface",
+            usb_device_get_iface_number(dev) < 0 ? "device" : "interface",
             usb_device_get_name(dev));
         return EOK;

uspace/drv/bus/usb/usbhid/kbd/kbddev.c

@@ -272 +272 @@
         rc = usbhid_req_set_report(
             usb_device_get_default_pipe(hid_dev->usb_dev),
-            hid_dev->usb_dev->interface_no, USB_HID_REPORT_TYPE_OUTPUT,
+            usb_device_get_iface_number(hid_dev->usb_dev),
+            USB_HID_REPORT_TYPE_OUTPUT,
             kbd_dev->output_buffer, kbd_dev->output_size);
         if (rc != EOK) {
@@ -583 +584 @@
 
         usbhid_req_set_idle(usb_device_get_default_pipe(hid_dev->usb_dev),
-            hid_dev->usb_dev->interface_no, IDLE_RATE);
+            usb_device_get_iface_number(hid_dev->usb_dev), IDLE_RATE);
 
 
@@ -789 +790 @@
         rc = usbhid_req_set_protocol(
             usb_device_get_default_pipe(hid_dev->usb_dev),
-            hid_dev->usb_dev->interface_no, USB_HID_PROTOCOL_BOOT);
+            usb_device_get_iface_number(hid_dev->usb_dev),
+            USB_HID_PROTOCOL_BOOT);
 
         if (rc != EOK) {

uspace/drv/bus/usb/usbhid/main.c

@@ -65 +65 @@
         }
 
-        if (dev->interface_no < 0) {
+        if (usb_device_get_iface_number(dev) < 0) {
                 usb_log_error("Failed to add HID device: endpoints not found."
                     "\n");

uspace/drv/bus/usb/usbhid/mouse/mousedev.c

@@ -316 +316 @@
         // TODO: how to know if the device supports the request???
         usbhid_req_set_idle(usb_device_get_default_pipe(hid_dev->usb_dev),
-            hid_dev->usb_dev->interface_no, IDLE_RATE);
+            usb_device_get_iface_number(hid_dev->usb_dev), IDLE_RATE);
         return EOK;
 }
@@ -427 +427 @@
         rc = usbhid_req_set_protocol(
             usb_device_get_default_pipe(hid_dev->usb_dev),
-            hid_dev->usb_dev->interface_no, USB_HID_PROTOCOL_BOOT);
+            usb_device_get_iface_number(hid_dev->usb_dev),
+            USB_HID_PROTOCOL_BOOT);
 
         if (rc != EOK) {

uspace/drv/bus/usb/usbmast/bo_trans.c

@@ -202 +202 @@
             usb_device_get_default_pipe(mdev->usb_dev),
             USB_REQUEST_TYPE_CLASS, USB_REQUEST_RECIPIENT_INTERFACE,
-            0xFF, 0, mdev->usb_dev->interface_no, NULL, 0);
+            0xFF, 0, usb_device_get_iface_number(mdev->usb_dev), NULL, 0);
 }
 
@@ -242 +242 @@
             usb_device_get_default_pipe(mdev->usb_dev),
             USB_REQUEST_TYPE_CLASS, USB_REQUEST_RECIPIENT_INTERFACE,
-            0xFE, 0, mdev->usb_dev->interface_no, &max_lun, 1, &data_recv_len);
+            0xFE, 0, usb_device_get_iface_number(mdev->usb_dev), &max_lun, 1,
+            &data_recv_len);
         if (rc != EOK) {
                 return rc;

uspace/lib/usbdev/include/usb/dev/driver.h

@@ -66 +66 @@
 } usb_alternate_interfaces_t;
 
+size_t usb_interface_count_alternates(const uint8_t *, size_t, uint8_t);
+int usb_alternate_interfaces_init(usb_alternate_interfaces_t *,
+    const uint8_t *, size_t, int);
+void usb_alternate_interfaces_deinit(usb_alternate_interfaces_t *);
+
 /** USB device structure. */
 typedef struct {
@@ -182 +187 @@
     usb_endpoint_mapping_t **, size_t *);
 void usb_device_destroy_pipes(usb_endpoint_mapping_t *, size_t);
+
 usb_pipe_t *usb_device_get_default_pipe(usb_device_t *);
 usb_pipe_t *usb_device_get_pipe(usb_device_t *, usb_endpoint_t, usb_direction_t);
 
+int usb_device_get_iface_number(usb_device_t *);
 const usb_standard_device_descriptor_t *
 usb_device_get_device_descriptor(usb_device_t *);
 const void * usb_device_get_configuration_descriptor(usb_device_t *, size_t *);
-
+const usb_alternate_interfaces_t * usb_device_get_alternative_ifaces(
+    usb_device_t *);
 
 void * usb_device_data_alloc(usb_device_t *, size_t);
 void * usb_device_data_get(usb_device_t *);
 
-size_t usb_interface_count_alternates(const uint8_t *, size_t, uint8_t);
-int usb_alternate_interfaces_init(usb_alternate_interfaces_t *,
-    const uint8_t *, size_t, int);
-void usb_alternate_interfaces_deinit(usb_alternate_interfaces_t *);
 #endif
 /**

uspace/lib/usbdev/src/devdrv.c

@@ -279 +279 @@
 }
 
+int usb_device_get_iface_number(usb_device_t *usb_dev)
+{
+        assert(usb_dev);
+        return usb_dev->interface_no;
+}
+
 const usb_standard_device_descriptor_t *
 usb_device_get_device_descriptor(usb_device_t *usb_dev)
@@ -293 +299 @@
                 *size = usb_dev->descriptors.configuration_size;
         return usb_dev->descriptors.configuration;
+}
+
+const usb_alternate_interfaces_t * usb_device_get_alternative_ifaces(
+    usb_device_t *usb_dev)
+{
+        assert(usb_dev);
+        return &usb_dev->alternate_interfaces;
 }