Changeset 97ab321 in mainline for uspace/drv/ohci/hc.h

Timestamp:

2011-04-07T09:53:12Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

d41f301

Parents:

c4e0b47 (diff), 41c1f7b (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 development/ changes

File:

• uspace/drv/ohci/hc.h (modified) (3 diffs)

uspace/drv/ohci/hc.h

@@ -42 +42 @@
 #include <usb/usb.h>
 #include <usb/host/device_keeper.h>
-#include <usb/host/bandwidth.h>
+#include <usb/host/usb_endpoint_manager.h>
 #include <usbhc_iface.h>
 
@@ -48 +48 @@
 #include "ohci_regs.h"
 #include "root_hub.h"
+#include "hw_struct/hcca.h"
 
 typedef struct hc {
@@ -55 +56 @@
         ddf_fun_t *ddf_instance;
         usb_device_keeper_t manager;
-        bandwidth_t bandwidth;
+        usb_endpoint_manager_t ep_manager;
         fid_t interrupt_emulator;
 } hc_t;