Changeset d017cea in mainline for uspace/drv/ohci/root_hub.c

Timestamp:

2011-04-12T10:09:56Z (14 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

File:

• uspace/drv/ohci/root_hub.c (modified) (5 diffs)

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;