Changeset 132ab5d1 in mainline for uspace/drv/nic/ar9271/ar9271.c

Timestamp:

2018-01-30T03:20:45Z (7 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

5a6cc679

Parents:

8bfb163 (diff), 6a5d05b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge commit '6a5d05bd2551e64111bea4f9332dd7448c26ce84' into forwardport

Separate return value from error code in gen_irq_code*().

File:

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

uspace/drv/nic/ar9271/ar9271.c

@@ -33 +33 @@
  */
 
+#include <async.h>
 #include <ieee80211.h>
 #include <usb/classes/classes.h>
@@ -41 +42 @@
 #include <ddf/interrupt.h>
 #include <errno.h>
+#include <str_error.h>
 #include <nic.h>
 #include <macros.h>
-#include <thread.h>
 #include "ath_usb.h"
 #include "wmi.h"
@@ -733 +734 @@
  * @param ar9271 AR9271 device structure
  *
- * @return EOK if succeed, negative error code otherwise
+ * @return EOK if succeed, error code otherwise
  *
  */
@@ -784 +785 @@
                         free(buffer);
                         usb_log_error("Error while uploading firmware. "
-                            "Error: %d\n", rc);
+                            "Error: %s\n", str_error_name(rc));
                         return rc;
                 }
@@ -818 +819 @@
         
         /* Wait until firmware is ready - wait for 1 second to be sure. */
-        thread_sleep(1);
+        async_sleep(1);
         
         return rc;
@@ -836 +837 @@
         if (rc != EOK) {
                 usb_log_error("Failed to create USB device: %s, "
-                    "ERR_NUM = %d\n", err_msg, rc);
+                    "ERR_NUM = %s\n", err_msg, str_error_name(rc));
                 return NULL;
         }
@@ -853 +854 @@
         if (rc != EOK) {
                 free(ar9271);
-                usb_log_error("Failed to initialize AR9271 structure: %d\n",
-                    rc);
+                usb_log_error("Failed to initialize AR9271 structure: %s\n",
+                    str_error_name(rc));
                 return NULL;
         }
@@ -876 +877 @@
  * @param dev The device structure.
  *
- * @return EOK if succeed, negative error code otherwise
+ * @return EOK if succeed, error code otherwise
  */
 static int ar9271_add_device(ddf_dev_t *dev)