Changeset b4b534ac in mainline for uspace/drv/nic/ar9271/ar9271.c

Timestamp:

2016-07-22T08:24:47Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f76d2c2

Parents:

5b18137 (diff), 8351f9a4 (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 from lp:~jan.vesely/helenos/usb

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>
@@ -771 +772 @@
                 size_t chunk_size = min(remain_size, MAX_TRANSFER_SIZE);
                 memcpy(buffer, current_data, chunk_size);
-                int rc = usb_control_request_set(&usb_device->ctrl_pipe,
+                usb_pipe_t *ctrl_pipe = usb_device_get_default_pipe(usb_device);
+                int rc = usb_control_request_set(ctrl_pipe,
                     USB_REQUEST_TYPE_VENDOR,
                     USB_REQUEST_RECIPIENT_DEVICE,
@@ -798 +800 @@
          * device side buffer which we will check in htc_check_ready function.
         */
-        int rc = usb_control_request_set(&usb_device->ctrl_pipe,
+        usb_pipe_t *ctrl_pipe = usb_device_get_default_pipe(usb_device);
+        int rc = usb_control_request_set(ctrl_pipe,
             USB_REQUEST_TYPE_VENDOR,
             USB_REQUEST_RECIPIENT_DEVICE,
@@ -828 +831 @@
 {
         /* 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_init(usb_device, dev, endpoints, &err_msg);
-        if (rc != EOK) {
-                free(usb_device);
+        int rc = usb_device_create_ddf(dev, endpoints, &err_msg);
+        if (rc != EOK) {
                 usb_log_error("Failed to create USB device: %s, "
                     "ERR_NUM = %d\n", err_msg, rc);
@@ -846 +842 @@
         ar9271_t *ar9271 = calloc(1, sizeof(ar9271_t));
         if (!ar9271) {
-                free(usb_device);
                 usb_log_error("Failed to allocate memory for device "
                     "structure.\n");
@@ -854 +849 @@
         ar9271->ddf_dev = dev;
         
-        rc = ar9271_init(ar9271, usb_device);
+        rc = ar9271_init(ar9271, usb_device_get(dev));
         if (rc != EOK) {
                 free(ar9271);
-                free(usb_device);
                 usb_log_error("Failed to initialize AR9271 structure: %d\n",
                     rc);