Changeset 45bf63c in mainline for uspace/drv/bus/usb/usbhub/main.c

Timestamp:

2011-10-30T15:35:36Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

20a3465, 3ce78580

Parents:

1737bfb (diff), e978ada (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 from USB branch.

Cleanup libusbhost interfaces.
Fix few possible memory corruption/crashes and memory leaks.
Add device_remove hooks for usbflbk, usbhid.

File:

• uspace/drv/bus/usb/usbhub/main.c (modified) (3 diffs)

uspace/drv/bus/usb/usbhub/main.c

@@ -47 +47 @@
  * For more information see section 11.15.1 of USB 1.1 specification.
  */
-static usb_endpoint_description_t hub_status_change_endpoint_description = {
+static const usb_endpoint_description_t hub_status_change_endpoint_description =
+{
         .transfer_type = USB_TRANSFER_INTERRUPT,
         .direction = USB_DIRECTION_IN,
@@ -56 +57 @@
 };
 
-/**
- * USB hub driver operations
- *
- * The most important one is device_add, which is set to usb_hub_device_add.
- */
-static usb_driver_ops_t usb_hub_driver_ops = {
+/** USB hub driver operations. */
+static const usb_driver_ops_t usb_hub_driver_ops = {
         .device_add = usb_hub_device_add,
+//      .device_rem = usb_hub_device_remove,
         .device_gone = usb_hub_device_gone,
 };
@@ -72 +70 @@
 };
 /** Static usb hub driver information. */
-static usb_driver_t usb_hub_driver = {
+static const usb_driver_t usb_hub_driver = {
         .name = NAME,
         .ops = &usb_hub_driver_ops,
         .endpoints = usb_hub_endpoints
 };
-
 
 int main(int argc, char *argv[])