Changeset b7fd2a0 in mainline for uspace/drv/nic/ar9271/wmi.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/nic/ar9271/wmi.c (modified) (11 diffs)

uspace/drv/nic/ar9271/wmi.c

@@ -50 +50 @@
  *
  */
-int wmi_reg_read(htc_device_t *htc_device, uint32_t reg_offset, uint32_t *res)
+errno_t wmi_reg_read(htc_device_t *htc_device, uint32_t reg_offset, uint32_t *res)
 {
         uint32_t cmd_value = host2uint32_t_be(reg_offset);
@@ -57 +57 @@
             malloc(htc_device->ath_device->ctrl_response_length);
         
-        int rc = wmi_send_command(htc_device, WMI_REG_READ,
+        errno_t rc = wmi_send_command(htc_device, WMI_REG_READ,
             (uint8_t *) &cmd_value, sizeof(cmd_value), resp_buffer);
         
@@ -82 +82 @@
  *
  */
-int wmi_reg_write(htc_device_t *htc_device, uint32_t reg_offset, uint32_t val)
+errno_t wmi_reg_write(htc_device_t *htc_device, uint32_t reg_offset, uint32_t val)
 {
         uint32_t cmd_buffer[] = {
@@ -92 +92 @@
             malloc(htc_device->ath_device->ctrl_response_length);
         
-        int rc = wmi_send_command(htc_device, WMI_REG_WRITE,
+        errno_t rc = wmi_send_command(htc_device, WMI_REG_WRITE,
             (uint8_t *) &cmd_buffer, sizeof(cmd_buffer), resp_buffer);
         
@@ -115 +115 @@
  *
  */
-int wmi_reg_set_clear_bit(htc_device_t *htc_device, uint32_t reg_offset,
+errno_t wmi_reg_set_clear_bit(htc_device_t *htc_device, uint32_t reg_offset,
     uint32_t set_bit, uint32_t clear_bit)
 {
         uint32_t value;
         
-        int rc = wmi_reg_read(htc_device, reg_offset, &value);
+        errno_t rc = wmi_reg_read(htc_device, reg_offset, &value);
         if (rc != EOK) {
                 usb_log_error("Failed to read registry value in RMW "
@@ -149 +149 @@
  *
  */
-int wmi_reg_set_bit(htc_device_t *htc_device, uint32_t reg_offset,
+errno_t wmi_reg_set_bit(htc_device_t *htc_device, uint32_t reg_offset,
     uint32_t set_bit)
 {
@@ -164 +164 @@
  *
  */
-int wmi_reg_clear_bit(htc_device_t *htc_device, uint32_t reg_offset,
+errno_t wmi_reg_clear_bit(htc_device_t *htc_device, uint32_t reg_offset,
     uint32_t clear_bit)
 {
@@ -179 +179 @@
  *
  */
-int wmi_reg_buffer_write(htc_device_t *htc_device, wmi_reg_t *reg_buffer,
+errno_t wmi_reg_buffer_write(htc_device_t *htc_device, wmi_reg_t *reg_buffer,
     size_t elements)
 {
@@ -198 +198 @@
         }
         
-        int rc = wmi_send_command(htc_device, WMI_REG_WRITE,
+        errno_t rc = wmi_send_command(htc_device, WMI_REG_WRITE,
             (uint8_t *) buffer, buffer_size, resp_buffer);
         
@@ -223 +223 @@
  *
  */
-int wmi_send_command(htc_device_t *htc_device, wmi_command_t command_id,
+errno_t wmi_send_command(htc_device_t *htc_device, wmi_command_t command_id,
     uint8_t *command_buffer, uint32_t command_length, void *response_buffer)
 {
@@ -242 +242 @@
         
         /* Send message. */
-        int rc = htc_send_control_message(htc_device, buffer, buffer_size,
+        errno_t rc = htc_send_control_message(htc_device, buffer, buffer_size,
             htc_device->endpoints.wmi_endpoint);
         if (rc != EOK) {