Changeset 8c877b2 in mainline for uspace/drv/uhci-hcd/batch.h

Timestamp:

2011-03-04T13:05:35Z (14 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

d49728c

Parents:

dff940f8 (diff), 9a422574 (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 with \usb\development

File:

• uspace/drv/uhci-hcd/batch.h (modified) (2 diffs)

uspace/drv/uhci-hcd/batch.h

@@ -43 +43 @@
 #include "uhci_struct/queue_head.h"
 
-typedef enum {
-        LOW_SPEED,
-        FULL_SPEED,
-} dev_speed_t;
-
 typedef struct batch
 {
         link_t link;
-        dev_speed_t speed;
+        usb_speed_t speed;
         usb_target_t target;
         usb_transfer_type_t transfer_type;
@@ -76 +71 @@
 batch_t * batch_get(ddf_fun_t *fun, usb_target_t target,
     usb_transfer_type_t transfer_type, size_t max_packet_size,
-    dev_speed_t speed, char *buffer, size_t size,
+    usb_speed_t speed, char *buffer, size_t size,
                 char *setup_buffer, size_t setup_size,
     usbhc_iface_transfer_in_callback_t func_in,