Changes in uspace/drv/nic/ar9271/ar9271.c [cde999a:b3c39690] in mainline

File:

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

uspace/drv/nic/ar9271/ar9271.c

@@ -33 +33 @@
  */
 
-#include <async.h>
 #include <ieee80211.h>
 #include <usb/classes/classes.h>
@@ -42 +41 @@
 #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"
@@ -666 +665 @@
 }
 
-static int ar9271_init(ar9271_t *ar9271, usb_device_t *usb_device)
+static int ar9271_init(ar9271_t *ar9271, usb_device_t *usb_device, const usb_endpoint_description_t **endpoints)
 {
         ar9271->starting_up = true;
@@ -680 +679 @@
         }
         
-        int rc = ath_usb_init(ar9271->ath_device, usb_device);
+        int rc = ath_usb_init(ar9271->ath_device, usb_device, endpoints);
         if (rc != EOK) {
                 free(ar9271->ath_device);
@@ -734 +733 @@
  * @param ar9271 AR9271 device structure
  *
- * @return EOK if succeed, error code otherwise
+ * @return EOK if succeed, negative error code otherwise
  *
  */
@@ -785 +784 @@
                         free(buffer);
                         usb_log_error("Error while uploading firmware. "
-                            "Error: %s\n", str_error_name(rc));
+                            "Error: %d\n", rc);
                         return rc;
                 }
@@ -819 +818 @@
         
         /* Wait until firmware is ready - wait for 1 second to be sure. */
-        async_sleep(1);
+        thread_sleep(1);
         
         return rc;
@@ -837 +836 @@
         if (rc != EOK) {
                 usb_log_error("Failed to create USB device: %s, "
-                    "ERR_NUM = %s\n", err_msg, str_error_name(rc));
+                    "ERR_NUM = %d\n", err_msg, rc);
                 return NULL;
         }
@@ -851 +850 @@
         ar9271->ddf_dev = dev;
         
-        rc = ar9271_init(ar9271, usb_device_get(dev));
+        rc = ar9271_init(ar9271, usb_device_get(dev), endpoints);
         if (rc != EOK) {
                 free(ar9271);
-                usb_log_error("Failed to initialize AR9271 structure: %s\n",
-                    str_error_name(rc));
+                usb_log_error("Failed to initialize AR9271 structure: %d\n",
+                    rc);
                 return NULL;
         }
@@ -877 +876 @@
  * @param dev The device structure.
  *
- * @return EOK if succeed, error code otherwise
+ * @return EOK if succeed, negative error code otherwise
  */
 static int ar9271_add_device(ddf_dev_t *dev)