Changeset 06f9d8fb in mainline for uspace/drv/usbhid/kbd/main.c

Timestamp:

2011-05-30T20:02:17Z (13 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

c3dafe1

Parents:

be8d907 (diff), 63862a0 (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/usbhid/kbd/main.c (modified) (2 diffs)

uspace/drv/usbhid/kbd/main.c

@@ -131 +131 @@
                     "Could not add DDF function to class 'keyboard': %s.\n",
                     str_error(rc));
-                // TODO: Can / should I destroy the DDF function?
                 ddf_fun_destroy(kbd_fun);
                 usb_kbd_free(&kbd_dev);
                 return rc;
         }
-        
-        /*
-         * Create new fibril for handling this keyboard
-         */
-        //fid_t fid = fibril_create(usb_kbd_fibril, kbd_dev);
         
         /* Start automated polling function.
@@ -164 +158 @@
                 return rc;
         }
-        //fibril_add_ready(fid);
         
         /*