Changeset b854e56 in mainline

Timestamp:

2011-04-08T22:25:32Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

e42dd32

Parents:

7786cea

Message:

Implement TD initialization

Location:

uspace/drv/ohci

Files:

• Makefile (modified) (1 diff)
• batch.c (modified) (2 diffs)
• hw_struct/transfer_descriptor.h (modified) (3 diffs)

uspace/drv/ohci/Makefile

@@ -41 +41 @@
         root_hub.c \
         transfer_list.c \
-        hw_struct/endpoint_descriptor.c
+        hw_struct/endpoint_descriptor.c \
+        hw_struct/transfer_descriptor.c
 
 

uspace/drv/ohci/batch.c

@@ -43 +43 @@
 #include "hw_struct/transfer_descriptor.h"
 
-#define OHCI_MAX_TRANSFER (8 * 1024) /* OHCI TDs can handle up to 8KB buffers */
-
 typedef struct ohci_batch {
         ed_t *ed;
@@ -85 +83 @@
 
         /* we needs + 1 transfer descriptor as the last one won't be executed */
-        data->td_count =
-            1 + ((buffer_size + OHCI_MAX_TRANSFER - 1) / OHCI_MAX_TRANSFER);
+        data->td_count = 1 +
+            ((buffer_size + OHCI_TD_MAX_TRANSFER - 1) / OHCI_TD_MAX_TRANSFER);
         if (ep->transfer_type == USB_TRANSFER_CONTROL) {
                 data->td_count += 2;

uspace/drv/ohci/hw_struct/transfer_descriptor.h

@@ -39 +39 @@
 #include "completion_codes.h"
 
+/* OHCI TDs can handle up to 8KB buffers */
+#define OHCI_TD_MAX_TRANSFER (8 * 1024)
+
 typedef struct td {
         volatile uint32_t status;
@@ -52 +55 @@
 #define TD_STATUS_T_MASK (0x3)  /* data toggle 1x = use ED toggle carry */
 #define TD_STATUS_T_SHIFT (24)
+#define TD_STATUS_T_0 (0x0)
+#define TD_STATUS_T_1 (0x1)
+#define TD_STATUS_T_USE_EP (0x1)
 #define TD_STATUS_EC_MASK (0x3) /* error count */
 #define TD_STATUS_EC_SHIFT (26)
@@ -64 +70 @@
         volatile uint32_t be; /* buffer end, address of the last byte */
 } __attribute__((packed)) td_t;
+
+void td_init(
+    td_t *instance, usb_direction_t dir, void *buffer, size_t size, int toggle);
+
+inline static void td_set_next(td_t *instance, uint32_t next)
+{
+        assert(instance);
+        instance->next = next & TD_NEXT_PTR_MASK;
+}
 #endif
 /**