Changeset 62f4212 in mainline for uspace/drv/usbhid/kbddev.c

Timestamp:

2011-03-22T10:07:53Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

f8e4cb6

Parents:

18b3cfd (diff), b01995b (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:

Merged changes from development

File:

• uspace/drv/usbhid/kbddev.c (modified) (10 diffs)

uspace/drv/usbhid/kbddev.c

@@ -662 +662 @@
         int rc;
         
-        usb_log_info("Initializing HID/KBD structure...\n");
+        usb_log_debug("Initializing HID/KBD structure...\n");
         
         if (kbd_dev == NULL) {
@@ -742 +742 @@
         
         kbd_dev->initialized = USBHID_KBD_STATUS_INITIALIZED;
-        usb_log_info("HID/KBD device structure initialized.\n");
+        usb_log_debug("HID/KBD device structure initialized.\n");
         
         return EOK;
@@ -769 +769 @@
         size_t actual_size;
         
-        usb_log_info("Polling keyboard...\n");
+        usb_log_debug("Polling keyboard...\n");
         
         if (!kbd_dev->initialized) {
@@ -780 +780 @@
 
         while (true) {
-                sess_rc = usb_endpoint_pipe_start_session(
+                sess_rc = usb_pipe_start_session(
                     &kbd_dev->hid_dev->poll_pipe);
                 if (sess_rc != EOK) {
@@ -788 +788 @@
                 }
 
-                rc = usb_endpoint_pipe_read(&kbd_dev->hid_dev->poll_pipe, 
+                rc = usb_pipe_read(&kbd_dev->hid_dev->poll_pipe, 
                     buffer, BOOTP_BUFFER_SIZE, &actual_size);
                 
-                sess_rc = usb_endpoint_pipe_end_session(
+                sess_rc = usb_pipe_end_session(
                     &kbd_dev->hid_dev->poll_pipe);
 
@@ -907 +907 @@
          * Initialize device (get and process descriptors, get address, etc.)
          */
-        usb_log_info("Initializing USB/HID KBD device...\n");
+        usb_log_debug("Initializing USB/HID KBD device...\n");
         
         usbhid_kbd_t *kbd_dev = usbhid_kbd_new();
@@ -926 +926 @@
         }       
         
-        usb_log_info("USB/HID KBD device structure initialized.\n");
+        usb_log_debug("USB/HID KBD device structure initialized.\n");
         
         /*
@@ -937 +937 @@
         rc = ddf_fun_bind(kbd_fun);
         if (rc != EOK) {
-                usb_log_error("Could not bind DDF function.\n");
+                usb_log_error("Could not bind DDF function: %s.\n",
+                    str_error(rc));
                 // TODO: Can / should I destroy the DDF function?
                 ddf_fun_destroy(kbd_fun);
@@ -946 +947 @@
         rc = ddf_fun_add_to_class(kbd_fun, "keyboard");
         if (rc != EOK) {
-                usb_log_error("Could not add DDF function to class 'keyboard'"
-                    "\n");
+                usb_log_error(
+                    "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);
@@ -959 +961 @@
         fid_t fid = fibril_create(usbhid_kbd_fibril, kbd_dev);
         if (fid == 0) {
-                usb_log_error("Failed to start fibril for KBD device\n");
+                usb_log_error("Failed to start fibril for `%s' device.\n",
+                    dev->name);
                 return ENOMEM;
         }