Changeset 0f4bff8 in mainline for uspace/lib

Timestamp:

2013-01-24T21:19:56Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

ffa254f1

Parents:

ef40434

Message:

libusbdev: Add and use few new wrappers.

Location:

uspace/lib/usbdev

Files:

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

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

@@ -110 +110 @@
          */
         void *driver_data;
+
         usb_dev_session_t *bus_session;
 } usb_device_t;
@@ -170 +171 @@
 void usb_device_deinit(usb_device_t *);
 
+async_exch_t * usb_device_bus_exchange_begin(usb_device_t *);
+void usb_device_bus_exchange_end(async_exch_t *);
+
 int usb_device_select_interface(usb_device_t *, uint8_t,
     const usb_endpoint_description_t **);
@@ -180 +184 @@
     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);
 
 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);

uspace/lib/usbdev/src/devdrv.c

@@ -388 +388 @@
 }
 
+usb_pipe_t *usb_device_get_default_pipe(usb_device_t *usb_dev)
+{
+        assert(usb_dev);
+        return &usb_dev->ctrl_pipe;
+}
+
 /** Initialize new instance of USB device.
  *
@@ -515 +521 @@
 }
 
+async_exch_t * usb_device_bus_exchange_begin(usb_device_t *usb_dev)
+{
+        assert(usb_dev);
+        return async_exchange_begin(usb_dev->bus_session);
+}
+
+void usb_device_bus_exchange_end(async_exch_t *exch)
+{
+        async_exchange_end(exch);
+}
+
 /** Allocate driver specific data.
  * @param usb_dev usb_device structure.
@@ -528 +545 @@
 }
 
+void * usb_device_data_get(usb_device_t *usb_dev)
+{
+        assert(usb_dev);
+        return usb_dev->driver_data;
+}
 /**
  * @}