Changeset d017cea in mainline for uspace/drv/ohci/hc.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/hc.c (modified) (3 diffs)

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",