Changeset 49ba19d in mainline for uspace/lib/usbhid/src/hidreq.c

Timestamp:

2011-06-01T16:09:24Z (14 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

bbfa425

Parents:

65c3794 (diff), 083adbc (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:

(partial) merge with development

File:

• uspace/lib/usbhid/src/hidreq.c (modified) (12 diffs)

uspace/lib/usbhid/src/hidreq.c

@@ -82 +82 @@
         value |= (type << 8);
 
-        usb_log_debug("Sending Set_Report request to the device.\n");
+        usb_log_debug("Sending Set Report request to the device.\n");
         
         rc = usb_control_request_set(ctrl_pipe, 
@@ -89 +89 @@
 
         if (rc != EOK) {
-                usb_log_warning("Error sending output report to the keyboard: "
-                    "%s.\n", str_error(rc));
+                usb_log_warning("Error sending Set Report request to the "
+                    "device: %s.\n", str_error(rc));
                 return rc;
         }
@@ -129 +129 @@
         int rc;
 
-        usb_log_debug("Sending Set_Protocol request to the device ("
+        usb_log_debug("Sending Set Protocol request to the device ("
             "protocol: %d, iface: %d).\n", protocol, iface_no);
         
@@ -137 +137 @@
 
         if (rc != EOK) {
-                usb_log_warning("Error sending output report to the keyboard: "
-                    "%s.\n", str_error(rc));
+                usb_log_warning("Error sending Set Protocol request to the "
+                    "device: %s.\n", str_error(rc));
                 return rc;
         }
@@ -177 +177 @@
         int rc;
 
-        usb_log_debug("Sending Set_Idle request to the device ("
+        usb_log_debug("Sending Set Idle request to the device ("
             "duration: %u, iface: %d).\n", duration, iface_no);
         
@@ -187 +187 @@
 
         if (rc != EOK) {
-                usb_log_warning("Error sending output report to the keyboard: "
+                usb_log_warning("Error sending Set Idle request to the device: "
                     "%s.\n", str_error(rc));
                 return rc;
@@ -235 +235 @@
         value |= (type << 8);
         
-        usb_log_debug("Sending Get_Report request to the device.\n");
+        usb_log_debug("Sending Get Report request to the device.\n");
         
         rc = usb_control_request_get(ctrl_pipe, 
@@ -243 +243 @@
 
         if (rc != EOK) {
-                usb_log_warning("Error sending output report to the keyboard: "
+                usb_log_warning("Error sending Get Report request to the device: "
                     "%s.\n", str_error(rc));
                 return rc;
@@ -283 +283 @@
         int rc; 
 
-        usb_log_debug("Sending Get_Protocol request to the device ("
+        usb_log_debug("Sending Get Protocol request to the device ("
             "iface: %d).\n", iface_no);
         
@@ -294 +294 @@
 
         if (rc != EOK) {
-                usb_log_warning("Error sending output report to the keyboard: "
-                    "%s.\n", str_error(rc));
+                usb_log_warning("Error sending Get Protocol request to the "
+                    "device: %s.\n", str_error(rc));
                 return rc;
         }
@@ -344 +344 @@
         int rc;
 
-        usb_log_debug("Sending Get_Idle request to the device ("
+        usb_log_debug("Sending Get Idle request to the device ("
             "iface: %d).\n", iface_no);
         
@@ -357 +357 @@
 
         if (rc != EOK) {
-                usb_log_warning("Error sending output report to the keyboard: "
+                usb_log_warning("Error sending Get Idle request to the device: "
                     "%s.\n", str_error(rc));
                 return rc;