Changeset d5ba17f in mainline for uspace/drv/bus/usb/uhcirh/main.c

Timestamp:

2011-11-18T15:32:24Z (13 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

528e5b3

Parents:

b12ca16 (diff), 0c0f823b (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 with mainline

File:

• uspace/drv/bus/usb/uhcirh/main.c (modified) (2 diffs)

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

@@ -51 +51 @@
     uintptr_t *io_reg_address, size_t *io_reg_size);
 
-static int uhci_rh_add_device(ddf_dev_t *device);
+static int uhci_rh_dev_add(ddf_dev_t *device);
 
 static driver_ops_t uhci_rh_driver_ops = {
-        .add_device = uhci_rh_add_device,
+        .dev_add = uhci_rh_dev_add,
 };
 
@@ -82 +82 @@
  * @return Error code.
  */
-static int uhci_rh_add_device(ddf_dev_t *device)
+static int uhci_rh_dev_add(ddf_dev_t *device)
 {
         if (!device)
                 return EINVAL;
 
-        usb_log_debug2("uhci_rh_add_device(handle=%" PRIun ")\n",
+        usb_log_debug2("uhci_rh_dev_add(handle=%" PRIun ")\n",
             device->handle);