Changeset b7fd2a0 in mainline for uspace/lib/usbdev/src/devdrv.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/lib/usbdev/src/devdrv.c (modified) (13 diffs)

uspace/lib/usbdev/src/devdrv.c

@@ -131 +131 @@
  * @return Error code.
  */
-int usb_device_select_interface(usb_device_t *usb_dev,
+errno_t usb_device_select_interface(usb_device_t *usb_dev,
     uint8_t alternate_setting, const usb_endpoint_description_t **endpoints)
 {
@@ -141 +141 @@
 
         /* Change the interface itself. */
-        int rc = usb_request_set_interface(&usb_dev->ctrl_pipe,
+        errno_t rc = usb_request_set_interface(&usb_dev->ctrl_pipe,
             usb_dev->interface_no, alternate_setting);
         if (rc != EOK) {
@@ -165 +165 @@
  * @return Error code.
  */
-static int usb_device_retrieve_descriptors(usb_device_t *usb_dev)
+static errno_t usb_device_retrieve_descriptors(usb_device_t *usb_dev)
 {
         assert(usb_dev);
@@ -171 +171 @@
 
         /* Get the device descriptor. */
-        int rc = usb_request_get_device_descriptor(&usb_dev->ctrl_pipe,
+        errno_t rc = usb_request_get_device_descriptor(&usb_dev->ctrl_pipe,
             &usb_dev->descriptors.device);
         if (rc != EOK) {
@@ -217 +217 @@
  * @return Error code.
  */
-int usb_device_create_pipes(usb_device_t *usb_dev,
+errno_t usb_device_create_pipes(usb_device_t *usb_dev,
     const usb_endpoint_description_t **endpoints)
 {
@@ -245 +245 @@
 
         /* Find the mapping from configuration descriptor. */
-        int rc = usb_pipe_initialize_from_configuration(pipes, pipe_count,
+        errno_t rc = usb_pipe_initialize_from_configuration(pipes, pipe_count,
             usb_dev->descriptors.full_config,
             usb_dev->descriptors.full_config_size,
@@ -393 +393 @@
  * @return Error code.
  */
-static int usb_device_init(usb_device_t *usb_dev, ddf_dev_t *ddf_dev,
+static errno_t usb_device_init(usb_device_t *usb_dev, ddf_dev_t *ddf_dev,
     const usb_endpoint_description_t **endpoints, const char **errstr_ptr,
     devman_handle_t handle, int interface_no)
@@ -420 +420 @@
         /* This pipe was registered by the hub driver,
          * during device initialization. */
-        int rc = usb_pipe_initialize_default_control(
+        errno_t rc = usb_pipe_initialize_default_control(
             &usb_dev->ctrl_pipe, usb_dev->bus_session);
         if (rc != EOK) {
@@ -457 +457 @@
 }
 
-static int usb_device_get_info(async_sess_t *sess, devman_handle_t *handle,
+static errno_t usb_device_get_info(async_sess_t *sess, devman_handle_t *handle,
         int *iface_no)
 {
@@ -467 +467 @@
                 return EPARTY;
         
-        int ret = usb_get_my_device_handle(exch, handle);
+        errno_t ret = usb_get_my_device_handle(exch, handle);
         if (ret == EOK) {
                 ret = usb_get_my_interface(exch, iface_no);
@@ -480 +480 @@
 }
 
-int usb_device_create_ddf(ddf_dev_t *ddf_dev,
+errno_t usb_device_create_ddf(ddf_dev_t *ddf_dev,
     const usb_endpoint_description_t **desc, const char **err)
 {
@@ -492 +492 @@
         if (sess == NULL)
                 return ENOMEM;
-        const int ret = usb_device_get_info(sess, &h, &iface_no);
+        const errno_t ret = usb_device_get_info(sess, &h, &iface_no);
         if (ret != EOK)
                 return ret;
@@ -521 +521 @@
 
         async_sess_t *sess = devman_device_connect(handle, IPC_FLAG_BLOCKING);
-        int ret = usb_device_get_info(sess, &h, &iface_no);
+        errno_t ret = usb_device_get_info(sess, &h, &iface_no);
         if (sess)
                 async_hangup(sess);