Changeset b7fd2a0 in mainline for uspace/app/vuhid

Timestamp:

2018-01-13T03:10:29Z (8 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.

Location:

uspace/app/vuhid

Files:

• device.c (modified) (5 diffs)
• hids/bootkbd.c (modified) (1 diff)
• life.c (modified) (1 diff)
• main.c (modified) (2 diffs)
• stdreq.c (modified) (4 diffs)
• stdreq.h (modified) (1 diff)
• virthid.h (modified) (2 diffs)

uspace/app/vuhid/device.c

@@ -41 +41 @@
 #include <usb/classes/classes.h>
 
-static int on_data_from_device(usbvirt_device_t *dev,
+static errno_t on_data_from_device(usbvirt_device_t *dev,
     usb_endpoint_t ep, usb_transfer_type_t tr_type,
     void *data, size_t data_size, size_t *actual_size)
@@ -58 +58 @@
 }
 
-static int on_data_to_device(usbvirt_device_t *dev,
+static errno_t on_data_to_device(usbvirt_device_t *dev,
     usb_endpoint_t ep, usb_transfer_type_t tr_type,
     const void *data, size_t data_size)
@@ -75 +75 @@
 }
 
-static int interface_life_fibril(void *arg)
+static errno_t interface_life_fibril(void *arg)
 {
         vuhid_interface_t *iface = arg;
@@ -109 +109 @@
 }
 
-int add_interface_by_id(vuhid_interface_t **interfaces, const char *id,
+errno_t add_interface_by_id(vuhid_interface_t **interfaces, const char *id,
     usbvirt_device_t *dev)
 {
@@ -161 +161 @@
 
         /* From now on, in case of errors, we goto to error_leave */
-        int rc;
+        errno_t rc;
 
         /*

uspace/app/vuhid/hids/bootkbd.c

@@ -101 +101 @@
 };
 
-static int on_data_out(vuhid_interface_t *iface,
+static errno_t on_data_out(vuhid_interface_t *iface,
     const void *buffer, size_t buffer_size)
 {

uspace/app/vuhid/life.c

@@ -56 +56 @@
 
 
-int interface_live_on_data_in(vuhid_interface_t *iface,
+errno_t interface_live_on_data_in(vuhid_interface_t *iface,
     void *buffer, size_t buffer_size, size_t *act_buffer_size)
 {

uspace/app/vuhid/main.c

@@ -216 +216 @@
         /* Determine which interfaces to initialize. */
         for (int i = optind; i < argc; i++) {
-                int rc = add_interface_by_id(available_hid_interfaces, argv[i],
+                errno_t rc = add_interface_by_id(available_hid_interfaces, argv[i],
                     &hid_dev);
                 if (rc != EOK) {
@@ -234 +234 @@
         }
 
-        const int rc = usbvirt_device_plug(&hid_dev, controller);
+        const errno_t rc = usbvirt_device_plug(&hid_dev, controller);
         if (rc != EOK) {
                 printf("Unable to start communication with VHCD `%s': %s.\n",

uspace/app/vuhid/stdreq.c

@@ -43 +43 @@
         vuhid_data_t *vuhid = device->device_data
 
-int req_get_descriptor(usbvirt_device_t *device,
+errno_t req_get_descriptor(usbvirt_device_t *device,
     const usb_device_request_setup_packet_t *setup_packet,
     uint8_t *data, size_t *act_size)
@@ -70 +70 @@
 }
 
-int req_set_protocol(usbvirt_device_t *device,
+errno_t req_set_protocol(usbvirt_device_t *device,
     const usb_device_request_setup_packet_t *setup_packet,
     uint8_t *data, size_t *act_size)
@@ -89 +89 @@
 }
 
-int req_set_report(usbvirt_device_t *device,
+errno_t req_set_report(usbvirt_device_t *device,
     const usb_device_request_setup_packet_t *setup_packet,
     uint8_t *data, size_t *act_size)
@@ -109 +109 @@
 
         /* SET_REPORT is translated to data out */
-        int rc = iface->on_data_out(iface, data, data_length);
+        errno_t rc = iface->on_data_out(iface, data, data_length);
 
         return rc;

uspace/app/vuhid/stdreq.h

@@ -38 +38 @@
 #include <usbvirt/device.h>
 
-int req_get_descriptor(usbvirt_device_t *device,
+errno_t req_get_descriptor(usbvirt_device_t *device,
     const usb_device_request_setup_packet_t *setup_packet,
     uint8_t *data, size_t *act_size);
 
-int req_set_protocol(usbvirt_device_t *device,
+errno_t req_set_protocol(usbvirt_device_t *device,
     const usb_device_request_setup_packet_t *setup_packet,
     uint8_t *data, size_t *act_size);
 
-int req_set_report(usbvirt_device_t *device,
+errno_t req_set_report(usbvirt_device_t *device,
     const usb_device_request_setup_packet_t *setup_packet,
     uint8_t *data, size_t *act_size);

uspace/app/vuhid/virthid.h

@@ -70 +70 @@
         size_t out_data_size;
 
-        int (*on_data_in)(vuhid_interface_t *, void *, size_t, size_t *);
-        int (*on_data_out)(vuhid_interface_t *, const void *, size_t);
+        errno_t (*on_data_in)(vuhid_interface_t *, void *, size_t, size_t *);
+        errno_t (*on_data_out)(vuhid_interface_t *, const void *, size_t);
         void (*live)(vuhid_interface_t *);
 
@@ -114 +114 @@
 } __attribute__ ((packed)) hid_descriptor_t;
 
-int add_interface_by_id(vuhid_interface_t **, const char *, usbvirt_device_t *);
+errno_t add_interface_by_id(vuhid_interface_t **, const char *, usbvirt_device_t *);
 void wait_for_interfaces_death(usbvirt_device_t *);
 
 void interface_life_live(vuhid_interface_t *);
-int interface_live_on_data_in(vuhid_interface_t *, void *, size_t, size_t *);
+errno_t interface_live_on_data_in(vuhid_interface_t *, void *, size_t, size_t *);