Changeset 8fb1bf82 in mainline for kernel/generic/include

Timestamp:

2010-11-25T13:42:50Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

8df8415

Parents:

a93d79a (diff), eb667613 (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.

Location:

kernel/generic/include

Files:

• ddi/ddi.h (modified) (2 diffs)
• syscall/syscall.h (modified) (1 diff)
• typedefs.h (modified) (1 diff)

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_interrupt_enable(int irq, int enable);
 
 /*
@@ -60 +61 @@
 extern int ddi_iospace_enable_arch(task_t *, uintptr_t, size_t);
 
+
 #endif
 

kernel/generic/include/syscall/syscall.h

@@ -80 +80 @@
         SYS_PHYSMEM_MAP,
         SYS_IOSPACE_ENABLE,
+        SYS_INTERRUPT_ENABLE,
         
         SYS_SYSINFO_GET_TAG,

kernel/generic/include/typedefs.h

@@ -40 +40 @@
 #include <arch/types.h>
 
-#define NULL  0
+#define NULL    ((void *) 0)
 
 #define false  0