Changes in uspace/drv/nic/ar9271/ar9271.c [fe97c5e:8a64320e] in mainline

File:

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

uspace/drv/nic/ar9271/ar9271.c

@@ -40 +40 @@
 #include <stdio.h>
 #include <ddf/interrupt.h>
-#include <errno.h>
 #include <nic.h>
 #include <macros.h>
@@ -772 +771 @@
                 size_t chunk_size = min(remain_size, MAX_TRANSFER_SIZE);
                 memcpy(buffer, current_data, chunk_size);
-                usb_pipe_t *ctrl_pipe = usb_device_get_default_pipe(usb_device);
-                int rc = usb_control_request_set(ctrl_pipe,
+                int rc = usb_control_request_set(&usb_device->ctrl_pipe,
                     USB_REQUEST_TYPE_VENDOR,
                     USB_REQUEST_RECIPIENT_DEVICE,
@@ -800 +798 @@
          * device side buffer which we will check in htc_check_ready function.
         */
-        usb_pipe_t *ctrl_pipe = usb_device_get_default_pipe(usb_device);
-        int rc = usb_control_request_set(ctrl_pipe,
+        int rc = usb_control_request_set(&usb_device->ctrl_pipe,
             USB_REQUEST_TYPE_VENDOR,
             USB_REQUEST_RECIPIENT_DEVICE,
@@ -831 +828 @@
 {
         /* USB framework initialization. */
+        usb_device_t *usb_device = calloc(1, sizeof(usb_device_t));
+        if (usb_device == NULL) {
+                usb_log_error("USB device structure allocation failed.\n");
+                return NULL;
+        }
+        
         const char *err_msg = NULL;
-        int rc = usb_device_create_ddf(dev, endpoints, &err_msg);
-        if (rc != EOK) {
+        int rc = usb_device_init(usb_device, dev, endpoints, &err_msg);
+        if (rc != EOK) {
+                free(usb_device);
                 usb_log_error("Failed to create USB device: %s, "
                     "ERR_NUM = %d\n", err_msg, rc);
@@ -842 +846 @@
         ar9271_t *ar9271 = calloc(1, sizeof(ar9271_t));
         if (!ar9271) {
+                free(usb_device);
                 usb_log_error("Failed to allocate memory for device "
                     "structure.\n");
@@ -849 +854 @@
         ar9271->ddf_dev = dev;
         
-        rc = ar9271_init(ar9271, usb_device_get(dev));
+        rc = ar9271_init(ar9271, usb_device);
         if (rc != EOK) {
                 free(ar9271);
+                free(usb_device);
                 usb_log_error("Failed to initialize AR9271 structure: %d\n",
                     rc);