Changeset 87619045 in mainline

Timestamp:

2013-01-27T11:35:32Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

7363fc1

Parents:

71384bd3

Message:

usb: Move usb_device to a separate header

Location:

uspace

Files:

• drv/bus/usb/usbhub/port.h (modified) (1 diff)
• lib/usbdev/include/usb/dev/device.h (added)
• lib/usbdev/include/usb/dev/driver.h (modified) (2 diffs)
• lib/usbdev/src/devdrv.c (modified) (1 diff)

uspace/drv/bus/usb/usbhub/port.h

@@ -38 +38 @@
 #include <usb/dev/driver.h>
 #include <usb/classes/hub.h>
+#include <usb_iface.h>
 
 typedef struct usb_hub_dev usb_hub_dev_t;

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

@@ -37 +37 @@
 #define LIBUSBDEV_DRIVER_H_
 
-#include <usb/hc.h>
-#include <usb/dev/alternate_ifaces.h>
-#include <usb/dev/usb_device_connection.h>
+#include <usb/dev/device.h>
 #include <usb/dev/pipes.h>
-#include <usb_iface.h>
-
-typedef struct usb_device usb_device_t;
 
 /** USB driver ops. */
@@ -98 +93 @@
 int usb_driver_main(const usb_driver_t *);
 
-int usb_device_create_ddf(ddf_dev_t *, const usb_endpoint_description_t **, const char **);
-void usb_device_destroy_ddf(ddf_dev_t *);
-
-const char* usb_device_get_name(usb_device_t *);
-ddf_fun_t *usb_device_ddf_fun_create(usb_device_t *, fun_type_t, const char *);
-
-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 **);
-
-int usb_device_create_pipes(usb_device_t *usb_dev,
-    const usb_endpoint_description_t **endpoints);
-void usb_device_destroy_pipes(usb_device_t *);
-
-usb_pipe_t *usb_device_get_default_pipe(usb_device_t *);
-usb_endpoint_mapping_t * usb_device_get_mapped_ep_desc(usb_device_t *,
-    const usb_endpoint_description_t *);
-usb_endpoint_mapping_t * usb_device_get_mapped_ep(usb_device_t *,
-    usb_endpoint_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 *);
-
 #endif
 /**

uspace/lib/usbdev/src/devdrv.c

@@ -33 +33 @@
  * USB device driver framework.
  */
-#include <usb/dev/driver.h>
+
+#include <usb_iface.h>
+#include <usb/dev/device.h>
 #include <usb/dev/request.h>
 #include <usb/debug.h>