Changeset b7fd2a0 in mainline for uspace/lib/c/generic/device/hw_res.c

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.

File:

• uspace/lib/c/generic/device/hw_res.c (modified) (8 diffs)

uspace/lib/c/generic/device/hw_res.c

@@ -38 +38 @@
 #include <stdlib.h>
 
-int hw_res_get_resource_list(async_sess_t *sess,
+errno_t hw_res_get_resource_list(async_sess_t *sess,
     hw_resource_list_t *hw_resources)
 {
@@ -45 +45 @@
         async_exch_t *exch = async_exchange_begin(sess);
         
-        int rc = async_req_1_1(exch, DEV_IFACE_ID(HW_RES_DEV_IFACE),
+        errno_t rc = async_req_1_1(exch, DEV_IFACE_ID(HW_RES_DEV_IFACE),
             HW_RES_GET_RESOURCE_LIST, &count);
         
@@ -75 +75 @@
 }
 
-int hw_res_enable_interrupt(async_sess_t *sess, int irq)
+errno_t hw_res_enable_interrupt(async_sess_t *sess, int irq)
 {
         async_exch_t *exch = async_exchange_begin(sess);
         
-        int rc = async_req_2_0(exch, DEV_IFACE_ID(HW_RES_DEV_IFACE),
+        errno_t rc = async_req_2_0(exch, DEV_IFACE_ID(HW_RES_DEV_IFACE),
             HW_RES_ENABLE_INTERRUPT, irq);
         async_exchange_end(exch);
@@ -86 +86 @@
 }
 
-int hw_res_disable_interrupt(async_sess_t *sess, int irq)
+errno_t hw_res_disable_interrupt(async_sess_t *sess, int irq)
 {
         async_exch_t *exch = async_exchange_begin(sess);
         
-        int rc = async_req_2_0(exch, DEV_IFACE_ID(HW_RES_DEV_IFACE),
+        errno_t rc = async_req_2_0(exch, DEV_IFACE_ID(HW_RES_DEV_IFACE),
             HW_RES_DISABLE_INTERRUPT, irq);
         async_exchange_end(exch);
@@ -97 +97 @@
 }
 
-int hw_res_clear_interrupt(async_sess_t *sess, int irq)
+errno_t hw_res_clear_interrupt(async_sess_t *sess, int irq)
 {
         async_exch_t *exch = async_exchange_begin(sess);
         
-        int rc = async_req_2_0(exch, DEV_IFACE_ID(HW_RES_DEV_IFACE),
+        errno_t rc = async_req_2_0(exch, DEV_IFACE_ID(HW_RES_DEV_IFACE),
             HW_RES_CLEAR_INTERRUPT, irq);
         async_exchange_end(exch);
@@ -122 +122 @@
  *
  */
-int hw_res_dma_channel_setup(async_sess_t *sess,
+errno_t hw_res_dma_channel_setup(async_sess_t *sess,
     unsigned channel, uint32_t pa, uint32_t size, uint8_t mode)
 {
@@ -128 +128 @@
         
         const uint32_t packed = (channel & 0xffff) | (mode << 16);
-        const int ret = async_req_4_0(exch, DEV_IFACE_ID(HW_RES_DEV_IFACE),
+        const errno_t ret = async_req_4_0(exch, DEV_IFACE_ID(HW_RES_DEV_IFACE),
             HW_RES_DMA_CHANNEL_SETUP, packed, pa, size);
         
@@ -145 +145 @@
  *
  */
-int hw_res_dma_channel_remain(async_sess_t *sess, unsigned channel, size_t *rem)
+errno_t hw_res_dma_channel_remain(async_sess_t *sess, unsigned channel, size_t *rem)
 {
         async_exch_t *exch = async_exchange_begin(sess);
         
         sysarg_t remain;
-        const int ret = async_req_2_1(exch, DEV_IFACE_ID(HW_RES_DEV_IFACE),
+        const errno_t ret = async_req_2_1(exch, DEV_IFACE_ID(HW_RES_DEV_IFACE),
             HW_RES_DMA_CHANNEL_REMAIN, channel, &remain);