Changeset 06c552c in mainline

Timestamp:

2011-04-08T20:54:52Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

96b8f322

Parents:

344925c

Message:

Create batch memory structures.

Location:

uspace/drv

Files:

• ohci/batch.c (modified) (3 diffs)
• uhci-hcd/batch.c (modified) (1 diff)

uspace/drv/ohci/batch.c

@@ -40 +40 @@
 #include "batch.h"
 #include "utils/malloc32.h"
+#include "hw_struct/endpoint_descriptor.h"
+#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;
+        td_t *tds;
+        size_t td_count;
+} ohci_batch_t;
 
 static void batch_call_in_and_dispose(usb_transfer_batch_t *instance);
@@ -68 +78 @@
             func_in, func_out, arg, fun, ep, NULL);
 
+        ohci_batch_t *data = malloc(sizeof(ohci_batch_t));
+        CHECK_NULL_DISPOSE_RETURN(data, "Failed to allocate batch data.\n");
+        bzero(data, sizeof(ohci_batch_t));
+        instance->private_data = data;
+
+        data->td_count =
+            (buffer_size + OHCI_MAX_TRANSFER - 1) / OHCI_MAX_TRANSFER;
+        if (ep->transfer_type == USB_TRANSFER_CONTROL) {
+                data->td_count += 2;
+        }
+
+        data->tds = malloc32(sizeof(td_t) * data->td_count);
+        CHECK_NULL_DISPOSE_RETURN(data->tds,
+            "Failed to allocate transfer descriptors.\n");
+        bzero(data->tds, sizeof(td_t) * data->td_count);
+
+        data->ed = malloc32(sizeof(ed_t));
+        CHECK_NULL_DISPOSE_RETURN(data->ed,
+            "Failed to allocate endpoint descriptor.\n");
+
         if (buffer_size > 0) {
                 instance->transport_buffer = malloc32(buffer_size);
@@ -81 +111 @@
         }
 
-
         return instance;
 }

uspace/drv/uhci-hcd/batch.c

@@ -103 +103 @@
         usb_target_t target =
             { .address = ep->address, .endpoint = ep->endpoint };
-        usb_transfer_batch_init(instance, target,
-            ep->transfer_type, ep->speed, ep->max_packet_size,
-            buffer, NULL, buffer_size, NULL, setup_size, func_in,
-            func_out, arg, fun, ep, NULL);
+        usb_transfer_batch_init(instance, target, ep->transfer_type, ep->speed,
+            ep->max_packet_size, buffer, NULL, buffer_size, NULL, setup_size,
+            func_in, func_out, arg, fun, ep, NULL);
 
 
         uhci_batch_t *data = malloc(sizeof(uhci_batch_t));
-        CHECK_NULL_DISPOSE_RETURN(instance,
-            "Failed to allocate batch instance.\n");
+        CHECK_NULL_DISPOSE_RETURN(data, "Failed to allocate batch data.\n");
         bzero(data, sizeof(uhci_batch_t));
         instance->private_data = data;