Changeset 8e10ef4 in mainline for uspace/lib

Timestamp:

2013-01-26T18:13:25Z (13 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/lib/usbdev

Files:

• include/usb/dev/driver.h (modified) (2 diffs)
• src/devdrv.c (modified) (2 diffs)

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;
 }