Changeset df6ded8 in mainline for uspace/drv/bus/usb/ehci/ehci_rh.h

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/bus/usb/ehci/ehci_rh.h (modified) (2 diffs)

uspace/drv/bus/usb/ehci/ehci_rh.h

@@ -1 +1 @@
 /*
  * Copyright (c) 2013 Jan Vesely
+ * Copyright (c) 2018 Ondrej Hlavaty
  * All rights reserved.
  *
@@ -61 +62 @@
                 uint8_t rempow[STATUS_BYTES(EHCI_MAX_PORTS) * 2];
         } __attribute__((packed)) hub_descriptor;
-        /** interrupt transfer waiting for an actual interrupt to occur */
-        usb_transfer_batch_t *unfinished_interrupt_transfer;
         bool reset_flag[EHCI_MAX_PORTS];
         bool resume_flag[EHCI_MAX_PORTS];
+
+        /* HC guard */
+        fibril_mutex_t *guard;
+
+        /*
+         * This is sort of hacky, but better than duplicating functionality.
+         * We cannot simply store a pointer to a transfer in-progress, in order
+         * to allow it to be aborted. We can however store a reference to the
+         * Status Change Endpoint. Note that this is mixing two worlds together
+         * - otherwise, the RH is "a device" and have no clue about HC, apart
+         * from accessing its registers.
+         */
+        endpoint_t *status_change_endpoint;
+
 } ehci_rh_t;
 
-errno_t ehci_rh_init(ehci_rh_t *instance, ehci_caps_regs_t *caps, ehci_regs_t *regs,
-    const char *name);
+errno_t ehci_rh_init(ehci_rh_t *instance, ehci_caps_regs_t *caps,
+    ehci_regs_t *regs, fibril_mutex_t *guard, const char *name);
 errno_t ehci_rh_schedule(ehci_rh_t *instance, usb_transfer_batch_t *batch);
 errno_t ehci_rh_interrupt(ehci_rh_t *instance);