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

Timestamp:

2018-02-28T16:37:50Z (7 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

1b20da0

Parents:

f5e5f73 (diff), b2dca8de (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.

git-author:

Jakub Jermar <jakub@…> (2018-02-28 16:06:42)

git-committer:

Jakub Jermar <jakub@…> (2018-02-28 16:37:50)

Message:

Merge github.com:helenos-xhci-team/helenos

This commit merges support for USB 3 and generally refactors, fixes,
extends and cleans up the existing USB framework.

Notable additions and features:

• new host controller driver has been implemented to control various xHC models (among others, NEC Renesas uPD720200)
• isochronous data transfer mode
• support for explicit USB device removal
• USB tablet driver

File:

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

uspace/drv/nic/ar9271/ar9271.c

@@ -666 +666 @@
 }
 
-static errno_t ar9271_init(ar9271_t *ar9271, usb_device_t *usb_device)
+static errno_t ar9271_init(ar9271_t *ar9271, usb_device_t *usb_device, const usb_endpoint_description_t **endpoints)
 {
         ar9271->starting_up = true;
@@ -680 +680 @@
         }
         
-        errno_t rc = ath_usb_init(ar9271->ath_device, usb_device);
+        errno_t rc = ath_usb_init(ar9271->ath_device, usb_device, endpoints);
         if (rc != EOK) {
                 free(ar9271->ath_device);
@@ -851 +851 @@
         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);