Changeset d017cea in mainline for uspace/drv/ohci

Timestamp:

2011-04-12T10:09:56Z (15 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

508a0ca

Parents:

f13381b

Message:

Remove EP information stored in usb_transfer_batch_t

rename usb_transfer_batch_t.transport_buffer ⇒ data_buffer

Location:

uspace/drv/ohci

Files:

• batch.c (modified) (14 diffs)
• hc.c (modified) (3 diffs)
• root_hub.c (modified) (5 diffs)

uspace/drv/ohci/batch.c

@@ -73 +73 @@
         CHECK_NULL_DISPOSE_RETURN(instance,
             "Failed to allocate batch instance.\n");
-        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, ep, buffer, NULL, buffer_size,
+            NULL, setup_size, func_in, func_out, arg, fun, NULL);
 
         ohci_batch_t *data = malloc(sizeof(ohci_batch_t));
@@ -101 +98 @@
 
         if (buffer_size > 0) {
-                instance->transport_buffer = malloc32(buffer_size);
-                CHECK_NULL_DISPOSE_RETURN(instance->transport_buffer,
+                instance->data_buffer = malloc32(buffer_size);
+                CHECK_NULL_DISPOSE_RETURN(instance->data_buffer,
                     "Failed to allocate device accessible buffer.\n");
         }
@@ -124 +121 @@
         free32(data->tds);
         free32(instance->setup_buffer);
-        free32(instance->transport_buffer);
+        free32(instance->data_buffer);
         free(data);
         free(instance);
@@ -165 +162 @@
         assert(instance);
         /* We are data out, we are supposed to provide data */
-        memcpy(instance->transport_buffer, instance->buffer,
-            instance->buffer_size);
+        memcpy(instance->data_buffer, instance->buffer, instance->buffer_size);
         instance->next_step = batch_call_out_and_dispose;
         batch_control(instance, USB_DIRECTION_OUT, USB_DIRECTION_IN);
@@ -183 +179 @@
 {
         assert(instance);
-        assert(instance->direction == USB_DIRECTION_IN);
         instance->next_step = batch_call_in_and_dispose;
         batch_data(instance);
@@ -192 +187 @@
 {
         assert(instance);
-        assert(instance->direction == USB_DIRECTION_OUT);
         /* We are data out, we are supposed to provide data */
-        memcpy(instance->transport_buffer, instance->buffer,
-            instance->buffer_size);
+        memcpy(instance->data_buffer, instance->buffer, instance->buffer_size);
         instance->next_step = batch_call_out_and_dispose;
         batch_data(instance);
@@ -204 +197 @@
 {
         assert(instance);
-        instance->direction = USB_DIRECTION_IN;
         instance->next_step = batch_call_in_and_dispose;
         batch_data(instance);
@@ -213 +205 @@
 {
         assert(instance);
-        instance->direction = USB_DIRECTION_IN;
         instance->next_step = batch_call_in_and_dispose;
         batch_data(instance);
@@ -249 +240 @@
         size_t td_current = 1;
         size_t remain_size = instance->buffer_size;
-        char *transfer_buffer = instance->transport_buffer;
+        char *buffer = instance->data_buffer;
         while (remain_size > 0) {
                 size_t transfer_size = remain_size > OHCI_TD_MAX_TRANSFER ?
@@ -255 +246 @@
                 toggle = 1 - toggle;
 
-                td_init(&data->tds[td_current], data_dir, transfer_buffer,
+                td_init(&data->tds[td_current], data_dir, buffer,
                     transfer_size, toggle);
                 td_set_next(&data->tds[td_current], &data->tds[td_current + 1]);
@@ -262 +253 @@
                     data->tds[td_current].next, data->tds[td_current].be);
 
-                transfer_buffer += transfer_size;
+                buffer += transfer_size;
                 remain_size -= transfer_size;
                 assert(td_current < data->td_count - 2);
@@ -290 +281 @@
         size_t td_current = 0;
         size_t remain_size = instance->buffer_size;
-        char *transfer_buffer = instance->transport_buffer;
+        char *buffer = instance->data_buffer;
         while (remain_size > 0) {
                 size_t transfer_size = remain_size > OHCI_TD_MAX_TRANSFER ?
@@ -296 +287 @@
 
                 td_init(&data->tds[td_current], instance->ep->direction,
-                    transfer_buffer, transfer_size, -1);
+                    buffer, transfer_size, -1);
                 td_set_next(&data->tds[td_current], &data->tds[td_current + 1]);
                 usb_log_debug("Created DATA TD: %x:%x:%x:%x.\n",
@@ -302 +293 @@
                     data->tds[td_current].next, data->tds[td_current].be);
 
-                transfer_buffer += transfer_size;
+                buffer += transfer_size;
                 remain_size -= transfer_size;
                 assert(td_current < data->td_count);

uspace/drv/ohci/hc.c

@@ -130 +130 @@
         assert(instance);
         assert(batch);
+        assert(batch->ep);
 
         /* check for root hub communication */
-        if (batch->target.address == instance->rh.address) {
+        if (batch->ep->address == instance->rh.address) {
                 return rh_request(&instance->rh, batch);
         }
 
         fibril_mutex_lock(&instance->guard);
-        switch (batch->transfer_type) {
+        switch (batch->ep->transfer_type) {
         case USB_TRANSFER_CONTROL:
                 instance->registers->control &= ~C_CLE;
                 transfer_list_add_batch(
-                    instance->transfers[batch->transfer_type], batch);
+                    instance->transfers[batch->ep->transfer_type], batch);
                 instance->registers->command_status |= CS_CLF;
                 usb_log_debug2("Set CS control transfer filled: %x.\n",
@@ -151 +152 @@
                 instance->registers->control &= ~C_BLE;
                 transfer_list_add_batch(
-                    instance->transfers[batch->transfer_type], batch);
+                    instance->transfers[batch->ep->transfer_type], batch);
                 instance->registers->command_status |= CS_BLF;
                 usb_log_debug2("Set bulk transfer filled: %x.\n",
@@ -161 +162 @@
                 instance->registers->control &= (~C_PLE & ~C_IE);
                 transfer_list_add_batch(
-                    instance->transfers[batch->transfer_type], batch);
+                    instance->transfers[batch->ep->transfer_type], batch);
                 instance->registers->control |= C_PLE | C_IE;
                 usb_log_debug2("Added periodic transfer: %x.\n",

uspace/drv/ohci/root_hub.c

@@ -237 +237 @@
         assert(request);
         int opResult;
-        if (request->transfer_type == USB_TRANSFER_CONTROL) {
+        if (request->ep->transfer_type == USB_TRANSFER_CONTROL) {
                 usb_log_info("Root hub got CONTROL packet\n");
                 opResult = process_ctrl_request(instance, request);
-        } else if (request->transfer_type == USB_TRANSFER_INTERRUPT) {
+        } else if (request->ep->transfer_type == USB_TRANSFER_INTERRUPT) {
                 usb_log_info("Root hub got INTERRUPT packet\n");
                 void * buffer;
                 create_interrupt_mask(instance, &buffer,
                         &(request->transfered_size));
-                memcpy(request->transport_buffer, buffer,
+                memcpy(request->data_buffer, buffer,
                         request->transfered_size);
                 opResult = EOK;
@@ -374 +374 @@
         if (port < 1 || port > instance->port_count)
                 return EINVAL;
-        uint32_t * uint32_buffer = (uint32_t*) request->transport_buffer;
+        uint32_t * uint32_buffer = (uint32_t*) request->data_buffer;
         request->transfered_size = 4;
         uint32_buffer[0] = instance->registers->rh_port_status[port - 1];
@@ -400 +400 @@
 static int process_get_hub_status_request(rh_t *instance,
         usb_transfer_batch_t * request) {
-        uint32_t * uint32_buffer = (uint32_t*) request->transport_buffer;
+        uint32_t * uint32_buffer = (uint32_t*) request->data_buffer;
         request->transfered_size = 4;
         //bits, 0,1,16,17
@@ -550 +550 @@
         }
         request->transfered_size = size;
-        memcpy(request->transport_buffer, result_descriptor, size);
+        memcpy(request->data_buffer, result_descriptor, size);
         if (del)
                 free(result_descriptor);
@@ -571 +571 @@
         if (request->buffer_size != 1)
                 return EINVAL;
-        request->transport_buffer[0] = 1;
+        request->data_buffer[0] = 1;
         request->transfered_size = 1;
         return EOK;