Changeset d083126 in mainline for uspace/lib/usbdev/include

Timestamp:

2011-10-13T13:20:26Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

3a5506a

Parents:

cff3fb6 (diff), 22a2b763 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge initial USB unplug support.

Support device_remove and device_gone in libusbdev.
usbhub and uhcirh try to unbind and destroy functions of attached devices.
add unplug support for usbhub driver (only works on empty hubs as there is no support in other drivers).

Drivers to go:

usbmid
usbflbk
usbhid
usbmast
usbmouse

Tested on:

qemu UHCI and emulated hub,
ICH8 hw and Alcor Micro Corp. USB Hub

Location:

uspace/lib/usbdev/include/usb/dev

Files:

• driver.h (modified) (3 diffs)
• hub.h (modified) (2 diffs)
• pipes.h (modified) (2 diffs)
• recognise.h (modified) (1 diff)

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

@@ -96 +96 @@
         usb_device_descriptors_t descriptors;
 
-        /** Generic DDF device backing this one. */
+        /** Generic DDF device backing this one. RO: DO NOT TOUCH!*/
         ddf_dev_t *ddf_dev;
         /** Custom driver data.
@@ -112 +112 @@
 /** USB driver ops. */
 typedef struct {
-        /** Callback when new device is about to be controlled by the driver. */
-        int (*add_device)(usb_device_t *);
+        /** Callback when a new device was added to the system. */
+        int (*device_add)(usb_device_t *);
+        /** Callback when a device is about to be removed from the system. */
+        int (*device_rem)(usb_device_t *);
+        /** Callback when a device was removed from the system. */
+        int (*device_gone)(usb_device_t *);
 } usb_driver_ops_t;
 
@@ -163 +167 @@
 
 int usb_device_retrieve_descriptors(usb_pipe_t *, usb_device_descriptors_t *);
-int usb_device_create_pipes(ddf_dev_t *, usb_device_connection_t *,
+int usb_device_create_pipes(const ddf_dev_t *, usb_device_connection_t *,
     usb_endpoint_description_t **, uint8_t *, size_t, int, int,
     usb_endpoint_mapping_t **, size_t *);
-int usb_device_destroy_pipes(ddf_dev_t *, usb_endpoint_mapping_t *, size_t);
+int usb_device_destroy_pipes(const ddf_dev_t *, usb_endpoint_mapping_t *, size_t);
 int usb_device_create(ddf_dev_t *, usb_endpoint_description_t **, usb_device_t **, const char **);
 void usb_device_destroy(usb_device_t *);

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

@@ -38 +38 @@
 #define LIBUSBDEV_HUB_H_
 
+#include <ddf/driver.h>
 #include <sys/types.h>
 #include <usb/hc.h>
 
 int usb_hc_new_device_wrapper(ddf_dev_t *, usb_hc_connection_t *, usb_speed_t,
-    int (*)(int, void *), int, void *,
-    usb_address_t *, devman_handle_t *,
-    ddf_dev_ops_t *, void *, ddf_fun_t **);
+    int (*)(void *), void *, usb_address_t *, ddf_dev_ops_t *, void *,
+    ddf_fun_t **);
 
 /** Info about device attached to host controller.
@@ -55 +55 @@
         /** Device address. */
         usb_address_t address;
-        /** Devman handle of the device. */
-        devman_handle_t handle;
-} usb_hc_attached_device_t;
+        /** DDF function (external) of the device. */
+        ddf_fun_t *fun;
+} usb_hub_attached_device_t;
 
 usb_address_t usb_hc_request_address(usb_hc_connection_t *, usb_speed_t);
 int usb_hc_register_device(usb_hc_connection_t *,
-    const usb_hc_attached_device_t *);
+    const usb_hub_attached_device_t *);
 int usb_hc_unregister_device(usb_hc_connection_t *, usb_address_t);
 

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

@@ -159 +159 @@
     usb_device_connection_t *, usb_hc_connection_t *);
 int usb_device_connection_initialize_from_device(usb_device_connection_t *,
-    ddf_dev_t *);
+    const ddf_dev_t *);
 int usb_device_connection_initialize(usb_device_connection_t *,
     devman_handle_t, usb_address_t);
 
-int usb_device_get_assigned_interface(ddf_dev_t *);
+int usb_device_get_assigned_interface(const ddf_dev_t *);
 
 int usb_pipe_initialize(usb_pipe_t *, usb_device_connection_t *,
@@ -185 +185 @@
 int usb_pipe_control_read(usb_pipe_t *, const void *, size_t,
     void *, size_t, size_t *);
-int usb_pipe_control_write(usb_pipe_t *, void *, size_t,
-    void *, size_t);
+int usb_pipe_control_write(usb_pipe_t *, const void *, size_t,
+    const void *, size_t);
 
 #endif

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

@@ -51 +51 @@
 
 int usb_device_register_child_in_devman(usb_address_t, devman_handle_t,
-    ddf_dev_t *, devman_handle_t *, ddf_dev_ops_t *, void *, ddf_fun_t **);
+    ddf_dev_t *, ddf_dev_ops_t *, void *, ddf_fun_t **);
 
 #endif