Changeset e05d6c3 in mainline for uspace/drv/ohci

Timestamp:

2011-04-15T07:45:26Z (15 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

3a85a2b

Parents:

a39cfb8 (diff), e583fd4 (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 with usb/development

Location:

uspace/drv/ohci

Files:

• batch.c (modified) (2 diffs)
• hcd_endpoint.c (modified) (2 diffs)
• hw_struct/endpoint_descriptor.h (modified) (2 diffs)
• ohci_regs.h (modified) (1 diff)
• root_hub.h (modified) (1 diff)

uspace/drv/ohci/batch.c

@@ -161 +161 @@
                         usb_log_debug("Batch(%p) found error TD(%d):%x.\n",
                             instance, i, data->tds[i]->status);
+                        /* Make sure TD queue is empty (one TD),
+                         * ED should be marked as halted */
+                        data->ed->td_tail =
+                            (data->ed->td_head & ED_TDTAIL_PTR_MASK);
+                        ++i;
                         break;
                 }
@@ -169 +174 @@
         assert(hcd_ep);
         hcd_ep->td = data->tds[i];
+        /* Clear possible ED HALT */
+        data->ed->td_head &= ~ED_TDHEAD_HALTED_FLAG;
+        uint32_t pa = addr_to_phys(hcd_ep->td);
+        assert(pa == (data->ed->td_head & ED_TDHEAD_PTR_MASK));
+        assert(pa == (data->ed->td_tail & ED_TDTAIL_PTR_MASK));
 
         return true;

uspace/drv/ohci/hcd_endpoint.c

@@ -35 +35 @@
 #include "hcd_endpoint.h"
 
+static void hcd_ep_toggle_set(void *hcd_ep, int toggle)
+{
+        hcd_endpoint_t *instance = hcd_ep;
+        assert(instance);
+        assert(instance->ed);
+        ed_toggle_set(instance->ed, toggle);
+}
+static int hcd_ep_toggle_get(void *hcd_ep)
+{
+        hcd_endpoint_t *instance = hcd_ep;
+        assert(instance);
+        assert(instance->ed);
+        return ed_toggle_get(instance->ed);
+}
+
+
 hcd_endpoint_t * hcd_endpoint_assign(endpoint_t *ep)
 {
@@ -57 +73 @@
         ed_init(hcd_ep->ed, ep);
         ed_set_td(hcd_ep->ed, hcd_ep->td);
-        endpoint_set_hc_data(ep, hcd_ep, NULL, NULL);
+        endpoint_set_hc_data(ep, hcd_ep, hcd_ep_toggle_get, hcd_ep_toggle_set);
 
         return hcd_ep;

uspace/drv/ohci/hw_struct/endpoint_descriptor.h

@@ -73 +73 @@
 #define ED_TDHEAD_ZERO_SHIFT (2)
 #define ED_TDHEAD_TOGGLE_CARRY (0x2)
+#define ED_TDHEAD_HALTED_FLAG (0x1)
 
         volatile uint32_t next;
@@ -106 +107 @@
         instance->next = pa;
 }
+
+static inline int ed_toggle_get(ed_t *instance)
+{
+        assert(instance);
+        return (instance->td_head & ED_TDHEAD_TOGGLE_CARRY) ? 1 : 0;
+}
+
+static inline void ed_toggle_set(ed_t *instance, int toggle)
+{
+        assert(instance);
+        assert(toggle == 0 || toggle == 1);
+        if (toggle == 1) {
+                instance->td_head |= ED_TDHEAD_TOGGLE_CARRY;
+        } else {
+                /* clear halted flag when reseting toggle */
+                instance->td_head &= ~ED_TDHEAD_TOGGLE_CARRY;
+                instance->td_head &= ~ED_TDHEAD_HALTED_FLAG;
+        }
+}
 #endif
 /**

uspace/drv/ohci/ohci_regs.h

@@ -55 +55 @@
 #define C_HCFS_MASK        (0x3) /* Host controller functional state */
 #define C_HCFS_RESET       (0x0)
-#define C_HCFS_OPERATIONAL (0x1)
-#define C_HCFS_RESUME      (0x2)
+#define C_HCFS_RESUME      (0x1)
+#define C_HCFS_OPERATIONAL (0x2)
 #define C_HCFS_SUSPEND     (0x3)
 #define C_HCFS_SHIFT       (6)

uspace/drv/ohci/root_hub.h

@@ -54 +54 @@
         /** hubs descriptors */
         usb_device_descriptors_t descriptors;
+        /** interrupt transfer waiting for an actual interrupt to occur */
+        usb_transfer_batch_t * unfinished_interrupt_transfer;
 } rh_t;