Changeset 8e8b84f in mainline for uspace/drv/uhci-hcd

Timestamp:

2011-04-09T11:01:44Z (15 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

5410c04, 7b715892

Parents:

61727bf (diff), 39db23f (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:

OHCI prototype (does not work)

minor UHCI code-style changes

Location:

uspace/drv/uhci-hcd

Files:

• batch.c (modified) (1 diff)
• hc.c (modified) (1 diff)
• iface.c (modified) (1 diff)

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;

uspace/drv/uhci-hcd/hc.c

@@ -240 +240 @@
         usb_log_debug("Initialized device manager.\n");
 
-        ret =
-            usb_endpoint_manager_init(&instance->ep_manager,
-                BANDWIDTH_AVAILABLE_USB11);
+        ret = usb_endpoint_manager_init(&instance->ep_manager,
+            BANDWIDTH_AVAILABLE_USB11);
         assert(ret == EOK);
 

uspace/drv/uhci-hcd/iface.c

@@ -206 +206 @@
         const usb_speed_t speed =
             usb_device_keeper_get_speed(&hc->manager, address);
-        const size_t size =
-            (transfer_type == USB_TRANSFER_INTERRUPT
-            || transfer_type == USB_TRANSFER_ISOCHRONOUS) ?
-            max_packet_size : 0;
+        const size_t size = max_packet_size;
         int ret;