Changeset b8cab5c in mainline for uspace/drv/uhci-hcd/hc.h

Timestamp:

2011-05-27T07:10:12Z (13 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

ffca03c

Parents:

8bb61e6 (diff), 1889786 (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/hc.h (modified) (2 diffs)

uspace/drv/uhci-hcd/hc.h

@@ -37 +37 @@
 
 #include <fibril.h>
-#include <fibril_synch.h>
-#include <adt/list.h>
 #include <ddi.h>
 
-#include <usbhc_iface.h>
 #include <usb/host/device_keeper.h>
 #include <usb/host/usb_endpoint_manager.h>
+#include <usb/host/batch.h>
 
-#include "batch.h"
 #include "transfer_list.h"
 
@@ -154 +151 @@
  */
 static inline hc_t * fun_to_hc(ddf_fun_t *fun)
-        { return (hc_t*)fun->driver_data; }
+{
+        assert(fun);
+        return fun->driver_data;
+}
 #endif
 /**