Changeset b7fd2a0 in mainline for uspace/drv/hid/usbhid/kbd/kbddev.c

Timestamp:

2018-01-13T03:10:29Z (7 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

a53ed3a

Parents:

36f0738

Message:

Use errno_t in all uspace and kernel code.

Change type of every variable, parameter and return value that holds an
<errno.h> constant to either errno_t (the usual case), or sys_errno_t
(some places in kernel). This is for the purpose of self-documentation,
as well as for type-checking with a bit of type definition hackery.

Although this is a massive commit, it is a simple text replacement, and thus
is very easy to verify. Simply do the following:

`
git checkout <this commit's hash>
git reset HEAD
<sup>git add .
tools/srepl '\berrno_t\b' int
git add .
tools/srepl '\bsys_errno_t\b' sysarg_t
git reset
git diff
`</sup>

While this doesn't ensure that the replacements are correct, it does ensure
that the commit doesn't do anything except those replacements. Since errno_t
is typedef'd to int in the usual case (and sys_errno_t to sysarg_t), even if
incorrect, this commit cannot change behavior.

File:

• uspace/drv/hid/usbhid/kbd/kbddev.c (modified) (7 diffs)

uspace/drv/hid/usbhid/kbd/kbddev.c

@@ -257 +257 @@
 
         // TODO: what about the Report ID?
-        int rc = usb_hid_report_output_translate(&hid_dev->report, 0,
+        errno_t rc = usb_hid_report_output_translate(&hid_dev->report, 0,
             kbd_dev->output_buffer, kbd_dev->output_size);
 
@@ -435 +435 @@
         }
 
-        int ret =
+        errno_t ret =
            usb_hid_report_path_append_item(path, USB_HIDUT_PAGE_KEYBOARD, 0);
         if (ret != EOK) {
@@ -480 +480 @@
 /* HID/KBD structure manipulation                                             */
 
-static int kbd_dev_init(usb_kbd_t *kbd_dev, usb_hid_dev_t *hid_dev)
+static errno_t kbd_dev_init(usb_kbd_t *kbd_dev, usb_hid_dev_t *hid_dev)
 {
         assert(kbd_dev);
@@ -507 +507 @@
         }
 
-        int ret =
+        errno_t ret =
             usb_hid_report_path_append_item(path, USB_HIDUT_PAGE_KEYBOARD, 0);
         if (ret != EOK) {
@@ -616 +616 @@
  * @return Other value inherited from function usbhid_dev_init().
  */
-int usb_kbd_init(usb_hid_dev_t *hid_dev, void **data)
+errno_t usb_kbd_init(usb_hid_dev_t *hid_dev, void **data)
 {
         usb_log_debug("Initializing HID/KBD structure...\n");
@@ -642 +642 @@
         }
 
-        int ret = kbd_dev_init(kbd_dev, hid_dev);
+        errno_t ret = kbd_dev_init(kbd_dev, hid_dev);
         if (ret != EOK) {
                 usb_log_error("Failed to initialize KBD device  structure.\n");
@@ -775 +775 @@
 }
 
-int usb_kbd_set_boot_protocol(usb_hid_dev_t *hid_dev)
+errno_t usb_kbd_set_boot_protocol(usb_hid_dev_t *hid_dev)
 {
         assert(hid_dev);
-        int rc = usb_hid_parse_report_descriptor(
+        errno_t rc = usb_hid_parse_report_descriptor(
             &hid_dev->report, USB_KBD_BOOT_REPORT_DESCRIPTOR,
             sizeof(USB_KBD_BOOT_REPORT_DESCRIPTOR));