Changeset 0a7627b in mainline

Timestamp:

2011-06-01T14:27:24Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

083adbc

Parents:

df29f24

Message:

Fixed warnings in hidreq

Location:

uspace

Files:

• drv/usbhid/usbhid.h (modified) (2 diffs)
• lib/usbhid/src/hidreq.c (modified) (12 diffs)

uspace/drv/usbhid/usbhid.h

@@ -50 +50 @@
 typedef int (*usb_hid_driver_init_t)(struct usb_hid_dev *, void **data);
 typedef void (*usb_hid_driver_deinit_t)(struct usb_hid_dev *, void *data);
-typedef bool (*usb_hid_driver_poll)(struct usb_hid_dev *, void *data, uint8_t *,
+typedef bool (*usb_hid_driver_poll_t)(struct usb_hid_dev *, void *data, uint8_t *,
                                     size_t);
-typedef int (*usb_hid_driver_poll_ended)(struct usb_hid_dev *, void *data, 
+typedef int (*usb_hid_driver_poll_ended_t)(struct usb_hid_dev *, void *data, 
                                          bool reason);
 
@@ -61 +61 @@
         usb_hid_driver_deinit_t deinit;
         /** Function to be called when data arrives from the device. */
-        usb_hid_driver_poll poll;
+        usb_hid_driver_poll_t poll;
         /** Function to be called when polling ends. */
-        usb_hid_driver_poll_ended poll_end;
+        usb_hid_driver_poll_ended_t poll_end;
         /** Arbitrary data needed by the subdriver. */
         void *data;

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;