Changeset df6ded8 in mainline for uspace/drv/bus/usb/ohci/hw_struct/endpoint_descriptor.c

Timestamp:

2018-02-28T16:37:50Z (6 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/ohci/hw_struct/endpoint_descriptor.c (modified) (3 diffs)

uspace/drv/bus/usb/ohci/hw_struct/endpoint_descriptor.c

@@ -40 +40 @@
 #include <usb/usb.h>
 #include <usb/host/utils/malloc32.h>
+#include <usb/host/endpoint.h>
+#include <usb/host/bus.h>
 
 #include "mem_access.h"
@@ -79 +81 @@
         /* Status: address, endpoint nr, direction mask and max packet size. */
         OHCI_MEM32_WR(instance->status,
-            ((ep->address & ED_STATUS_FA_MASK) << ED_STATUS_FA_SHIFT)
+            ((ep->device->address & ED_STATUS_FA_MASK) << ED_STATUS_FA_SHIFT)
             | ((ep->endpoint & ED_STATUS_EN_MASK) << ED_STATUS_EN_SHIFT)
             | ((dir[ep->direction] & ED_STATUS_D_MASK) << ED_STATUS_D_SHIFT)
-            | ((ep->max_packet_size & ED_STATUS_MPS_MASK)
-                << ED_STATUS_MPS_SHIFT));
+            | ((ep->max_packet_size & ED_STATUS_MPS_MASK) << ED_STATUS_MPS_SHIFT));
 
         /* Low speed flag */
-        if (ep->speed == USB_SPEED_LOW)
+        if (ep->device->speed == USB_SPEED_LOW)
                 OHCI_MEM32_SET(instance->status, ED_STATUS_S_FLAG);
 
@@ -98 +99 @@
         OHCI_MEM32_WR(instance->td_head, pa & ED_TDHEAD_PTR_MASK);
         OHCI_MEM32_WR(instance->td_tail, pa & ED_TDTAIL_PTR_MASK);
-
-        /* Set toggle bit */
-        if (ep->toggle)
-                OHCI_MEM32_SET(instance->td_head, ED_TDHEAD_TOGGLE_CARRY);
-
 }
 /**