Changeset 4ca778b in mainline for uspace/lib

Timestamp:

2013-01-27T15:39:10Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

2745176

Parents:

0eb2a0f

Message:

usbmid: Use initialized parent to get address and hc handle.

Remove forwarding helpers from libusb.
Remove unused headers.

Location:

uspace/lib

Files:

• usb/Makefile (modified) (1 diff)
• usb/include/usb/ddfiface.h (deleted)
• usb/src/ddfiface.c (deleted)
• usbdev/include/usb/dev/device.h (modified) (2 diffs)
• usbdev/src/devdrv.c (modified) (1 diff)
• usbdev/src/recognise.c (modified) (1 diff)

uspace/lib/usb/Makefile

@@ -36 +36 @@
 SOURCES = \
         src/class.c \
-        src/ddfiface.c \
         src/dev.c \
         src/debug.c \

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

@@ -52 +52 @@
 typedef struct usb_device usb_device_t;
 
+/* DDF parts */
 int usb_device_create_ddf(ddf_dev_t *, const usb_endpoint_description_t **, const char **);
 void usb_device_destroy_ddf(ddf_dev_t *);
+
+static inline usb_device_t *usb_device_get(ddf_dev_t *dev)
+{
+        assert(dev);
+        return ddf_dev_data_get(dev);
+}
+
 
 usb_device_t * usb_device_create(devman_handle_t);
@@ -87 +95 @@
 void * usb_device_data_get(usb_device_t *);
 
+/* Legacy support */
+usb_address_t usb_device_address(usb_device_t *);
+devman_handle_t usb_device_hc_handle(usb_device_t*);
+
 #endif
 /**

uspace/lib/usbdev/src/devdrv.c

@@ -592 +592 @@
         return usb_dev->driver_data;
 }
+
+usb_address_t usb_device_address(usb_device_t *usb_dev)
+{
+        assert(usb_dev);
+        return usb_dev->wire.address;
+}
+
+devman_handle_t usb_device_hc_handle(usb_device_t *usb_dev)
+{
+        assert(usb_dev);
+        return usb_dev->hc_conn.hc_handle;
+}
 /**
  * @}

uspace/lib/usbdev/src/recognise.c

@@ -39 +39 @@
 #include <usb/dev/pipes.h>
 #include <usb/dev/recognise.h>
-#include <usb/ddfiface.h>
 #include <usb/dev/request.h>
 #include <usb/classes/classes.h>