Changeset fbefd0e in mainline for uspace/drv/usbhid

Timestamp:

2011-03-21T18:14:30Z (15 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

5f80527, ce794342

Parents:

215b001

Message:

USB drivers less verbose on info level

Location:

uspace/drv/usbhid

Files:

• hiddev.c (modified) (3 diffs)
• kbddev.c (modified) (8 diffs)
• main.c (modified) (3 diffs)

uspace/drv/usbhid/hiddev.c

@@ -192 +192 @@
         assert(hid_dev != NULL);
         
-        usb_log_info("Processing descriptors...\n");
+        usb_log_debug("Processing descriptors...\n");
         
         int rc;
@@ -368 +368 @@
     usb_endpoint_description_t *poll_ep_desc)
 {
-        usb_log_info("Initializing HID device structure.\n");
+        usb_log_debug("Initializing HID device structure.\n");
         
         if (hid_dev == NULL) {
@@ -454 +454 @@
         
         hid_dev->initialized = 1;
-        usb_log_info("HID device structure initialized.\n");
+        usb_log_debug("HID device structure initialized.\n");
         
         return EOK;

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) {
@@ -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;
         }

uspace/drv/usbhid/main.c

@@ -39 +39 @@
 #include <usb/debug.h>
 #include <errno.h>
+#include <str_error.h>
 
 #include "kbddev.h"
@@ -64 +65 @@
         
         if (rc != EOK) {
-                usb_log_info("Device is not a supported keyboard.\n");
-                usb_log_error("Failed to add HID device.\n");
-                return EREFUSED;
+                usb_log_warning("Device is not a supported keyboard.\n");
+                usb_log_error("Failed to add HID device: %s.\n",
+                    str_error(rc));
+                return rc;
         }
         
+        usb_log_info("Keyboard `%s' ready to use.\n", dev->name);
+
         return EOK;
 }
@@ -89 +93 @@
 int main(int argc, char *argv[])
 {
+        printf(NAME ": HelenOS USB HID driver.\n");
+
         usb_log_enable(USB_LOG_LEVEL_DEFAULT, NAME);
+
         return ddf_driver_main(&kbd_driver);
 }