Changeset 0b749a3 in mainline for kernel/generic/include/ddi/ddi.h

Timestamp:

2010-11-22T15:39:53Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

0eddb76, aae339e9

Parents:

9a1d8ab (diff), 8cd1aa5e (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:

• kernel/generic/include/ddi/ddi.h (modified) (2 diffs)

kernel/generic/include/ddi/ddi.h

@@ -54 +54 @@
 extern unative_t sys_physmem_map(unative_t, unative_t, unative_t, unative_t);
 extern unative_t sys_iospace_enable(ddi_ioarg_t *);
-extern unative_t sys_preempt_control(int);
+extern unative_t sys_interrupt_enable(int irq, int enable);
 
 /*
@@ -61 +61 @@
 extern int ddi_iospace_enable_arch(task_t *, uintptr_t, size_t);
 
+
 #endif