Changeset 2ac7af3 in mainline for uspace/drv/bus/usb/usbhid/main.c

Timestamp:

2011-10-14T19:40:28Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

df3caec5

Parents:

6d4d883 (diff), 3a5506a (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 mainline changes

File:

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

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

@@ -150 +150 @@
  * @retval EREFUSED if the device is not supported.
  */
-static int usb_hid_add_device(usb_device_t *dev)
+static int usb_hid_device_add(usb_device_t *dev)
 {
-        usb_log_debug("usb_hid_add_device()\n");
+        usb_log_debug("usb_hid_device_add()\n");
         
         if (dev == NULL) {
@@ -185 +185 @@
  * supports unplug, more callbacks will be added. */
 static usb_driver_ops_t usb_hid_driver_ops = {
-        .add_device = usb_hid_add_device,
+        .device_add = usb_hid_device_add,
 };