Changeset 5a6cc679 in mainline for uspace/drv/hid/usbhid/mouse

Timestamp:

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

Author:

Jenda <jenda.jzqk73@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/fix-logger-deadlock, 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

Location:

uspace/drv/hid/usbhid/mouse

Files:

• mousedev.c (modified) (6 diffs)
• mousedev.h (modified) (1 diff)

uspace/drv/hid/usbhid/mouse/mousedev.c

@@ -228 +228 @@
                 return;
         }
-        int ret =
+        errno_t ret =
            usb_hid_report_path_append_item(path, USB_HIDUT_PAGE_BUTTON, 0);
         if (ret != EOK) {
@@ -318 +318 @@
 }
 
-static int mouse_dev_init(usb_mouse_t *mouse_dev, usb_hid_dev_t *hid_dev)
+static errno_t mouse_dev_init(usb_mouse_t *mouse_dev, usb_hid_dev_t *hid_dev)
 {
         // FIXME: This may not be optimal since stupid hardware vendor may
@@ -342 +342 @@
 }
 
-int usb_mouse_init(usb_hid_dev_t *hid_dev, void **data)
+errno_t usb_mouse_init(usb_hid_dev_t *hid_dev, void **data)
 {
         usb_log_debug("Initializing HID/Mouse structure...");
@@ -369 +369 @@
         }
 
-        int ret = mouse_dev_init(mouse_dev, hid_dev);
+        errno_t ret = mouse_dev_init(mouse_dev, hid_dev);
         if (ret != EOK) {
                 usb_log_error("Failed to init HID mouse device structure.");
@@ -427 +427 @@
         /* Hangup session to the console */
         if (mouse_dev->mouse_sess != NULL) {
-                const int ret = async_hangup(mouse_dev->mouse_sess);
+                const errno_t ret = async_hangup(mouse_dev->mouse_sess);
                 if (ret != EOK)
                         usb_log_warning("Failed to hang up mouse session: "
@@ -437 +437 @@
 }
 
-int usb_mouse_set_boot_protocol(usb_hid_dev_t *hid_dev)
-{
-        int rc = usb_hid_parse_report_descriptor(
+errno_t usb_mouse_set_boot_protocol(usb_hid_dev_t *hid_dev)
+{
+        errno_t rc = usb_hid_parse_report_descriptor(
             &hid_dev->report, USB_MOUSE_BOOT_REPORT_DESCRIPTOR,
             sizeof(USB_MOUSE_BOOT_REPORT_DESCRIPTOR));

uspace/drv/hid/usbhid/mouse/mousedev.h

@@ -59 +59 @@
 extern const char *HID_MOUSE_CATEGORY;
 
-extern int usb_mouse_init(usb_hid_dev_t *, void **);
+extern errno_t usb_mouse_init(usb_hid_dev_t *, void **);
 extern bool usb_mouse_polling_callback(usb_hid_dev_t *, void *);
 extern void usb_mouse_deinit(usb_hid_dev_t *, void *);
-extern int usb_mouse_set_boot_protocol(usb_hid_dev_t *);
+extern errno_t usb_mouse_set_boot_protocol(usb_hid_dev_t *);
 
 #endif // USB_HID_MOUSEDEV_H_