Changeset d083126 in mainline for uspace/lib/usbdev/include/usb/dev/driver.h

Timestamp:

2011-10-13T13:20:26Z (13 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

File:

• uspace/lib/usbdev/include/usb/dev/driver.h (modified) (3 diffs)

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 *);