From 8d2571cd1f34e06e449c1be86a072d1d477b6644 Mon Sep 17 00:00:00 2001 From: Amit Mahajan Date: Tue, 8 Dec 2009 13:02:48 +0530 Subject: [PATCH] Capability print functions shifted to l4lib and various capability.h cleaned --- .../clcd_service/include/capability.h | 12 -- conts/baremetal/clcd_service/main.c | 6 +- conts/baremetal/test/include/capability.h | 12 -- .../timer_service/include/capability.h | 12 -- conts/baremetal/timer_service/main.c | 117 +----------------- .../uart_service/include/capability.h | 12 -- conts/baremetal/uart_service/main.c | 115 +---------------- conts/libl4/SConscript | 4 +- .../include/l4lib/capability/cap_print.h | 12 ++ conts/libl4/src/capability/cap_print.c | 111 +++++++++++++++++ conts/posix/mm0/include/capability.h | 1 - conts/posix/mm0/mm/capability.c | 109 +--------------- include/l4/api/capability.h | 3 +- include/l4/lib/list.h | 2 + 14 files changed, 141 insertions(+), 387 deletions(-) delete mode 100644 conts/baremetal/clcd_service/include/capability.h delete mode 100644 conts/baremetal/test/include/capability.h delete mode 100644 conts/baremetal/timer_service/include/capability.h delete mode 100644 conts/baremetal/uart_service/include/capability.h create mode 100644 conts/libl4/include/l4lib/capability/cap_print.h create mode 100644 conts/libl4/src/capability/cap_print.c diff --git a/conts/baremetal/clcd_service/include/capability.h b/conts/baremetal/clcd_service/include/capability.h deleted file mode 100644 index 5cfce89..0000000 --- a/conts/baremetal/clcd_service/include/capability.h +++ /dev/null @@ -1,12 +0,0 @@ -#ifndef __UART_SERVICE_CAPABILITY_H__ -#define __UART_SERVICE_CAPABILITY_H__ - -#include -#include -#include - -void cap_print(struct capability *cap); -void cap_list_print(struct cap_list *cap_list); -int cap_read_all(); - -#endif /* header */ diff --git a/conts/baremetal/clcd_service/main.c b/conts/baremetal/clcd_service/main.c index 72a8f85..df85e26 100644 --- a/conts/baremetal/clcd_service/main.c +++ b/conts/baremetal/clcd_service/main.c @@ -9,7 +9,7 @@ #include #include -#include +#include #include #include /* FIXME: Its best if this is */ #include @@ -28,7 +28,7 @@ int cap_read_all() /* Read number of capabilities */ if ((err = l4_capability_control(CAP_CONTROL_NCAPS, - 0, 0, 0, &ncaps)) < 0) { + 0, &ncaps)) < 0) { printf("l4_capability_control() reading # of" " capabilities failed.\n Could not " "complete CAP_CONTROL_NCAPS request.\n"); @@ -38,7 +38,7 @@ int cap_read_all() /* Read all capabilities */ if ((err = l4_capability_control(CAP_CONTROL_READ, - 0, 0, 0, caparray)) < 0) { + 0, caparray)) < 0) { printf("l4_capability_control() reading of " "capabilities failed.\n Could not " "complete CAP_CONTROL_READ_CAPS request.\n"); diff --git a/conts/baremetal/test/include/capability.h b/conts/baremetal/test/include/capability.h deleted file mode 100644 index 4beadac..0000000 --- a/conts/baremetal/test/include/capability.h +++ /dev/null @@ -1,12 +0,0 @@ -#ifndef __CAPABILITY_H__ -#define __CAPABILITY_H__ - -#include -#include -#include - -void capability_print(struct capability *cap); - -int caps_read_all(); - -#endif /* __CAPABILITY_H__ */ diff --git a/conts/baremetal/timer_service/include/capability.h b/conts/baremetal/timer_service/include/capability.h deleted file mode 100644 index 5cfce89..0000000 --- a/conts/baremetal/timer_service/include/capability.h +++ /dev/null @@ -1,12 +0,0 @@ -#ifndef __UART_SERVICE_CAPABILITY_H__ -#define __UART_SERVICE_CAPABILITY_H__ - -#include -#include -#include - -void cap_print(struct capability *cap); -void cap_list_print(struct cap_list *cap_list); -int cap_read_all(); - -#endif /* header */ diff --git a/conts/baremetal/timer_service/main.c b/conts/baremetal/timer_service/main.c index b7d94c1..5e9e161 100644 --- a/conts/baremetal/timer_service/main.c +++ b/conts/baremetal/timer_service/main.c @@ -10,7 +10,7 @@ #include #include -#include +#include #include #include "sp804_timer.h" #include @@ -26,112 +26,6 @@ static int total_caps = 0; struct capability timer_cap[TIMERS_TOTAL]; - -void cap_dev_print(struct capability *cap) -{ - switch (cap_devtype(cap)) { - case CAP_DEVTYPE_UART: - printf("Device type:\t\t\t%s%d\n", "UART", cap_devnum(cap)); - break; - case CAP_DEVTYPE_TIMER: - printf("Device type:\t\t\t%s%d\n", "Timer", cap_devnum(cap)); - break; - case CAP_DEVTYPE_CLCD: - printf("Device type:\t\t\t%s%d\n", "CLCD", cap_devnum(cap)); - break; - default: - return; - } - printf("Device Irq:\t\t%d\n", cap->irq); -} - -void cap_print(struct capability *cap) -{ - printf("Capability id:\t\t\t%d\n", cap->capid); - printf("Capability resource id:\t\t%d\n", cap->resid); - printf("Capability owner id:\t\t%d\n",cap->owner); - - switch (cap_type(cap)) { - case CAP_TYPE_TCTRL: - printf("Capability type:\t\t%s\n", "Thread Control"); - break; - case CAP_TYPE_EXREGS: - printf("Capability type:\t\t%s\n", "Exchange Registers"); - break; - case CAP_TYPE_MAP_PHYSMEM: - if (!cap_is_devmem(cap)) { - printf("Capability type:\t\t%s\n", "Map/Physmem"); - } else { - printf("Capability type:\t\t%s\n", "Map/Physmem/Device"); - cap_dev_print(cap); - } - break; - case CAP_TYPE_MAP_VIRTMEM: - printf("Capability type:\t\t%s\n", "Map/Virtmem"); - break; - case CAP_TYPE_IPC: - printf("Capability type:\t\t%s\n", "Ipc"); - break; - case CAP_TYPE_UMUTEX: - printf("Capability type:\t\t%s\n", "Mutex"); - break; - case CAP_TYPE_IRQCTRL: - printf("Capability type:\t\t%s\n", "IRQ Control"); - break; - case CAP_TYPE_QUANTITY: - printf("Capability type:\t\t%s\n", "Quantitative"); - break; - default: - printf("Capability type:\t\t%s\n", "Unknown"); - break; - } - - switch (cap_rtype(cap)) { - case CAP_RTYPE_THREAD: - printf("Capability resource type:\t%s\n", "Thread"); - break; - case CAP_RTYPE_SPACE: - printf("Capability resource type:\t%s\n", "Space"); - break; - case CAP_RTYPE_CONTAINER: - printf("Capability resource type:\t%s\n", "Container"); - break; - case CAP_RTYPE_THREADPOOL: - printf("Capability resource type:\t%s\n", "Thread Pool"); - break; - case CAP_RTYPE_SPACEPOOL: - printf("Capability resource type:\t%s\n", "Space Pool"); - break; - case CAP_RTYPE_MUTEXPOOL: - printf("Capability resource type:\t%s\n", "Mutex Pool"); - break; - case CAP_RTYPE_MAPPOOL: - printf("Capability resource type:\t%s\n", "Map Pool (PMDS)"); - break; - case CAP_RTYPE_CPUPOOL: - printf("Capability resource type:\t%s\n", "Cpu Pool"); - break; - case CAP_RTYPE_CAPPOOL: - printf("Capability resource type:\t%s\n", "Capability Pool"); - break; - default: - printf("Capability resource type:\t%s\n", "Unknown"); - break; - } - printf("\n"); -} - -void cap_array_print() -{ - printf("Capabilities\n" - "~~~~~~~~~~~~\n"); - - for (int i = 0; i < total_caps; i++) - cap_print(&caparray[i]); - - printf("\n"); -} - int cap_read_all() { int ncaps; @@ -139,7 +33,7 @@ int cap_read_all() /* Read number of capabilities */ if ((err = l4_capability_control(CAP_CONTROL_NCAPS, - 0, 0, 0, &ncaps)) < 0) { + 0, &ncaps)) < 0) { printf("l4_capability_control() reading # of" " capabilities failed.\n Could not " "complete CAP_CONTROL_NCAPS request.\n"); @@ -149,15 +43,14 @@ int cap_read_all() /* Read all capabilities */ if ((err = l4_capability_control(CAP_CONTROL_READ, - 0, 0, 0, caparray)) < 0) { + 0, caparray)) < 0) { printf("l4_capability_control() reading of " "capabilities failed.\n Could not " "complete CAP_CONTROL_READ_CAPS request.\n"); BUG(); } -#if 0 - cap_array_print(&caparray); -#endif + //cap_array_print(total_caps, caparray); + return 0; } diff --git a/conts/baremetal/uart_service/include/capability.h b/conts/baremetal/uart_service/include/capability.h deleted file mode 100644 index 5cfce89..0000000 --- a/conts/baremetal/uart_service/include/capability.h +++ /dev/null @@ -1,12 +0,0 @@ -#ifndef __UART_SERVICE_CAPABILITY_H__ -#define __UART_SERVICE_CAPABILITY_H__ - -#include -#include -#include - -void cap_print(struct capability *cap); -void cap_list_print(struct cap_list *cap_list); -int cap_read_all(); - -#endif /* header */ diff --git a/conts/baremetal/uart_service/main.c b/conts/baremetal/uart_service/main.c index 6152910..b6d9076 100644 --- a/conts/baremetal/uart_service/main.c +++ b/conts/baremetal/uart_service/main.c @@ -9,7 +9,7 @@ #include #include -#include +#include #include #include /* FIXME: Its best if this is */ #include @@ -21,111 +21,6 @@ static int total_caps = 0; struct capability uart_cap[UARTS_TOTAL]; -void cap_dev_print(struct capability *cap) -{ - switch (cap_devtype(cap)) { - case CAP_DEVTYPE_UART: - printf("Device type:\t\t\t%s%d\n", "UART", cap_devnum(cap)); - break; - case CAP_DEVTYPE_TIMER: - printf("Device type:\t\t\t%s%d\n", "Timer", cap_devnum(cap)); - break; - case CAP_DEVTYPE_CLCD: - printf("Device type:\t\t\t%s%d\n", "CLCD", cap_devnum(cap)); - break; - default: - return; - } - printf("Device Irq:\t\t%d\n", cap->irq); -} - -void cap_print(struct capability *cap) -{ - printf("Capability id:\t\t\t%d\n", cap->capid); - printf("Capability resource id:\t\t%d\n", cap->resid); - printf("Capability owner id:\t\t%d\n",cap->owner); - - switch (cap_type(cap)) { - case CAP_TYPE_TCTRL: - printf("Capability type:\t\t%s\n", "Thread Control"); - break; - case CAP_TYPE_EXREGS: - printf("Capability type:\t\t%s\n", "Exchange Registers"); - break; - case CAP_TYPE_MAP_PHYSMEM: - if (!cap_is_devmem(cap)) { - printf("Capability type:\t\t%s\n", "Map/Physmem"); - } else { - printf("Capability type:\t\t%s\n", "Map/Physmem/Device"); - cap_dev_print(cap); - } - break; - case CAP_TYPE_MAP_VIRTMEM: - printf("Capability type:\t\t%s\n", "Map/Virtmem"); - break; - case CAP_TYPE_IPC: - printf("Capability type:\t\t%s\n", "Ipc"); - break; - case CAP_TYPE_UMUTEX: - printf("Capability type:\t\t%s\n", "Mutex"); - break; - case CAP_TYPE_IRQCTRL: - printf("Capability type:\t\t%s\n", "IRQ Control"); - break; - case CAP_TYPE_QUANTITY: - printf("Capability type:\t\t%s\n", "Quantitative"); - break; - default: - printf("Capability type:\t\t%s\n", "Unknown"); - break; - } - - switch (cap_rtype(cap)) { - case CAP_RTYPE_THREAD: - printf("Capability resource type:\t%s\n", "Thread"); - break; - case CAP_RTYPE_SPACE: - printf("Capability resource type:\t%s\n", "Space"); - break; - case CAP_RTYPE_CONTAINER: - printf("Capability resource type:\t%s\n", "Container"); - break; - case CAP_RTYPE_THREADPOOL: - printf("Capability resource type:\t%s\n", "Thread Pool"); - break; - case CAP_RTYPE_SPACEPOOL: - printf("Capability resource type:\t%s\n", "Space Pool"); - break; - case CAP_RTYPE_MUTEXPOOL: - printf("Capability resource type:\t%s\n", "Mutex Pool"); - break; - case CAP_RTYPE_MAPPOOL: - printf("Capability resource type:\t%s\n", "Map Pool (PMDS)"); - break; - case CAP_RTYPE_CPUPOOL: - printf("Capability resource type:\t%s\n", "Cpu Pool"); - break; - case CAP_RTYPE_CAPPOOL: - printf("Capability resource type:\t%s\n", "Capability Pool"); - break; - default: - printf("Capability resource type:\t%s\n", "Unknown"); - break; - } - printf("\n"); -} - -void cap_array_print() -{ - printf("Capabilities\n" - "~~~~~~~~~~~~\n"); - - for (int i = 0; i < total_caps; i++) - cap_print(&caparray[i]); - - printf("\n"); -} - int cap_read_all() { int ncaps; @@ -133,7 +28,7 @@ int cap_read_all() /* Read number of capabilities */ if ((err = l4_capability_control(CAP_CONTROL_NCAPS, - 0, 0, 0, &ncaps)) < 0) { + 0, &ncaps)) < 0) { printf("l4_capability_control() reading # of" " capabilities failed.\n Could not " "complete CAP_CONTROL_NCAPS request.\n"); @@ -143,16 +38,14 @@ int cap_read_all() /* Read all capabilities */ if ((err = l4_capability_control(CAP_CONTROL_READ, - 0, 0, 0, caparray)) < 0) { + 0, caparray)) < 0) { printf("l4_capability_control() reading of " "capabilities failed.\n Could not " "complete CAP_CONTROL_READ_CAPS request.\n"); BUG(); } -#if 0 - cap_array_print(&caparray); -#endif + //cap_array_print(total_caps, caparray); return 0; } diff --git a/conts/libl4/SConscript b/conts/libl4/SConscript index 162b657..6444a42 100644 --- a/conts/libl4/SConscript +++ b/conts/libl4/SConscript @@ -39,7 +39,7 @@ env = Environment(CC = config.user_toolchain + 'gcc', ASFLAGS = ['-D__ASSEMBLY__'], ENV = {'PATH' : os.environ['PATH']}, LIBS = 'gcc', - CPPPATH = ['include', 'include/l4lib/arch', join(PROJROOT, 'include') ]) + CPPPATH = ['include', 'include/l4lib/arch', join(PROJROOT, 'include')]) env.Append(CPPPATH = [LIBMEM_DIR]) @@ -55,7 +55,7 @@ def create_symlinks(arch): os.system(cmd) #create_symlinks(arch) -objects = env.StaticObject(Glob('src/*.c') + Glob('src/thread/*.c') + Glob('src/' + arch + '/*.[cS]')) +objects = env.StaticObject(Glob('src/*.c') + Glob('src/thread/*.c') + Glob('src/' + arch + '/*.[cS]') + Glob('src/capability/*c')) library = env.StaticLibrary('l4', objects) Return('library') diff --git a/conts/libl4/include/l4lib/capability/cap_print.h b/conts/libl4/include/l4lib/capability/cap_print.h new file mode 100644 index 0000000..6668d53 --- /dev/null +++ b/conts/libl4/include/l4lib/capability/cap_print.h @@ -0,0 +1,12 @@ + +#ifndef __CAP_PRINT_H__ +#define __CAP_PRINT_H__ + +#include +#include + +void cap_dev_print(struct capability *cap); +void cap_print(struct capability *cap); +void cap_array_print(int total_caps, struct capability *caparray); + +#endif /* __CAP_PRINT_H__*/ diff --git a/conts/libl4/src/capability/cap_print.c b/conts/libl4/src/capability/cap_print.c new file mode 100644 index 0000000..29e2333 --- /dev/null +++ b/conts/libl4/src/capability/cap_print.c @@ -0,0 +1,111 @@ + + +/* Capability printing generic routines */ + +#include + +void cap_dev_print(struct capability *cap) +{ + switch (cap_devtype(cap)) { + case CAP_DEVTYPE_UART: + printf("Device type:\t\t\t%s%d\n", "UART", cap_devnum(cap)); + break; + case CAP_DEVTYPE_TIMER: + printf("Device type:\t\t\t%s%d\n", "Timer", cap_devnum(cap)); + break; + case CAP_DEVTYPE_CLCD: + printf("Device type:\t\t\t%s%d\n", "CLCD", cap_devnum(cap)); + break; + default: + return; + } + printf("Device Irq:\t\t%d\n", cap->irq); +} + +void cap_print(struct capability *cap) +{ + printf("Capability id:\t\t\t%d\n", cap->capid); + printf("Capability resource id:\t\t%d\n", cap->resid); + printf("Capability owner id:\t\t%d\n",cap->owner); + + switch (cap_type(cap)) { + case CAP_TYPE_TCTRL: + printf("Capability type:\t\t%s\n", "Thread Control"); + break; + case CAP_TYPE_EXREGS: + printf("Capability type:\t\t%s\n", "Exchange Registers"); + break; + case CAP_TYPE_MAP_PHYSMEM: + if (!cap_is_devmem(cap)) { + printf("Capability type:\t\t%s\n", "Map/Physmem"); + } else { + printf("Capability type:\t\t%s\n", "Map/Physmem/Device"); + cap_dev_print(cap); + } + break; + case CAP_TYPE_MAP_VIRTMEM: + printf("Capability type:\t\t%s\n", "Map/Virtmem"); + break; + case CAP_TYPE_IPC: + printf("Capability type:\t\t%s\n", "Ipc"); + break; + case CAP_TYPE_UMUTEX: + printf("Capability type:\t\t%s\n", "Mutex"); + break; + case CAP_TYPE_IRQCTRL: + printf("Capability type:\t\t%s\n", "IRQ Control"); + break; + case CAP_TYPE_QUANTITY: + printf("Capability type:\t\t%s\n", "Quantitative"); + break; + default: + printf("Capability type:\t\t%s\n", "Unknown"); + break; + } + + switch (cap_rtype(cap)) { + case CAP_RTYPE_THREAD: + printf("Capability resource type:\t%s\n", "Thread"); + break; + case CAP_RTYPE_SPACE: + printf("Capability resource type:\t%s\n", "Space"); + break; + case CAP_RTYPE_CONTAINER: + printf("Capability resource type:\t%s\n", "Container"); + break; + case CAP_RTYPE_THREADPOOL: + printf("Capability resource type:\t%s\n", "Thread Pool"); + break; + case CAP_RTYPE_SPACEPOOL: + printf("Capability resource type:\t%s\n", "Space Pool"); + break; + case CAP_RTYPE_MUTEXPOOL: + printf("Capability resource type:\t%s\n", "Mutex Pool"); + break; + case CAP_RTYPE_MAPPOOL: + printf("Capability resource type:\t%s\n", "Map Pool (PMDS)"); + break; + case CAP_RTYPE_CPUPOOL: + printf("Capability resource type:\t%s\n", "Cpu Pool"); + break; + case CAP_RTYPE_CAPPOOL: + printf("Capability resource type:\t%s\n", "Capability Pool"); + break; + default: + printf("Capability resource type:\t%s\n", "Unknown"); + break; + } + printf("\n"); +} + +void cap_array_print(int total_caps, struct capability *caparray) +{ + printf("Capabilities\n" + "~~~~~~~~~~~~\n"); + + for (int i = 0; i < total_caps; i++) + cap_print(&caparray[i]); + + printf("\n"); +} + diff --git a/conts/posix/mm0/include/capability.h b/conts/posix/mm0/include/capability.h index d9db553..a8cc26b 100644 --- a/conts/posix/mm0/include/capability.h +++ b/conts/posix/mm0/include/capability.h @@ -17,7 +17,6 @@ void copy_boot_capabilities(); int sys_request_cap(struct tcb *sender, struct capability *c); -void cap_print(struct capability *cap); void cap_list_print(struct cap_list *cap_list); void setup_caps(); #endif /* __MM0_CAPABILITY_H__ */ diff --git a/conts/posix/mm0/mm/capability.c b/conts/posix/mm0/mm/capability.c index 83efe95..6864341 100644 --- a/conts/posix/mm0/mm/capability.c +++ b/conts/posix/mm0/mm/capability.c @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include #include @@ -22,113 +22,6 @@ struct cap_list capability_list; __initdata static struct capability *caparray; __initdata static int total_caps = 0; - -void cap_dev_print(struct capability *cap) -{ - switch (cap_devtype(cap)) { - case CAP_DEVTYPE_UART: - printf("Device type:\t\t\t%s%d\n", "UART", cap_devnum(cap)); - break; - case CAP_DEVTYPE_TIMER: - printf("Device type:\t\t\t%s%d\n", "Timer", cap_devnum(cap)); - break; - case CAP_DEVTYPE_CLCD: - printf("Device type:\t\t\t%s%d\n", "CLCD", cap_devnum(cap)); - break; - default: - return; - } - printf("Device Irq:\t\t%d\n", cap->irq); -} - -void cap_print(struct capability *cap) -{ - printf("Capability id:\t\t\t%d\n", cap->capid); - printf("Capability resource id:\t\t%d\n", cap->resid); - printf("Capability owner id:\t\t%d\n",cap->owner); - - switch (cap_type(cap)) { - case CAP_TYPE_TCTRL: - printf("Capability type:\t\t%s\n", "Thread Control"); - break; - case CAP_TYPE_EXREGS: - printf("Capability type:\t\t%s\n", "Exchange Registers"); - break; - case CAP_TYPE_MAP_PHYSMEM: - if (!cap_is_devmem(cap)) { - printf("Capability type:\t\t%s\n", "Map/Physmem"); - } else { - printf("Capability type:\t\t%s\n", "Map/Physmem/Device"); - cap_dev_print(cap); - } - break; - case CAP_TYPE_MAP_VIRTMEM: - printf("Capability type:\t\t%s\n", "Map/Virtmem"); - break; - case CAP_TYPE_IPC: - printf("Capability type:\t\t%s\n", "Ipc"); - break; - case CAP_TYPE_UMUTEX: - printf("Capability type:\t\t%s\n", "Mutex"); - break; - case CAP_TYPE_IRQCTRL: - printf("Capability type:\t\t%s\n", "IRQ Control"); - break; - case CAP_TYPE_QUANTITY: - printf("Capability type:\t\t%s\n", "Quantitative"); - break; - default: - printf("Capability type:\t\t%s\n", "Unknown"); - break; - } - - switch (cap_rtype(cap)) { - case CAP_RTYPE_THREAD: - printf("Capability resource type:\t%s\n", "Thread"); - break; - case CAP_RTYPE_SPACE: - printf("Capability resource type:\t%s\n", "Space"); - break; - case CAP_RTYPE_CONTAINER: - printf("Capability resource type:\t%s\n", "Container"); - break; - case CAP_RTYPE_THREADPOOL: - printf("Capability resource type:\t%s\n", "Thread Pool"); - break; - case CAP_RTYPE_SPACEPOOL: - printf("Capability resource type:\t%s\n", "Space Pool"); - break; - case CAP_RTYPE_MUTEXPOOL: - printf("Capability resource type:\t%s\n", "Mutex Pool"); - break; - case CAP_RTYPE_MAPPOOL: - printf("Capability resource type:\t%s\n", "Map Pool (PMDS)"); - break; - case CAP_RTYPE_CPUPOOL: - printf("Capability resource type:\t%s\n", "Cpu Pool"); - break; - case CAP_RTYPE_CAPPOOL: - printf("Capability resource type:\t%s\n", "Capability Pool"); - break; - default: - printf("Capability resource type:\t%s\n", "Unknown"); - break; - } - printf("\n"); -} - -void cap_array_print() -{ - printf("Capabilities\n" - "~~~~~~~~~~~~\n"); - - for (int i = 0; i < total_caps; i++) - cap_print(&caparray[i]); - - printf("\n"); -} - - void cap_list_print(struct cap_list *cap_list) { struct capability *cap; diff --git a/include/l4/api/capability.h b/include/l4/api/capability.h index 771c411..8916f44 100644 --- a/include/l4/api/capability.h +++ b/include/l4/api/capability.h @@ -6,9 +6,8 @@ #ifndef __API_CAPABILITY_H__ #define __API_CAPABILITY_H__ -#if defined(__KERNEL__) #include -#endif +#include INC_ARCH(types.h) /* Capability syscall request types */ #define CAP_CONTROL_NCAPS 0x00000000 diff --git a/include/l4/lib/list.h b/include/l4/lib/list.h index 9601e06..bf76743 100644 --- a/include/l4/lib/list.h +++ b/include/l4/lib/list.h @@ -1,6 +1,8 @@ #ifndef __LIST_H__ #define __LIST_H__ +#include + #define L4_DEADWORD 0xDEADCCCC struct link {