Changeset 432a269 in mainline for uspace/drv/bus/usb/ohci/root_hub.c

Timestamp:

2011-09-16T21:13:57Z (13 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

3a11f17

Parents:

c0e53ff (diff), fd07e526 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

• uspace/drv/bus/usb/ohci/root_hub.c (modified) (9 diffs)

uspace/drv/bus/usb/ohci/root_hub.c

@@ -121 +121 @@
         assert(request);
 
-        memcpy(request->data_buffer, &mask, size);
         request->transfered_size = size;
-        usb_transfer_batch_finish_error(request, EOK);
+        usb_transfer_batch_finish_error(request, &mask, size, EOK);
 }
 
@@ -206 +205 @@
                 usb_log_debug("Root hub got CONTROL packet\n");
                 const int ret = control_request(instance, request);
-                usb_transfer_batch_finish_error(request, ret);
+                usb_transfer_batch_finish_error(request, NULL, 0, ret);
                 break;
         case USB_TRANSFER_INTERRUPT:
@@ -215 +214 @@
                         assert(instance->unfinished_interrupt_transfer == NULL);
                         instance->unfinished_interrupt_transfer = request;
-                        break;
+                        return;
                 }
                 usb_log_debug("Processing changes...\n");
@@ -223 +222 @@
         default:
                 usb_log_error("Root hub got unsupported request.\n");
-                usb_transfer_batch_finish_error(request, EINVAL);
-        }
+                usb_transfer_batch_finish_error(request, NULL, 0, EINVAL);
+        }
+        usb_transfer_batch_dispose(request);
 }
 /*----------------------------------------------------------------------------*/
@@ -244 +244 @@
         interrupt_request(instance->unfinished_interrupt_transfer,
             mask, instance->interrupt_mask_size);
+        usb_transfer_batch_dispose(instance->unfinished_interrupt_transfer);
 
         instance->unfinished_interrupt_transfer = NULL;
@@ -389 +390 @@
                 const uint32_t data = instance->registers->rh_status &
                     (RHS_LPS_FLAG | RHS_LPSC_FLAG | RHS_OCI_FLAG | RHS_OCIC_FLAG);
-                memcpy(request->data_buffer, &data, 4);
-                TRANSFER_OK(4);
+                memcpy(request->buffer, &data, sizeof(data));
+                TRANSFER_OK(sizeof(data));
         }
 
@@ -402 +403 @@
                 const uint32_t data =
                     instance->registers->rh_port_status[port - 1];
-                memcpy(request->data_buffer, &data, 4);
-                TRANSFER_OK(4);
+                memcpy(request->buffer, &data, sizeof(data));
+                TRANSFER_OK(sizeof(data));
         }
 
@@ -483 +484 @@
         }
 
-        memcpy(request->data_buffer, descriptor, size);
+        memcpy(request->buffer, descriptor, size);
         TRANSFER_OK(size);
 }
@@ -713 +714 @@
                 if (request->buffer_size != 1)
                         return EINVAL;
-                request->data_buffer[0] = 1;
+                request->buffer[0] = 1;
                 TRANSFER_OK(1);