Changeset 9e195e2c in mainline for uspace/drv/uhci-hcd/main.c

Timestamp:

2011-05-12T09:03:00Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

d59d0bb

Parents:

456aea3 (diff), c372e03 (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 development

File:

• uspace/drv/uhci-hcd/main.c (modified) (2 diffs)

uspace/drv/uhci-hcd/main.c

@@ -64 +64 @@
         assert(device);
 
-        uhci_t *uhci = malloc(sizeof(uhci_t));
-        if (uhci == NULL) {
-                usb_log_error("Failed to allocate UHCI driver.\n");
-                return ENOMEM;
-        }
-
-        int ret = uhci_init(uhci, device);
+        int ret = device_setup_uhci(device);
         if (ret != EOK) {
                 usb_log_error("Failed to initialize UHCI driver: %s.\n",
@@ -76 +70 @@
                 return ret;
         }
-        device->driver_data = uhci;
-
         usb_log_info("Controlling new UHCI device '%s'.\n", device->name);