diff --git a/compile_flags.txt b/compile_flags.txt new file mode 100644 index 0000000..4a197fa --- /dev/null +++ b/compile_flags.txt @@ -0,0 +1,2 @@ +clang +-I./src/include diff --git a/compile_flags.txt b/compile_flags.txt new file mode 100644 index 0000000..4a197fa --- /dev/null +++ b/compile_flags.txt @@ -0,0 +1,2 @@ +clang +-I./src/include diff --git a/src/kernel/kernel.c b/src/kernel/kernel.c index b442fac..39eb704 100644 --- a/src/kernel/kernel.c +++ b/src/kernel/kernel.c @@ -1,24 +1,27 @@ -#include #include <_stdio.h> -#include -#include -#include #include -#include -#include -#include -#include +#include #include +#include +#include +#include +#include +#include +#include +#include extern uint32_t _kernel_end; void kernelMain() { - initMemoryAllocation(0x1000000); // initializing stacks after the kernel seems not to work :( otherwise, _kernel_end should be passed here - initOSTasks(); - drawLogo(); - printf("initializing interrupts\n"); - setupDevices(); - initInterrupts(); - yields(); - while(1); -} \ No newline at end of file + initMemoryAllocation( + 0x1000000); // initializing stacks after the kernel seems not to work :( + // otherwise, _kernel_end should be passed here + initOSTasks(); + drawLogo(); + printf("initializing interrupts\n"); + setupDevices(); + initInterrupts(); + yields(); + while (1) + ; +} diff --git a/compile_flags.txt b/compile_flags.txt new file mode 100644 index 0000000..4a197fa --- /dev/null +++ b/compile_flags.txt @@ -0,0 +1,2 @@ +clang +-I./src/include diff --git a/src/kernel/kernel.c b/src/kernel/kernel.c index b442fac..39eb704 100644 --- a/src/kernel/kernel.c +++ b/src/kernel/kernel.c @@ -1,24 +1,27 @@ -#include #include <_stdio.h> -#include -#include -#include #include -#include -#include -#include -#include +#include #include +#include +#include +#include +#include +#include +#include +#include extern uint32_t _kernel_end; void kernelMain() { - initMemoryAllocation(0x1000000); // initializing stacks after the kernel seems not to work :( otherwise, _kernel_end should be passed here - initOSTasks(); - drawLogo(); - printf("initializing interrupts\n"); - setupDevices(); - initInterrupts(); - yields(); - while(1); -} \ No newline at end of file + initMemoryAllocation( + 0x1000000); // initializing stacks after the kernel seems not to work :( + // otherwise, _kernel_end should be passed here + initOSTasks(); + drawLogo(); + printf("initializing interrupts\n"); + setupDevices(); + initInterrupts(); + yields(); + while (1) + ; +} diff --git a/src/kernel/util/tree-os.c b/src/kernel/util/tree-os.c index bb4c71c..8c0d252 100644 --- a/src/kernel/util/tree-os.c +++ b/src/kernel/util/tree-os.c @@ -1,18 +1,19 @@ -#include #include <_stdio.h> #include +#include -const char* logo = "\ +#define LOGO \ + "\ _______ \n\ |__ __| \n\ | |_ __ ___ ___ ___ ___ \n\ | | '__/ _ \\/ _ \\ / _ \\/ __| \n\ | | | | __/ __/ | (_) \\__ \\ \n\ - |_|_| \\___|\\___| \\___/|___/ \n\n"; + |_|_| \\___|\\___| \\___/|___/ \n\n" void drawLogo() { - printf(logo); - printf("TREE-OS v. alpha 0.1 (IN DEVELOPMENT)\n\n"); - yields(); - setTextStyle(0x0F); -} \ No newline at end of file + printf(LOGO); + printf("TREE-OS v. alpha 0.1 (IN DEVELOPMENT)\n\n"); + yields(); + setTextStyle(0x0F); +}