Changeset 8e7c9fe in mainline for uspace/lib/drv/include/ddf

Timestamp:

2014-09-12T03:45:25Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

c53b58e

Parents:

3eb0c85 (diff), 105d8d6 (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

most usb changes were reverted. blink and usbmass were fixed
known problems:
ehci won't initialize
usbmast asserts on unmount (happens on mainline too)

Location:

uspace/lib/drv/include/ddf

Files:

• driver.h (modified) (1 diff)
• interrupt.h (modified) (1 diff)

uspace/lib/drv/include/ddf/driver.h

@@ -111 +111 @@
 } driver_t;
 
-/** XXX Only to transition network drivers */
-#ifdef _DDF_DATA_IMPLANT
-extern void ddf_fun_data_implant(ddf_fun_t *, void *);
-#endif
-
 extern int ddf_driver_main(const driver_t *);
 

uspace/lib/drv/include/ddf/interrupt.h

@@ -49 +49 @@
  */
 
-typedef void interrupt_handler_t(ddf_dev_t *, ipc_callid_t, ipc_call_t *);
+typedef void interrupt_handler_t(ipc_callid_t, ipc_call_t *, ddf_dev_t *);
 
-typedef struct interrupt_context {
-        int id;
-        ddf_dev_t *dev;
-        int irq;
-        interrupt_handler_t *handler;
-        link_t link;
-} interrupt_context_t;
-
-typedef struct interrupt_context_list {
-        int curr_id;
-        list_t contexts;
-        fibril_mutex_t mutex;
-} interrupt_context_list_t;
-
-extern void interrupt_init(void);
 extern int register_interrupt_handler(ddf_dev_t *, int, interrupt_handler_t *,
     const irq_code_t *);