Changeset 43c3937 in mainline for uspace/drv/usbkbd/main.c

Timestamp:

2011-01-07T10:43:15Z (13 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

5097bed4

Parents:

5f7d96e (diff), 0f191a2 (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 usb/development

File:

• uspace/drv/usbkbd/main.c (modified) (2 diffs)

uspace/drv/usbkbd/main.c

@@ -190 +190 @@
         // get phone to my HC and save it as my parent's phone
         // TODO: maybe not a good idea if DDF will use parent_phone
-        kbd_dev->device->parent_phone = usb_drv_hc_connect(dev, 0);
+        kbd_dev->device->parent_phone = usb_drv_hc_connect_auto(dev, 0);
 
         kbd_dev->address = usb_drv_get_my_address(dev->parent_phone,
@@ -325 +325 @@
          * Not supported yet, skip..
          */
-//      int phone = usb_drv_hc_connect(dev, 0);
+//      int phone = usb_drv_hc_connect_auto(dev, 0);
 //      if (phone < 0) {
 //              /*