Changes in uspace/drv/nic/ar9271/wmi.c [b7fd2a0:38d150e] in mainline

File:

• uspace/drv/nic/ar9271/wmi.c (modified) (13 diffs)

uspace/drv/nic/ar9271/wmi.c

@@ -35 +35 @@
 #include <usb/debug.h>
 #include <errno.h>
-#include <str_error.h>
 #include <stdlib.h>
 #include <mem.h>
@@ -47 +46 @@
  * @param res        Stored result.
  *
- * @return EOK if succeed, error code otherwise.
- *
- */
-errno_t wmi_reg_read(htc_device_t *htc_device, uint32_t reg_offset, uint32_t *res)
+ * @return EOK if succeed, negative error code otherwise.
+ *
+ */
+int 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 +56 @@
             malloc(htc_device->ath_device->ctrl_response_length);
         
-        errno_t rc = wmi_send_command(htc_device, WMI_REG_READ,
+        int rc = wmi_send_command(htc_device, WMI_REG_READ,
             (uint8_t *) &cmd_value, sizeof(cmd_value), resp_buffer);
         
@@ -79 +78 @@
  * @param val        Value to be written
  *
- * @return EOK if succeed, error code otherwise.
- *
- */
-errno_t wmi_reg_write(htc_device_t *htc_device, uint32_t reg_offset, uint32_t val)
+ * @return EOK if succeed, negative error code otherwise.
+ *
+ */
+int wmi_reg_write(htc_device_t *htc_device, uint32_t reg_offset, uint32_t val)
 {
         uint32_t cmd_buffer[] = {
@@ -92 +91 @@
             malloc(htc_device->ath_device->ctrl_response_length);
         
-        errno_t rc = wmi_send_command(htc_device, WMI_REG_WRITE,
+        int rc = wmi_send_command(htc_device, WMI_REG_WRITE,
             (uint8_t *) &cmd_buffer, sizeof(cmd_buffer), resp_buffer);
         
@@ -112 +111 @@
  * @param clear_bit  Bit to be cleared.
  *
- * @return EOK if succeed, error code otherwise.
- *
- */
-errno_t wmi_reg_set_clear_bit(htc_device_t *htc_device, uint32_t reg_offset,
+ * @return EOK if succeed, negative error code otherwise.
+ *
+ */
+int 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;
         
-        errno_t rc = wmi_reg_read(htc_device, reg_offset, &value);
+        int rc = wmi_reg_read(htc_device, reg_offset, &value);
         if (rc != EOK) {
                 usb_log_error("Failed to read registry value in RMW "
@@ -146 +145 @@
  * @param set_bit    Bit to be set.
  *
- * @return EOK if succeed, error code otherwise.
- *
- */
-errno_t wmi_reg_set_bit(htc_device_t *htc_device, uint32_t reg_offset,
+ * @return EOK if succeed, negative error code otherwise.
+ *
+ */
+int wmi_reg_set_bit(htc_device_t *htc_device, uint32_t reg_offset,
     uint32_t set_bit)
 {
@@ -161 +160 @@
  * @param clear_bit  Bit to be cleared.
  *
- * @return EOK if succeed, error code otherwise.
- *
- */
-errno_t wmi_reg_clear_bit(htc_device_t *htc_device, uint32_t reg_offset,
+ * @return EOK if succeed, negative error code otherwise.
+ *
+ */
+int wmi_reg_clear_bit(htc_device_t *htc_device, uint32_t reg_offset,
     uint32_t clear_bit)
 {
@@ -176 +175 @@
  * @param elements   Number of elements in array.
  *
- * @return EOK if succeed, error code otherwise.
- *
- */
-errno_t wmi_reg_buffer_write(htc_device_t *htc_device, wmi_reg_t *reg_buffer,
+ * @return EOK if succeed, negative error code otherwise.
+ *
+ */
+int wmi_reg_buffer_write(htc_device_t *htc_device, wmi_reg_t *reg_buffer,
     size_t elements)
 {
@@ -198 +197 @@
         }
         
-        errno_t rc = wmi_send_command(htc_device, WMI_REG_WRITE,
+        int rc = wmi_send_command(htc_device, WMI_REG_WRITE,
             (uint8_t *) buffer, buffer_size, resp_buffer);
         
@@ -220 +219 @@
  * @param response_buffer Buffer with response data.
  *
- * @return EOK if succeed, error code otherwise.
- *
- */
-errno_t wmi_send_command(htc_device_t *htc_device, wmi_command_t command_id,
+ * @return EOK if succeed, negative error code otherwise.
+ *
+ */
+int 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 +241 @@
         
         /* Send message. */
-        errno_t rc = htc_send_control_message(htc_device, buffer, buffer_size,
+        int rc = htc_send_control_message(htc_device, buffer, buffer_size,
             htc_device->endpoints.wmi_endpoint);
         if (rc != EOK) {
                 free(buffer);
-                usb_log_error("Failed to send WMI message. Error: %s\n", str_error_name(rc));
+                usb_log_error("Failed to send WMI message. Error: %d\n", rc);
                 return rc;
         }
@@ -269 +268 @@
                         free(buffer);
                         usb_log_error("Failed to receive WMI message response. "
-                            "Error: %s\n", str_error_name(rc));
+                            "Error: %d\n", rc);
                         return rc;
                 }