diff options
Diffstat (limited to 'service')
| -rw-r--r-- | service/Makefile | 4 | ||||
| -rw-r--r-- | service/config.h | 5 | ||||
| -rw-r--r-- | service/main.c | 3 |
3 files changed, 9 insertions, 3 deletions
diff --git a/service/Makefile b/service/Makefile index b78cac3..e9c74d5 100644 --- a/service/Makefile +++ b/service/Makefile @@ -4,12 +4,12 @@ LDFLAGS += -z max-page-size=4096 --export-dynamic -pic \ -z separate-code -pie -Bsymbolic -shared \ -z noexecstack -g -VPATH := ../lib arch/x86_64/ lib +VPATH := ../lib ../lib/libc arch/x86_64/ lib TARGET := kjarna.os .DEFAULT: $(TARGET) -CPPFLAGS += -I../api/posix -I../api/libc -I../api -I. +CPPFLAGS += -I../api/posix -I../lib/api -I../api -I. CFLAGS += -fPIC -fvisibility=hidden -mgeneral-regs-only diff --git a/service/config.h b/service/config.h index b438f0b..8d3132e 100644 --- a/service/config.h +++ b/service/config.h @@ -2,5 +2,8 @@ #define KJARNA_REVISION 2 -const char * const HAL_PATH = "/service/kjarna/kernel.os"; +extern const char * const HAL_PATH; + +#define HEAP_SEGMENT_SIZE 0x4000 +#define HEAP_MAX_SIZE 0x80000000 diff --git a/service/main.c b/service/main.c index e2c705b..788cffc 100644 --- a/service/main.c +++ b/service/main.c @@ -6,6 +6,7 @@ #include "config.h" #include <lib/elf.h> +const char * const HAL_PATH = "/service/kjarna/kernel.os"; static int open_kernel(void) { @@ -44,6 +45,8 @@ int main(int argc, char **argv) printf("kjarna %d\n", KJARNA_REVISION); int kernel_fd = open_kernel(); + while (1); + (void)kernel_fd; return 0; } |