Changeset 5a6cc679 in mainline for uspace/drv/hid/usbhid/usbhid.c

Timestamp:

2018-01-31T02:21:24Z (7 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

a0a9cc2

Parents:

132ab5d1

Message:

Merge commit '50f19b7ee8e94570b5c63896736c4eb49cfa18db' into forwardport

Not all ints are converted to errno_t in xhci tree yet, however it compiles and works

File:

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

uspace/drv/hid/usbhid/usbhid.c

@@ -61 +61 @@
 };
 
-static int usb_hid_set_boot_kbd_subdriver(usb_hid_dev_t *hid_dev)
+static errno_t usb_hid_set_boot_kbd_subdriver(usb_hid_dev_t *hid_dev)
 {
         assert(hid_dev != NULL);
@@ -77 +77 @@
 }
 
-static int usb_hid_set_boot_mouse_subdriver(usb_hid_dev_t *hid_dev)
+static errno_t usb_hid_set_boot_mouse_subdriver(usb_hid_dev_t *hid_dev)
 {
         assert(hid_dev != NULL);
@@ -93 +93 @@
 }
 
-static int usb_hid_set_generic_hid_subdriver(usb_hid_dev_t *hid_dev)
+static errno_t usb_hid_set_generic_hid_subdriver(usb_hid_dev_t *hid_dev)
 {
         assert(hid_dev != NULL);
@@ -182 +182 @@
 }
 
-static int usb_hid_save_subdrivers(usb_hid_dev_t *hid_dev,
+static errno_t usb_hid_save_subdrivers(usb_hid_dev_t *hid_dev,
     const usb_hid_subdriver_t **subdrivers, unsigned count)
 {
@@ -215 +215 @@
 }
 
-static int usb_hid_find_subdrivers(usb_hid_dev_t *hid_dev)
+static errno_t usb_hid_find_subdrivers(usb_hid_dev_t *hid_dev)
 {
         assert(hid_dev != NULL);
@@ -267 +267 @@
 }
 
-static int usb_hid_check_pipes(usb_hid_dev_t *hid_dev, usb_device_t *dev)
+static errno_t usb_hid_check_pipes(usb_hid_dev_t *hid_dev, usb_device_t *dev)
 {
         assert(hid_dev);
@@ -293 +293 @@
 }
 
-static int usb_hid_init_report(usb_hid_dev_t *hid_dev)
+static errno_t usb_hid_init_report(usb_hid_dev_t *hid_dev)
 {
         assert(hid_dev != NULL);
@@ -414 +414 @@
  * @return Error code.
  */
-int usb_hid_init(usb_hid_dev_t *hid_dev, usb_device_t *dev)
+errno_t usb_hid_init(usb_hid_dev_t *hid_dev, usb_device_t *dev)
 {
         assert(hid_dev);
@@ -427 +427 @@
         hid_dev->poll_pipe_mapping = NULL;
 
-        int rc = usb_hid_check_pipes(hid_dev, dev);
+        errno_t rc = usb_hid_check_pipes(hid_dev, dev);
         if (rc != EOK) {
                 return rc;
@@ -492 +492 @@
                 if (hid_dev->subdrivers[i].init != NULL) {
                         usb_log_debug("Initializing subdriver %d.",i);
-                        const int pret = hid_dev->subdrivers[i].init(hid_dev,
+                        const errno_t pret = hid_dev->subdrivers[i].init(hid_dev,
                             &hid_dev->subdrivers[i].data);
                         if (pret != EOK) {