diff --git a/Makefile b/Makefile index e0b541a..0a31a7a 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ CC = i686-elf-gcc -CCFLAGS = -m32 -mtune=generic -ffreestanding -nostdlib -c -I src/kernel +CCFLAGS = -m32 -mtune=generic -ffreestanding -nostdlib -c -I src/headers LD = i686-elf-ld LD_FLAGS = -z max-page-size=0x1000 -T linker.ld AS = nasm diff --git a/Makefile b/Makefile index e0b541a..0a31a7a 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ CC = i686-elf-gcc -CCFLAGS = -m32 -mtune=generic -ffreestanding -nostdlib -c -I src/kernel +CCFLAGS = -m32 -mtune=generic -ffreestanding -nostdlib -c -I src/headers LD = i686-elf-ld LD_FLAGS = -z max-page-size=0x1000 -T linker.ld AS = nasm diff --git a/src/headers/alloc.h b/src/headers/alloc.h new file mode 100644 index 0000000..82023d4 --- /dev/null +++ b/src/headers/alloc.h @@ -0,0 +1,28 @@ +#ifndef ALLOC_H +#define ALLOC_H + +#include +#include + +typedef enum MemoryState { + FREE = 0, + IN_USE = 1 +} MemoryState; + +typedef struct MemoryBlock { + struct MemoryBlock* last; + struct MemoryBlock* next; + MemoryState state; + uint32_t size; + Task* task; +} MemoryBlock; + +extern void initMemoryAllocation(uint32_t kernelEnd); +extern void* malloc(uint32_t size); +extern void* mallocTask(uint32_t size, Task* task); +extern void free(void* location); +extern void printMemoryStack(); +extern void freeTaskAllocations(Task* task); +extern Task* getCurrentTask(); + +#endif \ No newline at end of file diff --git a/Makefile b/Makefile index e0b541a..0a31a7a 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ CC = i686-elf-gcc -CCFLAGS = -m32 -mtune=generic -ffreestanding -nostdlib -c -I src/kernel +CCFLAGS = -m32 -mtune=generic -ffreestanding -nostdlib -c -I src/headers LD = i686-elf-ld LD_FLAGS = -z max-page-size=0x1000 -T linker.ld AS = nasm diff --git a/src/headers/alloc.h b/src/headers/alloc.h new file mode 100644 index 0000000..82023d4 --- /dev/null +++ b/src/headers/alloc.h @@ -0,0 +1,28 @@ +#ifndef ALLOC_H +#define ALLOC_H + +#include +#include + +typedef enum MemoryState { + FREE = 0, + IN_USE = 1 +} MemoryState; + +typedef struct MemoryBlock { + struct MemoryBlock* last; + struct MemoryBlock* next; + MemoryState state; + uint32_t size; + Task* task; +} MemoryBlock; + +extern void initMemoryAllocation(uint32_t kernelEnd); +extern void* malloc(uint32_t size); +extern void* mallocTask(uint32_t size, Task* task); +extern void free(void* location); +extern void printMemoryStack(); +extern void freeTaskAllocations(Task* task); +extern Task* getCurrentTask(); + +#endif \ No newline at end of file diff --git a/src/headers/cursor.h b/src/headers/cursor.h new file mode 100644 index 0000000..30f91c1 --- /dev/null +++ b/src/headers/cursor.h @@ -0,0 +1,10 @@ +#ifndef CURSOR_H +#define CURSOR_H + +#include + +extern void setCursorOffset(uint16_t offset); +extern void setCursorPosition(uint8_t x, uint8_t y); +extern uint16_t getCursorOffset(); + +#endif \ No newline at end of file diff --git a/Makefile b/Makefile index e0b541a..0a31a7a 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ CC = i686-elf-gcc -CCFLAGS = -m32 -mtune=generic -ffreestanding -nostdlib -c -I src/kernel +CCFLAGS = -m32 -mtune=generic -ffreestanding -nostdlib -c -I src/headers LD = i686-elf-ld LD_FLAGS = -z max-page-size=0x1000 -T linker.ld AS = nasm diff --git a/src/headers/alloc.h b/src/headers/alloc.h new file mode 100644 index 0000000..82023d4 --- /dev/null +++ b/src/headers/alloc.h @@ -0,0 +1,28 @@ +#ifndef ALLOC_H +#define ALLOC_H + +#include +#include + +typedef enum MemoryState { + FREE = 0, + IN_USE = 1 +} MemoryState; + +typedef struct MemoryBlock { + struct MemoryBlock* last; + struct MemoryBlock* next; + MemoryState state; + uint32_t size; + Task* task; +} MemoryBlock; + +extern void initMemoryAllocation(uint32_t kernelEnd); +extern void* malloc(uint32_t size); +extern void* mallocTask(uint32_t size, Task* task); +extern void free(void* location); +extern void printMemoryStack(); +extern void freeTaskAllocations(Task* task); +extern Task* getCurrentTask(); + +#endif \ No newline at end of file diff --git a/src/headers/cursor.h b/src/headers/cursor.h new file mode 100644 index 0000000..30f91c1 --- /dev/null +++ b/src/headers/cursor.h @@ -0,0 +1,10 @@ +#ifndef CURSOR_H +#define CURSOR_H + +#include + +extern void setCursorOffset(uint16_t offset); +extern void setCursorPosition(uint8_t x, uint8_t y); +extern uint16_t getCursorOffset(); + +#endif \ No newline at end of file diff --git a/src/headers/message.h b/src/headers/message.h new file mode 100644 index 0000000..2f8ddbe --- /dev/null +++ b/src/headers/message.h @@ -0,0 +1,12 @@ +#ifndef MESSAGE_H +#define MESSAGE_H + +#include + +typedef struct Message { + void* data; + uint32_t size; + struct Message* next; +} Message; + +#endif \ No newline at end of file diff --git a/Makefile b/Makefile index e0b541a..0a31a7a 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ CC = i686-elf-gcc -CCFLAGS = -m32 -mtune=generic -ffreestanding -nostdlib -c -I src/kernel +CCFLAGS = -m32 -mtune=generic -ffreestanding -nostdlib -c -I src/headers LD = i686-elf-ld LD_FLAGS = -z max-page-size=0x1000 -T linker.ld AS = nasm diff --git a/src/headers/alloc.h b/src/headers/alloc.h new file mode 100644 index 0000000..82023d4 --- /dev/null +++ b/src/headers/alloc.h @@ -0,0 +1,28 @@ +#ifndef ALLOC_H +#define ALLOC_H + +#include +#include + +typedef enum MemoryState { + FREE = 0, + IN_USE = 1 +} MemoryState; + +typedef struct MemoryBlock { + struct MemoryBlock* last; + struct MemoryBlock* next; + MemoryState state; + uint32_t size; + Task* task; +} MemoryBlock; + +extern void initMemoryAllocation(uint32_t kernelEnd); +extern void* malloc(uint32_t size); +extern void* mallocTask(uint32_t size, Task* task); +extern void free(void* location); +extern void printMemoryStack(); +extern void freeTaskAllocations(Task* task); +extern Task* getCurrentTask(); + +#endif \ No newline at end of file diff --git a/src/headers/cursor.h b/src/headers/cursor.h new file mode 100644 index 0000000..30f91c1 --- /dev/null +++ b/src/headers/cursor.h @@ -0,0 +1,10 @@ +#ifndef CURSOR_H +#define CURSOR_H + +#include + +extern void setCursorOffset(uint16_t offset); +extern void setCursorPosition(uint8_t x, uint8_t y); +extern uint16_t getCursorOffset(); + +#endif \ No newline at end of file diff --git a/src/headers/message.h b/src/headers/message.h new file mode 100644 index 0000000..2f8ddbe --- /dev/null +++ b/src/headers/message.h @@ -0,0 +1,12 @@ +#ifndef MESSAGE_H +#define MESSAGE_H + +#include + +typedef struct Message { + void* data; + uint32_t size; + struct Message* next; +} Message; + +#endif \ No newline at end of file diff --git a/src/headers/osTasks.h b/src/headers/osTasks.h new file mode 100644 index 0000000..2865863 --- /dev/null +++ b/src/headers/osTasks.h @@ -0,0 +1,10 @@ +#ifndef OS_TASKS_H +#define OS_TASKS_H + +#include + +extern void initOSTasks(); + +extern Task* getPrinterTask(); + +#endif \ No newline at end of file diff --git a/Makefile b/Makefile index e0b541a..0a31a7a 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ CC = i686-elf-gcc -CCFLAGS = -m32 -mtune=generic -ffreestanding -nostdlib -c -I src/kernel +CCFLAGS = -m32 -mtune=generic -ffreestanding -nostdlib -c -I src/headers LD = i686-elf-ld LD_FLAGS = -z max-page-size=0x1000 -T linker.ld AS = nasm diff --git a/src/headers/alloc.h b/src/headers/alloc.h new file mode 100644 index 0000000..82023d4 --- /dev/null +++ b/src/headers/alloc.h @@ -0,0 +1,28 @@ +#ifndef ALLOC_H +#define ALLOC_H + +#include +#include + +typedef enum MemoryState { + FREE = 0, + IN_USE = 1 +} MemoryState; + +typedef struct MemoryBlock { + struct MemoryBlock* last; + struct MemoryBlock* next; + MemoryState state; + uint32_t size; + Task* task; +} MemoryBlock; + +extern void initMemoryAllocation(uint32_t kernelEnd); +extern void* malloc(uint32_t size); +extern void* mallocTask(uint32_t size, Task* task); +extern void free(void* location); +extern void printMemoryStack(); +extern void freeTaskAllocations(Task* task); +extern Task* getCurrentTask(); + +#endif \ No newline at end of file diff --git a/src/headers/cursor.h b/src/headers/cursor.h new file mode 100644 index 0000000..30f91c1 --- /dev/null +++ b/src/headers/cursor.h @@ -0,0 +1,10 @@ +#ifndef CURSOR_H +#define CURSOR_H + +#include + +extern void setCursorOffset(uint16_t offset); +extern void setCursorPosition(uint8_t x, uint8_t y); +extern uint16_t getCursorOffset(); + +#endif \ No newline at end of file diff --git a/src/headers/message.h b/src/headers/message.h new file mode 100644 index 0000000..2f8ddbe --- /dev/null +++ b/src/headers/message.h @@ -0,0 +1,12 @@ +#ifndef MESSAGE_H +#define MESSAGE_H + +#include + +typedef struct Message { + void* data; + uint32_t size; + struct Message* next; +} Message; + +#endif \ No newline at end of file diff --git a/src/headers/osTasks.h b/src/headers/osTasks.h new file mode 100644 index 0000000..2865863 --- /dev/null +++ b/src/headers/osTasks.h @@ -0,0 +1,10 @@ +#ifndef OS_TASKS_H +#define OS_TASKS_H + +#include + +extern void initOSTasks(); + +extern Task* getPrinterTask(); + +#endif \ No newline at end of file diff --git a/src/headers/ports.h b/src/headers/ports.h new file mode 100644 index 0000000..716fd0a --- /dev/null +++ b/src/headers/ports.h @@ -0,0 +1,9 @@ +#ifndef PORTS_H +#define PORTS_H + +#include + +extern void outb(uint16_t port, uint8_t val); +extern uint8_t inb(uint16_t port); + +#endif \ No newline at end of file diff --git a/Makefile b/Makefile index e0b541a..0a31a7a 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ CC = i686-elf-gcc -CCFLAGS = -m32 -mtune=generic -ffreestanding -nostdlib -c -I src/kernel +CCFLAGS = -m32 -mtune=generic -ffreestanding -nostdlib -c -I src/headers LD = i686-elf-ld LD_FLAGS = -z max-page-size=0x1000 -T linker.ld AS = nasm diff --git a/src/headers/alloc.h b/src/headers/alloc.h new file mode 100644 index 0000000..82023d4 --- /dev/null +++ b/src/headers/alloc.h @@ -0,0 +1,28 @@ +#ifndef ALLOC_H +#define ALLOC_H + +#include +#include + +typedef enum MemoryState { + FREE = 0, + IN_USE = 1 +} MemoryState; + +typedef struct MemoryBlock { + struct MemoryBlock* last; + struct MemoryBlock* next; + MemoryState state; + uint32_t size; + Task* task; +} MemoryBlock; + +extern void initMemoryAllocation(uint32_t kernelEnd); +extern void* malloc(uint32_t size); +extern void* mallocTask(uint32_t size, Task* task); +extern void free(void* location); +extern void printMemoryStack(); +extern void freeTaskAllocations(Task* task); +extern Task* getCurrentTask(); + +#endif \ No newline at end of file diff --git a/src/headers/cursor.h b/src/headers/cursor.h new file mode 100644 index 0000000..30f91c1 --- /dev/null +++ b/src/headers/cursor.h @@ -0,0 +1,10 @@ +#ifndef CURSOR_H +#define CURSOR_H + +#include + +extern void setCursorOffset(uint16_t offset); +extern void setCursorPosition(uint8_t x, uint8_t y); +extern uint16_t getCursorOffset(); + +#endif \ No newline at end of file diff --git a/src/headers/message.h b/src/headers/message.h new file mode 100644 index 0000000..2f8ddbe --- /dev/null +++ b/src/headers/message.h @@ -0,0 +1,12 @@ +#ifndef MESSAGE_H +#define MESSAGE_H + +#include + +typedef struct Message { + void* data; + uint32_t size; + struct Message* next; +} Message; + +#endif \ No newline at end of file diff --git a/src/headers/osTasks.h b/src/headers/osTasks.h new file mode 100644 index 0000000..2865863 --- /dev/null +++ b/src/headers/osTasks.h @@ -0,0 +1,10 @@ +#ifndef OS_TASKS_H +#define OS_TASKS_H + +#include + +extern void initOSTasks(); + +extern Task* getPrinterTask(); + +#endif \ No newline at end of file diff --git a/src/headers/ports.h b/src/headers/ports.h new file mode 100644 index 0000000..716fd0a --- /dev/null +++ b/src/headers/ports.h @@ -0,0 +1,9 @@ +#ifndef PORTS_H +#define PORTS_H + +#include + +extern void outb(uint16_t port, uint8_t val); +extern uint8_t inb(uint16_t port); + +#endif \ No newline at end of file diff --git a/src/headers/stdio.h b/src/headers/stdio.h new file mode 100644 index 0000000..b5d4f87 --- /dev/null +++ b/src/headers/stdio.h @@ -0,0 +1,20 @@ +#ifndef STDIO_H +#define STDIO_H + +#include + +#define FRAMEBUFFER_LOCATION 0x000B8000 +#define VIDEO_WIDTH 80 +#define VIDEO_HEIGHT 25 + +extern void setTextStyle(uint8_t style); +extern void clearScreen(); +extern void printf(const char* format, ...); +extern void putCharAt(char c, uint8_t x, uint8_t y); +extern void putCharsAt(char* string, uint8_t x, uint8_t y); +extern void puts(char* string); +extern void putChars(char* string, uint32_t length); + +extern uint32_t strlen(char* string); + +#endif \ No newline at end of file diff --git a/Makefile b/Makefile index e0b541a..0a31a7a 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ CC = i686-elf-gcc -CCFLAGS = -m32 -mtune=generic -ffreestanding -nostdlib -c -I src/kernel +CCFLAGS = -m32 -mtune=generic -ffreestanding -nostdlib -c -I src/headers LD = i686-elf-ld LD_FLAGS = -z max-page-size=0x1000 -T linker.ld AS = nasm diff --git a/src/headers/alloc.h b/src/headers/alloc.h new file mode 100644 index 0000000..82023d4 --- /dev/null +++ b/src/headers/alloc.h @@ -0,0 +1,28 @@ +#ifndef ALLOC_H +#define ALLOC_H + +#include +#include + +typedef enum MemoryState { + FREE = 0, + IN_USE = 1 +} MemoryState; + +typedef struct MemoryBlock { + struct MemoryBlock* last; + struct MemoryBlock* next; + MemoryState state; + uint32_t size; + Task* task; +} MemoryBlock; + +extern void initMemoryAllocation(uint32_t kernelEnd); +extern void* malloc(uint32_t size); +extern void* mallocTask(uint32_t size, Task* task); +extern void free(void* location); +extern void printMemoryStack(); +extern void freeTaskAllocations(Task* task); +extern Task* getCurrentTask(); + +#endif \ No newline at end of file diff --git a/src/headers/cursor.h b/src/headers/cursor.h new file mode 100644 index 0000000..30f91c1 --- /dev/null +++ b/src/headers/cursor.h @@ -0,0 +1,10 @@ +#ifndef CURSOR_H +#define CURSOR_H + +#include + +extern void setCursorOffset(uint16_t offset); +extern void setCursorPosition(uint8_t x, uint8_t y); +extern uint16_t getCursorOffset(); + +#endif \ No newline at end of file diff --git a/src/headers/message.h b/src/headers/message.h new file mode 100644 index 0000000..2f8ddbe --- /dev/null +++ b/src/headers/message.h @@ -0,0 +1,12 @@ +#ifndef MESSAGE_H +#define MESSAGE_H + +#include + +typedef struct Message { + void* data; + uint32_t size; + struct Message* next; +} Message; + +#endif \ No newline at end of file diff --git a/src/headers/osTasks.h b/src/headers/osTasks.h new file mode 100644 index 0000000..2865863 --- /dev/null +++ b/src/headers/osTasks.h @@ -0,0 +1,10 @@ +#ifndef OS_TASKS_H +#define OS_TASKS_H + +#include + +extern void initOSTasks(); + +extern Task* getPrinterTask(); + +#endif \ No newline at end of file diff --git a/src/headers/ports.h b/src/headers/ports.h new file mode 100644 index 0000000..716fd0a --- /dev/null +++ b/src/headers/ports.h @@ -0,0 +1,9 @@ +#ifndef PORTS_H +#define PORTS_H + +#include + +extern void outb(uint16_t port, uint8_t val); +extern uint8_t inb(uint16_t port); + +#endif \ No newline at end of file diff --git a/src/headers/stdio.h b/src/headers/stdio.h new file mode 100644 index 0000000..b5d4f87 --- /dev/null +++ b/src/headers/stdio.h @@ -0,0 +1,20 @@ +#ifndef STDIO_H +#define STDIO_H + +#include + +#define FRAMEBUFFER_LOCATION 0x000B8000 +#define VIDEO_WIDTH 80 +#define VIDEO_HEIGHT 25 + +extern void setTextStyle(uint8_t style); +extern void clearScreen(); +extern void printf(const char* format, ...); +extern void putCharAt(char c, uint8_t x, uint8_t y); +extern void putCharsAt(char* string, uint8_t x, uint8_t y); +extern void puts(char* string); +extern void putChars(char* string, uint32_t length); + +extern uint32_t strlen(char* string); + +#endif \ No newline at end of file diff --git a/src/headers/task.h b/src/headers/task.h new file mode 100644 index 0000000..0b8e1b4 --- /dev/null +++ b/src/headers/task.h @@ -0,0 +1,34 @@ +#ifndef TASK_H +#define TASK_H + +#include +#include + +extern void initTasking(); + +typedef struct __attribute__ ((packed)) { + uint32_t eax, ebx, ecx, edx, esi, edi, esp, ebp, eip, eflags, cr3; +} Registers; + +typedef struct Task { + Registers registers; // the register states for the task + struct Task *nextTask; // linked list of tasks that need to be done + void* stack; + Message* message; +} Task; + +extern void initTasking(); +extern void createTask(Task *task, uint32_t mainFunction, uint32_t flags, uint32_t *pagedir); + +extern void yield(); +extern void yields(); // yield, but schedule the currently running task +extern void switchTask(Registers *old, Registers *new); +extern void schedule(Task* task); // schedule a task to be run in the future +extern void destroyCurrentTask(); + +extern void setRunningTask(Task* task); // set the task currently executed +extern void sendMessage(Task* task, Message* message); + +extern Message* popMessage(Task* task); + +#endif \ No newline at end of file diff --git a/Makefile b/Makefile index e0b541a..0a31a7a 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ CC = i686-elf-gcc -CCFLAGS = -m32 -mtune=generic -ffreestanding -nostdlib -c -I src/kernel +CCFLAGS = -m32 -mtune=generic -ffreestanding -nostdlib -c -I src/headers LD = i686-elf-ld LD_FLAGS = -z max-page-size=0x1000 -T linker.ld AS = nasm diff --git a/src/headers/alloc.h b/src/headers/alloc.h new file mode 100644 index 0000000..82023d4 --- /dev/null +++ b/src/headers/alloc.h @@ -0,0 +1,28 @@ +#ifndef ALLOC_H +#define ALLOC_H + +#include +#include + +typedef enum MemoryState { + FREE = 0, + IN_USE = 1 +} MemoryState; + +typedef struct MemoryBlock { + struct MemoryBlock* last; + struct MemoryBlock* next; + MemoryState state; + uint32_t size; + Task* task; +} MemoryBlock; + +extern void initMemoryAllocation(uint32_t kernelEnd); +extern void* malloc(uint32_t size); +extern void* mallocTask(uint32_t size, Task* task); +extern void free(void* location); +extern void printMemoryStack(); +extern void freeTaskAllocations(Task* task); +extern Task* getCurrentTask(); + +#endif \ No newline at end of file diff --git a/src/headers/cursor.h b/src/headers/cursor.h new file mode 100644 index 0000000..30f91c1 --- /dev/null +++ b/src/headers/cursor.h @@ -0,0 +1,10 @@ +#ifndef CURSOR_H +#define CURSOR_H + +#include + +extern void setCursorOffset(uint16_t offset); +extern void setCursorPosition(uint8_t x, uint8_t y); +extern uint16_t getCursorOffset(); + +#endif \ No newline at end of file diff --git a/src/headers/message.h b/src/headers/message.h new file mode 100644 index 0000000..2f8ddbe --- /dev/null +++ b/src/headers/message.h @@ -0,0 +1,12 @@ +#ifndef MESSAGE_H +#define MESSAGE_H + +#include + +typedef struct Message { + void* data; + uint32_t size; + struct Message* next; +} Message; + +#endif \ No newline at end of file diff --git a/src/headers/osTasks.h b/src/headers/osTasks.h new file mode 100644 index 0000000..2865863 --- /dev/null +++ b/src/headers/osTasks.h @@ -0,0 +1,10 @@ +#ifndef OS_TASKS_H +#define OS_TASKS_H + +#include + +extern void initOSTasks(); + +extern Task* getPrinterTask(); + +#endif \ No newline at end of file diff --git a/src/headers/ports.h b/src/headers/ports.h new file mode 100644 index 0000000..716fd0a --- /dev/null +++ b/src/headers/ports.h @@ -0,0 +1,9 @@ +#ifndef PORTS_H +#define PORTS_H + +#include + +extern void outb(uint16_t port, uint8_t val); +extern uint8_t inb(uint16_t port); + +#endif \ No newline at end of file diff --git a/src/headers/stdio.h b/src/headers/stdio.h new file mode 100644 index 0000000..b5d4f87 --- /dev/null +++ b/src/headers/stdio.h @@ -0,0 +1,20 @@ +#ifndef STDIO_H +#define STDIO_H + +#include + +#define FRAMEBUFFER_LOCATION 0x000B8000 +#define VIDEO_WIDTH 80 +#define VIDEO_HEIGHT 25 + +extern void setTextStyle(uint8_t style); +extern void clearScreen(); +extern void printf(const char* format, ...); +extern void putCharAt(char c, uint8_t x, uint8_t y); +extern void putCharsAt(char* string, uint8_t x, uint8_t y); +extern void puts(char* string); +extern void putChars(char* string, uint32_t length); + +extern uint32_t strlen(char* string); + +#endif \ No newline at end of file diff --git a/src/headers/task.h b/src/headers/task.h new file mode 100644 index 0000000..0b8e1b4 --- /dev/null +++ b/src/headers/task.h @@ -0,0 +1,34 @@ +#ifndef TASK_H +#define TASK_H + +#include +#include + +extern void initTasking(); + +typedef struct __attribute__ ((packed)) { + uint32_t eax, ebx, ecx, edx, esi, edi, esp, ebp, eip, eflags, cr3; +} Registers; + +typedef struct Task { + Registers registers; // the register states for the task + struct Task *nextTask; // linked list of tasks that need to be done + void* stack; + Message* message; +} Task; + +extern void initTasking(); +extern void createTask(Task *task, uint32_t mainFunction, uint32_t flags, uint32_t *pagedir); + +extern void yield(); +extern void yields(); // yield, but schedule the currently running task +extern void switchTask(Registers *old, Registers *new); +extern void schedule(Task* task); // schedule a task to be run in the future +extern void destroyCurrentTask(); + +extern void setRunningTask(Task* task); // set the task currently executed +extern void sendMessage(Task* task, Message* message); + +extern Message* popMessage(Task* task); + +#endif \ No newline at end of file diff --git a/src/headers/tree-os.h b/src/headers/tree-os.h new file mode 100644 index 0000000..71476fe --- /dev/null +++ b/src/headers/tree-os.h @@ -0,0 +1,6 @@ +#ifndef TREE_OS_H +#define TREE_OS_H + +extern void drawLogo(); + +#endif \ No newline at end of file diff --git a/Makefile b/Makefile index e0b541a..0a31a7a 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ CC = i686-elf-gcc -CCFLAGS = -m32 -mtune=generic -ffreestanding -nostdlib -c -I src/kernel +CCFLAGS = -m32 -mtune=generic -ffreestanding -nostdlib -c -I src/headers LD = i686-elf-ld LD_FLAGS = -z max-page-size=0x1000 -T linker.ld AS = nasm diff --git a/src/headers/alloc.h b/src/headers/alloc.h new file mode 100644 index 0000000..82023d4 --- /dev/null +++ b/src/headers/alloc.h @@ -0,0 +1,28 @@ +#ifndef ALLOC_H +#define ALLOC_H + +#include +#include + +typedef enum MemoryState { + FREE = 0, + IN_USE = 1 +} MemoryState; + +typedef struct MemoryBlock { + struct MemoryBlock* last; + struct MemoryBlock* next; + MemoryState state; + uint32_t size; + Task* task; +} MemoryBlock; + +extern void initMemoryAllocation(uint32_t kernelEnd); +extern void* malloc(uint32_t size); +extern void* mallocTask(uint32_t size, Task* task); +extern void free(void* location); +extern void printMemoryStack(); +extern void freeTaskAllocations(Task* task); +extern Task* getCurrentTask(); + +#endif \ No newline at end of file diff --git a/src/headers/cursor.h b/src/headers/cursor.h new file mode 100644 index 0000000..30f91c1 --- /dev/null +++ b/src/headers/cursor.h @@ -0,0 +1,10 @@ +#ifndef CURSOR_H +#define CURSOR_H + +#include + +extern void setCursorOffset(uint16_t offset); +extern void setCursorPosition(uint8_t x, uint8_t y); +extern uint16_t getCursorOffset(); + +#endif \ No newline at end of file diff --git a/src/headers/message.h b/src/headers/message.h new file mode 100644 index 0000000..2f8ddbe --- /dev/null +++ b/src/headers/message.h @@ -0,0 +1,12 @@ +#ifndef MESSAGE_H +#define MESSAGE_H + +#include + +typedef struct Message { + void* data; + uint32_t size; + struct Message* next; +} Message; + +#endif \ No newline at end of file diff --git a/src/headers/osTasks.h b/src/headers/osTasks.h new file mode 100644 index 0000000..2865863 --- /dev/null +++ b/src/headers/osTasks.h @@ -0,0 +1,10 @@ +#ifndef OS_TASKS_H +#define OS_TASKS_H + +#include + +extern void initOSTasks(); + +extern Task* getPrinterTask(); + +#endif \ No newline at end of file diff --git a/src/headers/ports.h b/src/headers/ports.h new file mode 100644 index 0000000..716fd0a --- /dev/null +++ b/src/headers/ports.h @@ -0,0 +1,9 @@ +#ifndef PORTS_H +#define PORTS_H + +#include + +extern void outb(uint16_t port, uint8_t val); +extern uint8_t inb(uint16_t port); + +#endif \ No newline at end of file diff --git a/src/headers/stdio.h b/src/headers/stdio.h new file mode 100644 index 0000000..b5d4f87 --- /dev/null +++ b/src/headers/stdio.h @@ -0,0 +1,20 @@ +#ifndef STDIO_H +#define STDIO_H + +#include + +#define FRAMEBUFFER_LOCATION 0x000B8000 +#define VIDEO_WIDTH 80 +#define VIDEO_HEIGHT 25 + +extern void setTextStyle(uint8_t style); +extern void clearScreen(); +extern void printf(const char* format, ...); +extern void putCharAt(char c, uint8_t x, uint8_t y); +extern void putCharsAt(char* string, uint8_t x, uint8_t y); +extern void puts(char* string); +extern void putChars(char* string, uint32_t length); + +extern uint32_t strlen(char* string); + +#endif \ No newline at end of file diff --git a/src/headers/task.h b/src/headers/task.h new file mode 100644 index 0000000..0b8e1b4 --- /dev/null +++ b/src/headers/task.h @@ -0,0 +1,34 @@ +#ifndef TASK_H +#define TASK_H + +#include +#include + +extern void initTasking(); + +typedef struct __attribute__ ((packed)) { + uint32_t eax, ebx, ecx, edx, esi, edi, esp, ebp, eip, eflags, cr3; +} Registers; + +typedef struct Task { + Registers registers; // the register states for the task + struct Task *nextTask; // linked list of tasks that need to be done + void* stack; + Message* message; +} Task; + +extern void initTasking(); +extern void createTask(Task *task, uint32_t mainFunction, uint32_t flags, uint32_t *pagedir); + +extern void yield(); +extern void yields(); // yield, but schedule the currently running task +extern void switchTask(Registers *old, Registers *new); +extern void schedule(Task* task); // schedule a task to be run in the future +extern void destroyCurrentTask(); + +extern void setRunningTask(Task* task); // set the task currently executed +extern void sendMessage(Task* task, Message* message); + +extern Message* popMessage(Task* task); + +#endif \ No newline at end of file diff --git a/src/headers/tree-os.h b/src/headers/tree-os.h new file mode 100644 index 0000000..71476fe --- /dev/null +++ b/src/headers/tree-os.h @@ -0,0 +1,6 @@ +#ifndef TREE_OS_H +#define TREE_OS_H + +extern void drawLogo(); + +#endif \ No newline at end of file diff --git a/src/kernel/kernel.c b/src/kernel/kernel.c index cfdf333..d8ff7b8 100644 --- a/src/kernel/kernel.c +++ b/src/kernel/kernel.c @@ -1,10 +1,10 @@ #include -#include +#include #include -#include -#include -#include -#include +#include +#include +#include +#include extern uint32_t _kernel_end; diff --git a/Makefile b/Makefile index e0b541a..0a31a7a 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ CC = i686-elf-gcc -CCFLAGS = -m32 -mtune=generic -ffreestanding -nostdlib -c -I src/kernel +CCFLAGS = -m32 -mtune=generic -ffreestanding -nostdlib -c -I src/headers LD = i686-elf-ld LD_FLAGS = -z max-page-size=0x1000 -T linker.ld AS = nasm diff --git a/src/headers/alloc.h b/src/headers/alloc.h new file mode 100644 index 0000000..82023d4 --- /dev/null +++ b/src/headers/alloc.h @@ -0,0 +1,28 @@ +#ifndef ALLOC_H +#define ALLOC_H + +#include +#include + +typedef enum MemoryState { + FREE = 0, + IN_USE = 1 +} MemoryState; + +typedef struct MemoryBlock { + struct MemoryBlock* last; + struct MemoryBlock* next; + MemoryState state; + uint32_t size; + Task* task; +} MemoryBlock; + +extern void initMemoryAllocation(uint32_t kernelEnd); +extern void* malloc(uint32_t size); +extern void* mallocTask(uint32_t size, Task* task); +extern void free(void* location); +extern void printMemoryStack(); +extern void freeTaskAllocations(Task* task); +extern Task* getCurrentTask(); + +#endif \ No newline at end of file diff --git a/src/headers/cursor.h b/src/headers/cursor.h new file mode 100644 index 0000000..30f91c1 --- /dev/null +++ b/src/headers/cursor.h @@ -0,0 +1,10 @@ +#ifndef CURSOR_H +#define CURSOR_H + +#include + +extern void setCursorOffset(uint16_t offset); +extern void setCursorPosition(uint8_t x, uint8_t y); +extern uint16_t getCursorOffset(); + +#endif \ No newline at end of file diff --git a/src/headers/message.h b/src/headers/message.h new file mode 100644 index 0000000..2f8ddbe --- /dev/null +++ b/src/headers/message.h @@ -0,0 +1,12 @@ +#ifndef MESSAGE_H +#define MESSAGE_H + +#include + +typedef struct Message { + void* data; + uint32_t size; + struct Message* next; +} Message; + +#endif \ No newline at end of file diff --git a/src/headers/osTasks.h b/src/headers/osTasks.h new file mode 100644 index 0000000..2865863 --- /dev/null +++ b/src/headers/osTasks.h @@ -0,0 +1,10 @@ +#ifndef OS_TASKS_H +#define OS_TASKS_H + +#include + +extern void initOSTasks(); + +extern Task* getPrinterTask(); + +#endif \ No newline at end of file diff --git a/src/headers/ports.h b/src/headers/ports.h new file mode 100644 index 0000000..716fd0a --- /dev/null +++ b/src/headers/ports.h @@ -0,0 +1,9 @@ +#ifndef PORTS_H +#define PORTS_H + +#include + +extern void outb(uint16_t port, uint8_t val); +extern uint8_t inb(uint16_t port); + +#endif \ No newline at end of file diff --git a/src/headers/stdio.h b/src/headers/stdio.h new file mode 100644 index 0000000..b5d4f87 --- /dev/null +++ b/src/headers/stdio.h @@ -0,0 +1,20 @@ +#ifndef STDIO_H +#define STDIO_H + +#include + +#define FRAMEBUFFER_LOCATION 0x000B8000 +#define VIDEO_WIDTH 80 +#define VIDEO_HEIGHT 25 + +extern void setTextStyle(uint8_t style); +extern void clearScreen(); +extern void printf(const char* format, ...); +extern void putCharAt(char c, uint8_t x, uint8_t y); +extern void putCharsAt(char* string, uint8_t x, uint8_t y); +extern void puts(char* string); +extern void putChars(char* string, uint32_t length); + +extern uint32_t strlen(char* string); + +#endif \ No newline at end of file diff --git a/src/headers/task.h b/src/headers/task.h new file mode 100644 index 0000000..0b8e1b4 --- /dev/null +++ b/src/headers/task.h @@ -0,0 +1,34 @@ +#ifndef TASK_H +#define TASK_H + +#include +#include + +extern void initTasking(); + +typedef struct __attribute__ ((packed)) { + uint32_t eax, ebx, ecx, edx, esi, edi, esp, ebp, eip, eflags, cr3; +} Registers; + +typedef struct Task { + Registers registers; // the register states for the task + struct Task *nextTask; // linked list of tasks that need to be done + void* stack; + Message* message; +} Task; + +extern void initTasking(); +extern void createTask(Task *task, uint32_t mainFunction, uint32_t flags, uint32_t *pagedir); + +extern void yield(); +extern void yields(); // yield, but schedule the currently running task +extern void switchTask(Registers *old, Registers *new); +extern void schedule(Task* task); // schedule a task to be run in the future +extern void destroyCurrentTask(); + +extern void setRunningTask(Task* task); // set the task currently executed +extern void sendMessage(Task* task, Message* message); + +extern Message* popMessage(Task* task); + +#endif \ No newline at end of file diff --git a/src/headers/tree-os.h b/src/headers/tree-os.h new file mode 100644 index 0000000..71476fe --- /dev/null +++ b/src/headers/tree-os.h @@ -0,0 +1,6 @@ +#ifndef TREE_OS_H +#define TREE_OS_H + +extern void drawLogo(); + +#endif \ No newline at end of file diff --git a/src/kernel/kernel.c b/src/kernel/kernel.c index cfdf333..d8ff7b8 100644 --- a/src/kernel/kernel.c +++ b/src/kernel/kernel.c @@ -1,10 +1,10 @@ #include -#include +#include #include -#include -#include -#include -#include +#include +#include +#include +#include extern uint32_t _kernel_end; diff --git a/src/kernel/lib/memory/alloc.h b/src/kernel/lib/memory/alloc.h deleted file mode 100644 index 42910ce..0000000 --- a/src/kernel/lib/memory/alloc.h +++ /dev/null @@ -1,28 +0,0 @@ -#ifndef ALLOC_H -#define ALLOC_H - -#include -#include - -typedef enum MemoryState { - FREE = 0, - IN_USE = 1 -} MemoryState; - -typedef struct MemoryBlock { - struct MemoryBlock* last; - struct MemoryBlock* next; - MemoryState state; - uint32_t size; - Task* task; -} MemoryBlock; - -extern void initMemoryAllocation(uint32_t kernelEnd); -extern void* malloc(uint32_t size); -extern void* mallocTask(uint32_t size, Task* task); -extern void free(void* location); -extern void printMemoryStack(); -extern void freeTaskAllocations(Task* task); -extern Task* getCurrentTask(); - -#endif \ No newline at end of file diff --git a/Makefile b/Makefile index e0b541a..0a31a7a 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ CC = i686-elf-gcc -CCFLAGS = -m32 -mtune=generic -ffreestanding -nostdlib -c -I src/kernel +CCFLAGS = -m32 -mtune=generic -ffreestanding -nostdlib -c -I src/headers LD = i686-elf-ld LD_FLAGS = -z max-page-size=0x1000 -T linker.ld AS = nasm diff --git a/src/headers/alloc.h b/src/headers/alloc.h new file mode 100644 index 0000000..82023d4 --- /dev/null +++ b/src/headers/alloc.h @@ -0,0 +1,28 @@ +#ifndef ALLOC_H +#define ALLOC_H + +#include +#include + +typedef enum MemoryState { + FREE = 0, + IN_USE = 1 +} MemoryState; + +typedef struct MemoryBlock { + struct MemoryBlock* last; + struct MemoryBlock* next; + MemoryState state; + uint32_t size; + Task* task; +} MemoryBlock; + +extern void initMemoryAllocation(uint32_t kernelEnd); +extern void* malloc(uint32_t size); +extern void* mallocTask(uint32_t size, Task* task); +extern void free(void* location); +extern void printMemoryStack(); +extern void freeTaskAllocations(Task* task); +extern Task* getCurrentTask(); + +#endif \ No newline at end of file diff --git a/src/headers/cursor.h b/src/headers/cursor.h new file mode 100644 index 0000000..30f91c1 --- /dev/null +++ b/src/headers/cursor.h @@ -0,0 +1,10 @@ +#ifndef CURSOR_H +#define CURSOR_H + +#include + +extern void setCursorOffset(uint16_t offset); +extern void setCursorPosition(uint8_t x, uint8_t y); +extern uint16_t getCursorOffset(); + +#endif \ No newline at end of file diff --git a/src/headers/message.h b/src/headers/message.h new file mode 100644 index 0000000..2f8ddbe --- /dev/null +++ b/src/headers/message.h @@ -0,0 +1,12 @@ +#ifndef MESSAGE_H +#define MESSAGE_H + +#include + +typedef struct Message { + void* data; + uint32_t size; + struct Message* next; +} Message; + +#endif \ No newline at end of file diff --git a/src/headers/osTasks.h b/src/headers/osTasks.h new file mode 100644 index 0000000..2865863 --- /dev/null +++ b/src/headers/osTasks.h @@ -0,0 +1,10 @@ +#ifndef OS_TASKS_H +#define OS_TASKS_H + +#include + +extern void initOSTasks(); + +extern Task* getPrinterTask(); + +#endif \ No newline at end of file diff --git a/src/headers/ports.h b/src/headers/ports.h new file mode 100644 index 0000000..716fd0a --- /dev/null +++ b/src/headers/ports.h @@ -0,0 +1,9 @@ +#ifndef PORTS_H +#define PORTS_H + +#include + +extern void outb(uint16_t port, uint8_t val); +extern uint8_t inb(uint16_t port); + +#endif \ No newline at end of file diff --git a/src/headers/stdio.h b/src/headers/stdio.h new file mode 100644 index 0000000..b5d4f87 --- /dev/null +++ b/src/headers/stdio.h @@ -0,0 +1,20 @@ +#ifndef STDIO_H +#define STDIO_H + +#include + +#define FRAMEBUFFER_LOCATION 0x000B8000 +#define VIDEO_WIDTH 80 +#define VIDEO_HEIGHT 25 + +extern void setTextStyle(uint8_t style); +extern void clearScreen(); +extern void printf(const char* format, ...); +extern void putCharAt(char c, uint8_t x, uint8_t y); +extern void putCharsAt(char* string, uint8_t x, uint8_t y); +extern void puts(char* string); +extern void putChars(char* string, uint32_t length); + +extern uint32_t strlen(char* string); + +#endif \ No newline at end of file diff --git a/src/headers/task.h b/src/headers/task.h new file mode 100644 index 0000000..0b8e1b4 --- /dev/null +++ b/src/headers/task.h @@ -0,0 +1,34 @@ +#ifndef TASK_H +#define TASK_H + +#include +#include + +extern void initTasking(); + +typedef struct __attribute__ ((packed)) { + uint32_t eax, ebx, ecx, edx, esi, edi, esp, ebp, eip, eflags, cr3; +} Registers; + +typedef struct Task { + Registers registers; // the register states for the task + struct Task *nextTask; // linked list of tasks that need to be done + void* stack; + Message* message; +} Task; + +extern void initTasking(); +extern void createTask(Task *task, uint32_t mainFunction, uint32_t flags, uint32_t *pagedir); + +extern void yield(); +extern void yields(); // yield, but schedule the currently running task +extern void switchTask(Registers *old, Registers *new); +extern void schedule(Task* task); // schedule a task to be run in the future +extern void destroyCurrentTask(); + +extern void setRunningTask(Task* task); // set the task currently executed +extern void sendMessage(Task* task, Message* message); + +extern Message* popMessage(Task* task); + +#endif \ No newline at end of file diff --git a/src/headers/tree-os.h b/src/headers/tree-os.h new file mode 100644 index 0000000..71476fe --- /dev/null +++ b/src/headers/tree-os.h @@ -0,0 +1,6 @@ +#ifndef TREE_OS_H +#define TREE_OS_H + +extern void drawLogo(); + +#endif \ No newline at end of file diff --git a/src/kernel/kernel.c b/src/kernel/kernel.c index cfdf333..d8ff7b8 100644 --- a/src/kernel/kernel.c +++ b/src/kernel/kernel.c @@ -1,10 +1,10 @@ #include -#include +#include #include -#include -#include -#include -#include +#include +#include +#include +#include extern uint32_t _kernel_end; diff --git a/src/kernel/lib/memory/alloc.h b/src/kernel/lib/memory/alloc.h deleted file mode 100644 index 42910ce..0000000 --- a/src/kernel/lib/memory/alloc.h +++ /dev/null @@ -1,28 +0,0 @@ -#ifndef ALLOC_H -#define ALLOC_H - -#include -#include - -typedef enum MemoryState { - FREE = 0, - IN_USE = 1 -} MemoryState; - -typedef struct MemoryBlock { - struct MemoryBlock* last; - struct MemoryBlock* next; - MemoryState state; - uint32_t size; - Task* task; -} MemoryBlock; - -extern void initMemoryAllocation(uint32_t kernelEnd); -extern void* malloc(uint32_t size); -extern void* mallocTask(uint32_t size, Task* task); -extern void free(void* location); -extern void printMemoryStack(); -extern void freeTaskAllocations(Task* task); -extern Task* getCurrentTask(); - -#endif \ No newline at end of file diff --git a/src/kernel/lib/ports.c b/src/kernel/lib/ports.c index b2a8fab..6cfbb2a 100644 --- a/src/kernel/lib/ports.c +++ b/src/kernel/lib/ports.c @@ -1,4 +1,4 @@ -#include +#include #include void outb(uint16_t port, uint8_t val) { diff --git a/Makefile b/Makefile index e0b541a..0a31a7a 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ CC = i686-elf-gcc -CCFLAGS = -m32 -mtune=generic -ffreestanding -nostdlib -c -I src/kernel +CCFLAGS = -m32 -mtune=generic -ffreestanding -nostdlib -c -I src/headers LD = i686-elf-ld LD_FLAGS = -z max-page-size=0x1000 -T linker.ld AS = nasm diff --git a/src/headers/alloc.h b/src/headers/alloc.h new file mode 100644 index 0000000..82023d4 --- /dev/null +++ b/src/headers/alloc.h @@ -0,0 +1,28 @@ +#ifndef ALLOC_H +#define ALLOC_H + +#include +#include + +typedef enum MemoryState { + FREE = 0, + IN_USE = 1 +} MemoryState; + +typedef struct MemoryBlock { + struct MemoryBlock* last; + struct MemoryBlock* next; + MemoryState state; + uint32_t size; + Task* task; +} MemoryBlock; + +extern void initMemoryAllocation(uint32_t kernelEnd); +extern void* malloc(uint32_t size); +extern void* mallocTask(uint32_t size, Task* task); +extern void free(void* location); +extern void printMemoryStack(); +extern void freeTaskAllocations(Task* task); +extern Task* getCurrentTask(); + +#endif \ No newline at end of file diff --git a/src/headers/cursor.h b/src/headers/cursor.h new file mode 100644 index 0000000..30f91c1 --- /dev/null +++ b/src/headers/cursor.h @@ -0,0 +1,10 @@ +#ifndef CURSOR_H +#define CURSOR_H + +#include + +extern void setCursorOffset(uint16_t offset); +extern void setCursorPosition(uint8_t x, uint8_t y); +extern uint16_t getCursorOffset(); + +#endif \ No newline at end of file diff --git a/src/headers/message.h b/src/headers/message.h new file mode 100644 index 0000000..2f8ddbe --- /dev/null +++ b/src/headers/message.h @@ -0,0 +1,12 @@ +#ifndef MESSAGE_H +#define MESSAGE_H + +#include + +typedef struct Message { + void* data; + uint32_t size; + struct Message* next; +} Message; + +#endif \ No newline at end of file diff --git a/src/headers/osTasks.h b/src/headers/osTasks.h new file mode 100644 index 0000000..2865863 --- /dev/null +++ b/src/headers/osTasks.h @@ -0,0 +1,10 @@ +#ifndef OS_TASKS_H +#define OS_TASKS_H + +#include + +extern void initOSTasks(); + +extern Task* getPrinterTask(); + +#endif \ No newline at end of file diff --git a/src/headers/ports.h b/src/headers/ports.h new file mode 100644 index 0000000..716fd0a --- /dev/null +++ b/src/headers/ports.h @@ -0,0 +1,9 @@ +#ifndef PORTS_H +#define PORTS_H + +#include + +extern void outb(uint16_t port, uint8_t val); +extern uint8_t inb(uint16_t port); + +#endif \ No newline at end of file diff --git a/src/headers/stdio.h b/src/headers/stdio.h new file mode 100644 index 0000000..b5d4f87 --- /dev/null +++ b/src/headers/stdio.h @@ -0,0 +1,20 @@ +#ifndef STDIO_H +#define STDIO_H + +#include + +#define FRAMEBUFFER_LOCATION 0x000B8000 +#define VIDEO_WIDTH 80 +#define VIDEO_HEIGHT 25 + +extern void setTextStyle(uint8_t style); +extern void clearScreen(); +extern void printf(const char* format, ...); +extern void putCharAt(char c, uint8_t x, uint8_t y); +extern void putCharsAt(char* string, uint8_t x, uint8_t y); +extern void puts(char* string); +extern void putChars(char* string, uint32_t length); + +extern uint32_t strlen(char* string); + +#endif \ No newline at end of file diff --git a/src/headers/task.h b/src/headers/task.h new file mode 100644 index 0000000..0b8e1b4 --- /dev/null +++ b/src/headers/task.h @@ -0,0 +1,34 @@ +#ifndef TASK_H +#define TASK_H + +#include +#include + +extern void initTasking(); + +typedef struct __attribute__ ((packed)) { + uint32_t eax, ebx, ecx, edx, esi, edi, esp, ebp, eip, eflags, cr3; +} Registers; + +typedef struct Task { + Registers registers; // the register states for the task + struct Task *nextTask; // linked list of tasks that need to be done + void* stack; + Message* message; +} Task; + +extern void initTasking(); +extern void createTask(Task *task, uint32_t mainFunction, uint32_t flags, uint32_t *pagedir); + +extern void yield(); +extern void yields(); // yield, but schedule the currently running task +extern void switchTask(Registers *old, Registers *new); +extern void schedule(Task* task); // schedule a task to be run in the future +extern void destroyCurrentTask(); + +extern void setRunningTask(Task* task); // set the task currently executed +extern void sendMessage(Task* task, Message* message); + +extern Message* popMessage(Task* task); + +#endif \ No newline at end of file diff --git a/src/headers/tree-os.h b/src/headers/tree-os.h new file mode 100644 index 0000000..71476fe --- /dev/null +++ b/src/headers/tree-os.h @@ -0,0 +1,6 @@ +#ifndef TREE_OS_H +#define TREE_OS_H + +extern void drawLogo(); + +#endif \ No newline at end of file diff --git a/src/kernel/kernel.c b/src/kernel/kernel.c index cfdf333..d8ff7b8 100644 --- a/src/kernel/kernel.c +++ b/src/kernel/kernel.c @@ -1,10 +1,10 @@ #include -#include +#include #include -#include -#include -#include -#include +#include +#include +#include +#include extern uint32_t _kernel_end; diff --git a/src/kernel/lib/memory/alloc.h b/src/kernel/lib/memory/alloc.h deleted file mode 100644 index 42910ce..0000000 --- a/src/kernel/lib/memory/alloc.h +++ /dev/null @@ -1,28 +0,0 @@ -#ifndef ALLOC_H -#define ALLOC_H - -#include -#include - -typedef enum MemoryState { - FREE = 0, - IN_USE = 1 -} MemoryState; - -typedef struct MemoryBlock { - struct MemoryBlock* last; - struct MemoryBlock* next; - MemoryState state; - uint32_t size; - Task* task; -} MemoryBlock; - -extern void initMemoryAllocation(uint32_t kernelEnd); -extern void* malloc(uint32_t size); -extern void* mallocTask(uint32_t size, Task* task); -extern void free(void* location); -extern void printMemoryStack(); -extern void freeTaskAllocations(Task* task); -extern Task* getCurrentTask(); - -#endif \ No newline at end of file diff --git a/src/kernel/lib/ports.c b/src/kernel/lib/ports.c index b2a8fab..6cfbb2a 100644 --- a/src/kernel/lib/ports.c +++ b/src/kernel/lib/ports.c @@ -1,4 +1,4 @@ -#include +#include #include void outb(uint16_t port, uint8_t val) { diff --git a/src/kernel/lib/ports.h b/src/kernel/lib/ports.h deleted file mode 100644 index 716fd0a..0000000 --- a/src/kernel/lib/ports.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef PORTS_H -#define PORTS_H - -#include - -extern void outb(uint16_t port, uint8_t val); -extern uint8_t inb(uint16_t port); - -#endif \ No newline at end of file diff --git a/Makefile b/Makefile index e0b541a..0a31a7a 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ CC = i686-elf-gcc -CCFLAGS = -m32 -mtune=generic -ffreestanding -nostdlib -c -I src/kernel +CCFLAGS = -m32 -mtune=generic -ffreestanding -nostdlib -c -I src/headers LD = i686-elf-ld LD_FLAGS = -z max-page-size=0x1000 -T linker.ld AS = nasm diff --git a/src/headers/alloc.h b/src/headers/alloc.h new file mode 100644 index 0000000..82023d4 --- /dev/null +++ b/src/headers/alloc.h @@ -0,0 +1,28 @@ +#ifndef ALLOC_H +#define ALLOC_H + +#include +#include + +typedef enum MemoryState { + FREE = 0, + IN_USE = 1 +} MemoryState; + +typedef struct MemoryBlock { + struct MemoryBlock* last; + struct MemoryBlock* next; + MemoryState state; + uint32_t size; + Task* task; +} MemoryBlock; + +extern void initMemoryAllocation(uint32_t kernelEnd); +extern void* malloc(uint32_t size); +extern void* mallocTask(uint32_t size, Task* task); +extern void free(void* location); +extern void printMemoryStack(); +extern void freeTaskAllocations(Task* task); +extern Task* getCurrentTask(); + +#endif \ No newline at end of file diff --git a/src/headers/cursor.h b/src/headers/cursor.h new file mode 100644 index 0000000..30f91c1 --- /dev/null +++ b/src/headers/cursor.h @@ -0,0 +1,10 @@ +#ifndef CURSOR_H +#define CURSOR_H + +#include + +extern void setCursorOffset(uint16_t offset); +extern void setCursorPosition(uint8_t x, uint8_t y); +extern uint16_t getCursorOffset(); + +#endif \ No newline at end of file diff --git a/src/headers/message.h b/src/headers/message.h new file mode 100644 index 0000000..2f8ddbe --- /dev/null +++ b/src/headers/message.h @@ -0,0 +1,12 @@ +#ifndef MESSAGE_H +#define MESSAGE_H + +#include + +typedef struct Message { + void* data; + uint32_t size; + struct Message* next; +} Message; + +#endif \ No newline at end of file diff --git a/src/headers/osTasks.h b/src/headers/osTasks.h new file mode 100644 index 0000000..2865863 --- /dev/null +++ b/src/headers/osTasks.h @@ -0,0 +1,10 @@ +#ifndef OS_TASKS_H +#define OS_TASKS_H + +#include + +extern void initOSTasks(); + +extern Task* getPrinterTask(); + +#endif \ No newline at end of file diff --git a/src/headers/ports.h b/src/headers/ports.h new file mode 100644 index 0000000..716fd0a --- /dev/null +++ b/src/headers/ports.h @@ -0,0 +1,9 @@ +#ifndef PORTS_H +#define PORTS_H + +#include + +extern void outb(uint16_t port, uint8_t val); +extern uint8_t inb(uint16_t port); + +#endif \ No newline at end of file diff --git a/src/headers/stdio.h b/src/headers/stdio.h new file mode 100644 index 0000000..b5d4f87 --- /dev/null +++ b/src/headers/stdio.h @@ -0,0 +1,20 @@ +#ifndef STDIO_H +#define STDIO_H + +#include + +#define FRAMEBUFFER_LOCATION 0x000B8000 +#define VIDEO_WIDTH 80 +#define VIDEO_HEIGHT 25 + +extern void setTextStyle(uint8_t style); +extern void clearScreen(); +extern void printf(const char* format, ...); +extern void putCharAt(char c, uint8_t x, uint8_t y); +extern void putCharsAt(char* string, uint8_t x, uint8_t y); +extern void puts(char* string); +extern void putChars(char* string, uint32_t length); + +extern uint32_t strlen(char* string); + +#endif \ No newline at end of file diff --git a/src/headers/task.h b/src/headers/task.h new file mode 100644 index 0000000..0b8e1b4 --- /dev/null +++ b/src/headers/task.h @@ -0,0 +1,34 @@ +#ifndef TASK_H +#define TASK_H + +#include +#include + +extern void initTasking(); + +typedef struct __attribute__ ((packed)) { + uint32_t eax, ebx, ecx, edx, esi, edi, esp, ebp, eip, eflags, cr3; +} Registers; + +typedef struct Task { + Registers registers; // the register states for the task + struct Task *nextTask; // linked list of tasks that need to be done + void* stack; + Message* message; +} Task; + +extern void initTasking(); +extern void createTask(Task *task, uint32_t mainFunction, uint32_t flags, uint32_t *pagedir); + +extern void yield(); +extern void yields(); // yield, but schedule the currently running task +extern void switchTask(Registers *old, Registers *new); +extern void schedule(Task* task); // schedule a task to be run in the future +extern void destroyCurrentTask(); + +extern void setRunningTask(Task* task); // set the task currently executed +extern void sendMessage(Task* task, Message* message); + +extern Message* popMessage(Task* task); + +#endif \ No newline at end of file diff --git a/src/headers/tree-os.h b/src/headers/tree-os.h new file mode 100644 index 0000000..71476fe --- /dev/null +++ b/src/headers/tree-os.h @@ -0,0 +1,6 @@ +#ifndef TREE_OS_H +#define TREE_OS_H + +extern void drawLogo(); + +#endif \ No newline at end of file diff --git a/src/kernel/kernel.c b/src/kernel/kernel.c index cfdf333..d8ff7b8 100644 --- a/src/kernel/kernel.c +++ b/src/kernel/kernel.c @@ -1,10 +1,10 @@ #include -#include +#include #include -#include -#include -#include -#include +#include +#include +#include +#include extern uint32_t _kernel_end; diff --git a/src/kernel/lib/memory/alloc.h b/src/kernel/lib/memory/alloc.h deleted file mode 100644 index 42910ce..0000000 --- a/src/kernel/lib/memory/alloc.h +++ /dev/null @@ -1,28 +0,0 @@ -#ifndef ALLOC_H -#define ALLOC_H - -#include -#include - -typedef enum MemoryState { - FREE = 0, - IN_USE = 1 -} MemoryState; - -typedef struct MemoryBlock { - struct MemoryBlock* last; - struct MemoryBlock* next; - MemoryState state; - uint32_t size; - Task* task; -} MemoryBlock; - -extern void initMemoryAllocation(uint32_t kernelEnd); -extern void* malloc(uint32_t size); -extern void* mallocTask(uint32_t size, Task* task); -extern void free(void* location); -extern void printMemoryStack(); -extern void freeTaskAllocations(Task* task); -extern Task* getCurrentTask(); - -#endif \ No newline at end of file diff --git a/src/kernel/lib/ports.c b/src/kernel/lib/ports.c index b2a8fab..6cfbb2a 100644 --- a/src/kernel/lib/ports.c +++ b/src/kernel/lib/ports.c @@ -1,4 +1,4 @@ -#include +#include #include void outb(uint16_t port, uint8_t val) { diff --git a/src/kernel/lib/ports.h b/src/kernel/lib/ports.h deleted file mode 100644 index 716fd0a..0000000 --- a/src/kernel/lib/ports.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef PORTS_H -#define PORTS_H - -#include - -extern void outb(uint16_t port, uint8_t val); -extern uint8_t inb(uint16_t port); - -#endif \ No newline at end of file diff --git a/src/kernel/lib/task/message.h b/src/kernel/lib/task/message.h deleted file mode 100644 index 2f8ddbe..0000000 --- a/src/kernel/lib/task/message.h +++ /dev/null @@ -1,12 +0,0 @@ -#ifndef MESSAGE_H -#define MESSAGE_H - -#include - -typedef struct Message { - void* data; - uint32_t size; - struct Message* next; -} Message; - -#endif \ No newline at end of file diff --git a/Makefile b/Makefile index e0b541a..0a31a7a 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ CC = i686-elf-gcc -CCFLAGS = -m32 -mtune=generic -ffreestanding -nostdlib -c -I src/kernel +CCFLAGS = -m32 -mtune=generic -ffreestanding -nostdlib -c -I src/headers LD = i686-elf-ld LD_FLAGS = -z max-page-size=0x1000 -T linker.ld AS = nasm diff --git a/src/headers/alloc.h b/src/headers/alloc.h new file mode 100644 index 0000000..82023d4 --- /dev/null +++ b/src/headers/alloc.h @@ -0,0 +1,28 @@ +#ifndef ALLOC_H +#define ALLOC_H + +#include +#include + +typedef enum MemoryState { + FREE = 0, + IN_USE = 1 +} MemoryState; + +typedef struct MemoryBlock { + struct MemoryBlock* last; + struct MemoryBlock* next; + MemoryState state; + uint32_t size; + Task* task; +} MemoryBlock; + +extern void initMemoryAllocation(uint32_t kernelEnd); +extern void* malloc(uint32_t size); +extern void* mallocTask(uint32_t size, Task* task); +extern void free(void* location); +extern void printMemoryStack(); +extern void freeTaskAllocations(Task* task); +extern Task* getCurrentTask(); + +#endif \ No newline at end of file diff --git a/src/headers/cursor.h b/src/headers/cursor.h new file mode 100644 index 0000000..30f91c1 --- /dev/null +++ b/src/headers/cursor.h @@ -0,0 +1,10 @@ +#ifndef CURSOR_H +#define CURSOR_H + +#include + +extern void setCursorOffset(uint16_t offset); +extern void setCursorPosition(uint8_t x, uint8_t y); +extern uint16_t getCursorOffset(); + +#endif \ No newline at end of file diff --git a/src/headers/message.h b/src/headers/message.h new file mode 100644 index 0000000..2f8ddbe --- /dev/null +++ b/src/headers/message.h @@ -0,0 +1,12 @@ +#ifndef MESSAGE_H +#define MESSAGE_H + +#include + +typedef struct Message { + void* data; + uint32_t size; + struct Message* next; +} Message; + +#endif \ No newline at end of file diff --git a/src/headers/osTasks.h b/src/headers/osTasks.h new file mode 100644 index 0000000..2865863 --- /dev/null +++ b/src/headers/osTasks.h @@ -0,0 +1,10 @@ +#ifndef OS_TASKS_H +#define OS_TASKS_H + +#include + +extern void initOSTasks(); + +extern Task* getPrinterTask(); + +#endif \ No newline at end of file diff --git a/src/headers/ports.h b/src/headers/ports.h new file mode 100644 index 0000000..716fd0a --- /dev/null +++ b/src/headers/ports.h @@ -0,0 +1,9 @@ +#ifndef PORTS_H +#define PORTS_H + +#include + +extern void outb(uint16_t port, uint8_t val); +extern uint8_t inb(uint16_t port); + +#endif \ No newline at end of file diff --git a/src/headers/stdio.h b/src/headers/stdio.h new file mode 100644 index 0000000..b5d4f87 --- /dev/null +++ b/src/headers/stdio.h @@ -0,0 +1,20 @@ +#ifndef STDIO_H +#define STDIO_H + +#include + +#define FRAMEBUFFER_LOCATION 0x000B8000 +#define VIDEO_WIDTH 80 +#define VIDEO_HEIGHT 25 + +extern void setTextStyle(uint8_t style); +extern void clearScreen(); +extern void printf(const char* format, ...); +extern void putCharAt(char c, uint8_t x, uint8_t y); +extern void putCharsAt(char* string, uint8_t x, uint8_t y); +extern void puts(char* string); +extern void putChars(char* string, uint32_t length); + +extern uint32_t strlen(char* string); + +#endif \ No newline at end of file diff --git a/src/headers/task.h b/src/headers/task.h new file mode 100644 index 0000000..0b8e1b4 --- /dev/null +++ b/src/headers/task.h @@ -0,0 +1,34 @@ +#ifndef TASK_H +#define TASK_H + +#include +#include + +extern void initTasking(); + +typedef struct __attribute__ ((packed)) { + uint32_t eax, ebx, ecx, edx, esi, edi, esp, ebp, eip, eflags, cr3; +} Registers; + +typedef struct Task { + Registers registers; // the register states for the task + struct Task *nextTask; // linked list of tasks that need to be done + void* stack; + Message* message; +} Task; + +extern void initTasking(); +extern void createTask(Task *task, uint32_t mainFunction, uint32_t flags, uint32_t *pagedir); + +extern void yield(); +extern void yields(); // yield, but schedule the currently running task +extern void switchTask(Registers *old, Registers *new); +extern void schedule(Task* task); // schedule a task to be run in the future +extern void destroyCurrentTask(); + +extern void setRunningTask(Task* task); // set the task currently executed +extern void sendMessage(Task* task, Message* message); + +extern Message* popMessage(Task* task); + +#endif \ No newline at end of file diff --git a/src/headers/tree-os.h b/src/headers/tree-os.h new file mode 100644 index 0000000..71476fe --- /dev/null +++ b/src/headers/tree-os.h @@ -0,0 +1,6 @@ +#ifndef TREE_OS_H +#define TREE_OS_H + +extern void drawLogo(); + +#endif \ No newline at end of file diff --git a/src/kernel/kernel.c b/src/kernel/kernel.c index cfdf333..d8ff7b8 100644 --- a/src/kernel/kernel.c +++ b/src/kernel/kernel.c @@ -1,10 +1,10 @@ #include -#include +#include #include -#include -#include -#include -#include +#include +#include +#include +#include extern uint32_t _kernel_end; diff --git a/src/kernel/lib/memory/alloc.h b/src/kernel/lib/memory/alloc.h deleted file mode 100644 index 42910ce..0000000 --- a/src/kernel/lib/memory/alloc.h +++ /dev/null @@ -1,28 +0,0 @@ -#ifndef ALLOC_H -#define ALLOC_H - -#include -#include - -typedef enum MemoryState { - FREE = 0, - IN_USE = 1 -} MemoryState; - -typedef struct MemoryBlock { - struct MemoryBlock* last; - struct MemoryBlock* next; - MemoryState state; - uint32_t size; - Task* task; -} MemoryBlock; - -extern void initMemoryAllocation(uint32_t kernelEnd); -extern void* malloc(uint32_t size); -extern void* mallocTask(uint32_t size, Task* task); -extern void free(void* location); -extern void printMemoryStack(); -extern void freeTaskAllocations(Task* task); -extern Task* getCurrentTask(); - -#endif \ No newline at end of file diff --git a/src/kernel/lib/ports.c b/src/kernel/lib/ports.c index b2a8fab..6cfbb2a 100644 --- a/src/kernel/lib/ports.c +++ b/src/kernel/lib/ports.c @@ -1,4 +1,4 @@ -#include +#include #include void outb(uint16_t port, uint8_t val) { diff --git a/src/kernel/lib/ports.h b/src/kernel/lib/ports.h deleted file mode 100644 index 716fd0a..0000000 --- a/src/kernel/lib/ports.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef PORTS_H -#define PORTS_H - -#include - -extern void outb(uint16_t port, uint8_t val); -extern uint8_t inb(uint16_t port); - -#endif \ No newline at end of file diff --git a/src/kernel/lib/task/message.h b/src/kernel/lib/task/message.h deleted file mode 100644 index 2f8ddbe..0000000 --- a/src/kernel/lib/task/message.h +++ /dev/null @@ -1,12 +0,0 @@ -#ifndef MESSAGE_H -#define MESSAGE_H - -#include - -typedef struct Message { - void* data; - uint32_t size; - struct Message* next; -} Message; - -#endif \ No newline at end of file diff --git a/src/kernel/lib/task/osTasks.c b/src/kernel/lib/task/osTasks.c index 439a26d..c3d6a43 100644 --- a/src/kernel/lib/task/osTasks.c +++ b/src/kernel/lib/task/osTasks.c @@ -1,8 +1,8 @@ -#include -#include -#include +#include +#include +#include #include -#include +#include Task mainTask; Task printerTask; diff --git a/Makefile b/Makefile index e0b541a..0a31a7a 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ CC = i686-elf-gcc -CCFLAGS = -m32 -mtune=generic -ffreestanding -nostdlib -c -I src/kernel +CCFLAGS = -m32 -mtune=generic -ffreestanding -nostdlib -c -I src/headers LD = i686-elf-ld LD_FLAGS = -z max-page-size=0x1000 -T linker.ld AS = nasm diff --git a/src/headers/alloc.h b/src/headers/alloc.h new file mode 100644 index 0000000..82023d4 --- /dev/null +++ b/src/headers/alloc.h @@ -0,0 +1,28 @@ +#ifndef ALLOC_H +#define ALLOC_H + +#include +#include + +typedef enum MemoryState { + FREE = 0, + IN_USE = 1 +} MemoryState; + +typedef struct MemoryBlock { + struct MemoryBlock* last; + struct MemoryBlock* next; + MemoryState state; + uint32_t size; + Task* task; +} MemoryBlock; + +extern void initMemoryAllocation(uint32_t kernelEnd); +extern void* malloc(uint32_t size); +extern void* mallocTask(uint32_t size, Task* task); +extern void free(void* location); +extern void printMemoryStack(); +extern void freeTaskAllocations(Task* task); +extern Task* getCurrentTask(); + +#endif \ No newline at end of file diff --git a/src/headers/cursor.h b/src/headers/cursor.h new file mode 100644 index 0000000..30f91c1 --- /dev/null +++ b/src/headers/cursor.h @@ -0,0 +1,10 @@ +#ifndef CURSOR_H +#define CURSOR_H + +#include + +extern void setCursorOffset(uint16_t offset); +extern void setCursorPosition(uint8_t x, uint8_t y); +extern uint16_t getCursorOffset(); + +#endif \ No newline at end of file diff --git a/src/headers/message.h b/src/headers/message.h new file mode 100644 index 0000000..2f8ddbe --- /dev/null +++ b/src/headers/message.h @@ -0,0 +1,12 @@ +#ifndef MESSAGE_H +#define MESSAGE_H + +#include + +typedef struct Message { + void* data; + uint32_t size; + struct Message* next; +} Message; + +#endif \ No newline at end of file diff --git a/src/headers/osTasks.h b/src/headers/osTasks.h new file mode 100644 index 0000000..2865863 --- /dev/null +++ b/src/headers/osTasks.h @@ -0,0 +1,10 @@ +#ifndef OS_TASKS_H +#define OS_TASKS_H + +#include + +extern void initOSTasks(); + +extern Task* getPrinterTask(); + +#endif \ No newline at end of file diff --git a/src/headers/ports.h b/src/headers/ports.h new file mode 100644 index 0000000..716fd0a --- /dev/null +++ b/src/headers/ports.h @@ -0,0 +1,9 @@ +#ifndef PORTS_H +#define PORTS_H + +#include + +extern void outb(uint16_t port, uint8_t val); +extern uint8_t inb(uint16_t port); + +#endif \ No newline at end of file diff --git a/src/headers/stdio.h b/src/headers/stdio.h new file mode 100644 index 0000000..b5d4f87 --- /dev/null +++ b/src/headers/stdio.h @@ -0,0 +1,20 @@ +#ifndef STDIO_H +#define STDIO_H + +#include + +#define FRAMEBUFFER_LOCATION 0x000B8000 +#define VIDEO_WIDTH 80 +#define VIDEO_HEIGHT 25 + +extern void setTextStyle(uint8_t style); +extern void clearScreen(); +extern void printf(const char* format, ...); +extern void putCharAt(char c, uint8_t x, uint8_t y); +extern void putCharsAt(char* string, uint8_t x, uint8_t y); +extern void puts(char* string); +extern void putChars(char* string, uint32_t length); + +extern uint32_t strlen(char* string); + +#endif \ No newline at end of file diff --git a/src/headers/task.h b/src/headers/task.h new file mode 100644 index 0000000..0b8e1b4 --- /dev/null +++ b/src/headers/task.h @@ -0,0 +1,34 @@ +#ifndef TASK_H +#define TASK_H + +#include +#include + +extern void initTasking(); + +typedef struct __attribute__ ((packed)) { + uint32_t eax, ebx, ecx, edx, esi, edi, esp, ebp, eip, eflags, cr3; +} Registers; + +typedef struct Task { + Registers registers; // the register states for the task + struct Task *nextTask; // linked list of tasks that need to be done + void* stack; + Message* message; +} Task; + +extern void initTasking(); +extern void createTask(Task *task, uint32_t mainFunction, uint32_t flags, uint32_t *pagedir); + +extern void yield(); +extern void yields(); // yield, but schedule the currently running task +extern void switchTask(Registers *old, Registers *new); +extern void schedule(Task* task); // schedule a task to be run in the future +extern void destroyCurrentTask(); + +extern void setRunningTask(Task* task); // set the task currently executed +extern void sendMessage(Task* task, Message* message); + +extern Message* popMessage(Task* task); + +#endif \ No newline at end of file diff --git a/src/headers/tree-os.h b/src/headers/tree-os.h new file mode 100644 index 0000000..71476fe --- /dev/null +++ b/src/headers/tree-os.h @@ -0,0 +1,6 @@ +#ifndef TREE_OS_H +#define TREE_OS_H + +extern void drawLogo(); + +#endif \ No newline at end of file diff --git a/src/kernel/kernel.c b/src/kernel/kernel.c index cfdf333..d8ff7b8 100644 --- a/src/kernel/kernel.c +++ b/src/kernel/kernel.c @@ -1,10 +1,10 @@ #include -#include +#include #include -#include -#include -#include -#include +#include +#include +#include +#include extern uint32_t _kernel_end; diff --git a/src/kernel/lib/memory/alloc.h b/src/kernel/lib/memory/alloc.h deleted file mode 100644 index 42910ce..0000000 --- a/src/kernel/lib/memory/alloc.h +++ /dev/null @@ -1,28 +0,0 @@ -#ifndef ALLOC_H -#define ALLOC_H - -#include -#include - -typedef enum MemoryState { - FREE = 0, - IN_USE = 1 -} MemoryState; - -typedef struct MemoryBlock { - struct MemoryBlock* last; - struct MemoryBlock* next; - MemoryState state; - uint32_t size; - Task* task; -} MemoryBlock; - -extern void initMemoryAllocation(uint32_t kernelEnd); -extern void* malloc(uint32_t size); -extern void* mallocTask(uint32_t size, Task* task); -extern void free(void* location); -extern void printMemoryStack(); -extern void freeTaskAllocations(Task* task); -extern Task* getCurrentTask(); - -#endif \ No newline at end of file diff --git a/src/kernel/lib/ports.c b/src/kernel/lib/ports.c index b2a8fab..6cfbb2a 100644 --- a/src/kernel/lib/ports.c +++ b/src/kernel/lib/ports.c @@ -1,4 +1,4 @@ -#include +#include #include void outb(uint16_t port, uint8_t val) { diff --git a/src/kernel/lib/ports.h b/src/kernel/lib/ports.h deleted file mode 100644 index 716fd0a..0000000 --- a/src/kernel/lib/ports.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef PORTS_H -#define PORTS_H - -#include - -extern void outb(uint16_t port, uint8_t val); -extern uint8_t inb(uint16_t port); - -#endif \ No newline at end of file diff --git a/src/kernel/lib/task/message.h b/src/kernel/lib/task/message.h deleted file mode 100644 index 2f8ddbe..0000000 --- a/src/kernel/lib/task/message.h +++ /dev/null @@ -1,12 +0,0 @@ -#ifndef MESSAGE_H -#define MESSAGE_H - -#include - -typedef struct Message { - void* data; - uint32_t size; - struct Message* next; -} Message; - -#endif \ No newline at end of file diff --git a/src/kernel/lib/task/osTasks.c b/src/kernel/lib/task/osTasks.c index 439a26d..c3d6a43 100644 --- a/src/kernel/lib/task/osTasks.c +++ b/src/kernel/lib/task/osTasks.c @@ -1,8 +1,8 @@ -#include -#include -#include +#include +#include +#include #include -#include +#include Task mainTask; Task printerTask; diff --git a/src/kernel/lib/task/osTasks.h b/src/kernel/lib/task/osTasks.h deleted file mode 100644 index b1adecb..0000000 --- a/src/kernel/lib/task/osTasks.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef OS_TASKS_H -#define OS_TASKS_H - -#include - -extern void initOSTasks(); - -extern Task* getPrinterTask(); - -#endif \ No newline at end of file diff --git a/Makefile b/Makefile index e0b541a..0a31a7a 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ CC = i686-elf-gcc -CCFLAGS = -m32 -mtune=generic -ffreestanding -nostdlib -c -I src/kernel +CCFLAGS = -m32 -mtune=generic -ffreestanding -nostdlib -c -I src/headers LD = i686-elf-ld LD_FLAGS = -z max-page-size=0x1000 -T linker.ld AS = nasm diff --git a/src/headers/alloc.h b/src/headers/alloc.h new file mode 100644 index 0000000..82023d4 --- /dev/null +++ b/src/headers/alloc.h @@ -0,0 +1,28 @@ +#ifndef ALLOC_H +#define ALLOC_H + +#include +#include + +typedef enum MemoryState { + FREE = 0, + IN_USE = 1 +} MemoryState; + +typedef struct MemoryBlock { + struct MemoryBlock* last; + struct MemoryBlock* next; + MemoryState state; + uint32_t size; + Task* task; +} MemoryBlock; + +extern void initMemoryAllocation(uint32_t kernelEnd); +extern void* malloc(uint32_t size); +extern void* mallocTask(uint32_t size, Task* task); +extern void free(void* location); +extern void printMemoryStack(); +extern void freeTaskAllocations(Task* task); +extern Task* getCurrentTask(); + +#endif \ No newline at end of file diff --git a/src/headers/cursor.h b/src/headers/cursor.h new file mode 100644 index 0000000..30f91c1 --- /dev/null +++ b/src/headers/cursor.h @@ -0,0 +1,10 @@ +#ifndef CURSOR_H +#define CURSOR_H + +#include + +extern void setCursorOffset(uint16_t offset); +extern void setCursorPosition(uint8_t x, uint8_t y); +extern uint16_t getCursorOffset(); + +#endif \ No newline at end of file diff --git a/src/headers/message.h b/src/headers/message.h new file mode 100644 index 0000000..2f8ddbe --- /dev/null +++ b/src/headers/message.h @@ -0,0 +1,12 @@ +#ifndef MESSAGE_H +#define MESSAGE_H + +#include + +typedef struct Message { + void* data; + uint32_t size; + struct Message* next; +} Message; + +#endif \ No newline at end of file diff --git a/src/headers/osTasks.h b/src/headers/osTasks.h new file mode 100644 index 0000000..2865863 --- /dev/null +++ b/src/headers/osTasks.h @@ -0,0 +1,10 @@ +#ifndef OS_TASKS_H +#define OS_TASKS_H + +#include + +extern void initOSTasks(); + +extern Task* getPrinterTask(); + +#endif \ No newline at end of file diff --git a/src/headers/ports.h b/src/headers/ports.h new file mode 100644 index 0000000..716fd0a --- /dev/null +++ b/src/headers/ports.h @@ -0,0 +1,9 @@ +#ifndef PORTS_H +#define PORTS_H + +#include + +extern void outb(uint16_t port, uint8_t val); +extern uint8_t inb(uint16_t port); + +#endif \ No newline at end of file diff --git a/src/headers/stdio.h b/src/headers/stdio.h new file mode 100644 index 0000000..b5d4f87 --- /dev/null +++ b/src/headers/stdio.h @@ -0,0 +1,20 @@ +#ifndef STDIO_H +#define STDIO_H + +#include + +#define FRAMEBUFFER_LOCATION 0x000B8000 +#define VIDEO_WIDTH 80 +#define VIDEO_HEIGHT 25 + +extern void setTextStyle(uint8_t style); +extern void clearScreen(); +extern void printf(const char* format, ...); +extern void putCharAt(char c, uint8_t x, uint8_t y); +extern void putCharsAt(char* string, uint8_t x, uint8_t y); +extern void puts(char* string); +extern void putChars(char* string, uint32_t length); + +extern uint32_t strlen(char* string); + +#endif \ No newline at end of file diff --git a/src/headers/task.h b/src/headers/task.h new file mode 100644 index 0000000..0b8e1b4 --- /dev/null +++ b/src/headers/task.h @@ -0,0 +1,34 @@ +#ifndef TASK_H +#define TASK_H + +#include +#include + +extern void initTasking(); + +typedef struct __attribute__ ((packed)) { + uint32_t eax, ebx, ecx, edx, esi, edi, esp, ebp, eip, eflags, cr3; +} Registers; + +typedef struct Task { + Registers registers; // the register states for the task + struct Task *nextTask; // linked list of tasks that need to be done + void* stack; + Message* message; +} Task; + +extern void initTasking(); +extern void createTask(Task *task, uint32_t mainFunction, uint32_t flags, uint32_t *pagedir); + +extern void yield(); +extern void yields(); // yield, but schedule the currently running task +extern void switchTask(Registers *old, Registers *new); +extern void schedule(Task* task); // schedule a task to be run in the future +extern void destroyCurrentTask(); + +extern void setRunningTask(Task* task); // set the task currently executed +extern void sendMessage(Task* task, Message* message); + +extern Message* popMessage(Task* task); + +#endif \ No newline at end of file diff --git a/src/headers/tree-os.h b/src/headers/tree-os.h new file mode 100644 index 0000000..71476fe --- /dev/null +++ b/src/headers/tree-os.h @@ -0,0 +1,6 @@ +#ifndef TREE_OS_H +#define TREE_OS_H + +extern void drawLogo(); + +#endif \ No newline at end of file diff --git a/src/kernel/kernel.c b/src/kernel/kernel.c index cfdf333..d8ff7b8 100644 --- a/src/kernel/kernel.c +++ b/src/kernel/kernel.c @@ -1,10 +1,10 @@ #include -#include +#include #include -#include -#include -#include -#include +#include +#include +#include +#include extern uint32_t _kernel_end; diff --git a/src/kernel/lib/memory/alloc.h b/src/kernel/lib/memory/alloc.h deleted file mode 100644 index 42910ce..0000000 --- a/src/kernel/lib/memory/alloc.h +++ /dev/null @@ -1,28 +0,0 @@ -#ifndef ALLOC_H -#define ALLOC_H - -#include -#include - -typedef enum MemoryState { - FREE = 0, - IN_USE = 1 -} MemoryState; - -typedef struct MemoryBlock { - struct MemoryBlock* last; - struct MemoryBlock* next; - MemoryState state; - uint32_t size; - Task* task; -} MemoryBlock; - -extern void initMemoryAllocation(uint32_t kernelEnd); -extern void* malloc(uint32_t size); -extern void* mallocTask(uint32_t size, Task* task); -extern void free(void* location); -extern void printMemoryStack(); -extern void freeTaskAllocations(Task* task); -extern Task* getCurrentTask(); - -#endif \ No newline at end of file diff --git a/src/kernel/lib/ports.c b/src/kernel/lib/ports.c index b2a8fab..6cfbb2a 100644 --- a/src/kernel/lib/ports.c +++ b/src/kernel/lib/ports.c @@ -1,4 +1,4 @@ -#include +#include #include void outb(uint16_t port, uint8_t val) { diff --git a/src/kernel/lib/ports.h b/src/kernel/lib/ports.h deleted file mode 100644 index 716fd0a..0000000 --- a/src/kernel/lib/ports.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef PORTS_H -#define PORTS_H - -#include - -extern void outb(uint16_t port, uint8_t val); -extern uint8_t inb(uint16_t port); - -#endif \ No newline at end of file diff --git a/src/kernel/lib/task/message.h b/src/kernel/lib/task/message.h deleted file mode 100644 index 2f8ddbe..0000000 --- a/src/kernel/lib/task/message.h +++ /dev/null @@ -1,12 +0,0 @@ -#ifndef MESSAGE_H -#define MESSAGE_H - -#include - -typedef struct Message { - void* data; - uint32_t size; - struct Message* next; -} Message; - -#endif \ No newline at end of file diff --git a/src/kernel/lib/task/osTasks.c b/src/kernel/lib/task/osTasks.c index 439a26d..c3d6a43 100644 --- a/src/kernel/lib/task/osTasks.c +++ b/src/kernel/lib/task/osTasks.c @@ -1,8 +1,8 @@ -#include -#include -#include +#include +#include +#include #include -#include +#include Task mainTask; Task printerTask; diff --git a/src/kernel/lib/task/osTasks.h b/src/kernel/lib/task/osTasks.h deleted file mode 100644 index b1adecb..0000000 --- a/src/kernel/lib/task/osTasks.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef OS_TASKS_H -#define OS_TASKS_H - -#include - -extern void initOSTasks(); - -extern Task* getPrinterTask(); - -#endif \ No newline at end of file diff --git a/src/kernel/lib/task/task.c b/src/kernel/lib/task/task.c index 5d57403..e4201c5 100644 --- a/src/kernel/lib/task/task.c +++ b/src/kernel/lib/task/task.c @@ -1,6 +1,6 @@ -#include -#include -#include +#include +#include +#include #define STACK_SIZE 0xF000 diff --git a/Makefile b/Makefile index e0b541a..0a31a7a 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ CC = i686-elf-gcc -CCFLAGS = -m32 -mtune=generic -ffreestanding -nostdlib -c -I src/kernel +CCFLAGS = -m32 -mtune=generic -ffreestanding -nostdlib -c -I src/headers LD = i686-elf-ld LD_FLAGS = -z max-page-size=0x1000 -T linker.ld AS = nasm diff --git a/src/headers/alloc.h b/src/headers/alloc.h new file mode 100644 index 0000000..82023d4 --- /dev/null +++ b/src/headers/alloc.h @@ -0,0 +1,28 @@ +#ifndef ALLOC_H +#define ALLOC_H + +#include +#include + +typedef enum MemoryState { + FREE = 0, + IN_USE = 1 +} MemoryState; + +typedef struct MemoryBlock { + struct MemoryBlock* last; + struct MemoryBlock* next; + MemoryState state; + uint32_t size; + Task* task; +} MemoryBlock; + +extern void initMemoryAllocation(uint32_t kernelEnd); +extern void* malloc(uint32_t size); +extern void* mallocTask(uint32_t size, Task* task); +extern void free(void* location); +extern void printMemoryStack(); +extern void freeTaskAllocations(Task* task); +extern Task* getCurrentTask(); + +#endif \ No newline at end of file diff --git a/src/headers/cursor.h b/src/headers/cursor.h new file mode 100644 index 0000000..30f91c1 --- /dev/null +++ b/src/headers/cursor.h @@ -0,0 +1,10 @@ +#ifndef CURSOR_H +#define CURSOR_H + +#include + +extern void setCursorOffset(uint16_t offset); +extern void setCursorPosition(uint8_t x, uint8_t y); +extern uint16_t getCursorOffset(); + +#endif \ No newline at end of file diff --git a/src/headers/message.h b/src/headers/message.h new file mode 100644 index 0000000..2f8ddbe --- /dev/null +++ b/src/headers/message.h @@ -0,0 +1,12 @@ +#ifndef MESSAGE_H +#define MESSAGE_H + +#include + +typedef struct Message { + void* data; + uint32_t size; + struct Message* next; +} Message; + +#endif \ No newline at end of file diff --git a/src/headers/osTasks.h b/src/headers/osTasks.h new file mode 100644 index 0000000..2865863 --- /dev/null +++ b/src/headers/osTasks.h @@ -0,0 +1,10 @@ +#ifndef OS_TASKS_H +#define OS_TASKS_H + +#include + +extern void initOSTasks(); + +extern Task* getPrinterTask(); + +#endif \ No newline at end of file diff --git a/src/headers/ports.h b/src/headers/ports.h new file mode 100644 index 0000000..716fd0a --- /dev/null +++ b/src/headers/ports.h @@ -0,0 +1,9 @@ +#ifndef PORTS_H +#define PORTS_H + +#include + +extern void outb(uint16_t port, uint8_t val); +extern uint8_t inb(uint16_t port); + +#endif \ No newline at end of file diff --git a/src/headers/stdio.h b/src/headers/stdio.h new file mode 100644 index 0000000..b5d4f87 --- /dev/null +++ b/src/headers/stdio.h @@ -0,0 +1,20 @@ +#ifndef STDIO_H +#define STDIO_H + +#include + +#define FRAMEBUFFER_LOCATION 0x000B8000 +#define VIDEO_WIDTH 80 +#define VIDEO_HEIGHT 25 + +extern void setTextStyle(uint8_t style); +extern void clearScreen(); +extern void printf(const char* format, ...); +extern void putCharAt(char c, uint8_t x, uint8_t y); +extern void putCharsAt(char* string, uint8_t x, uint8_t y); +extern void puts(char* string); +extern void putChars(char* string, uint32_t length); + +extern uint32_t strlen(char* string); + +#endif \ No newline at end of file diff --git a/src/headers/task.h b/src/headers/task.h new file mode 100644 index 0000000..0b8e1b4 --- /dev/null +++ b/src/headers/task.h @@ -0,0 +1,34 @@ +#ifndef TASK_H +#define TASK_H + +#include +#include + +extern void initTasking(); + +typedef struct __attribute__ ((packed)) { + uint32_t eax, ebx, ecx, edx, esi, edi, esp, ebp, eip, eflags, cr3; +} Registers; + +typedef struct Task { + Registers registers; // the register states for the task + struct Task *nextTask; // linked list of tasks that need to be done + void* stack; + Message* message; +} Task; + +extern void initTasking(); +extern void createTask(Task *task, uint32_t mainFunction, uint32_t flags, uint32_t *pagedir); + +extern void yield(); +extern void yields(); // yield, but schedule the currently running task +extern void switchTask(Registers *old, Registers *new); +extern void schedule(Task* task); // schedule a task to be run in the future +extern void destroyCurrentTask(); + +extern void setRunningTask(Task* task); // set the task currently executed +extern void sendMessage(Task* task, Message* message); + +extern Message* popMessage(Task* task); + +#endif \ No newline at end of file diff --git a/src/headers/tree-os.h b/src/headers/tree-os.h new file mode 100644 index 0000000..71476fe --- /dev/null +++ b/src/headers/tree-os.h @@ -0,0 +1,6 @@ +#ifndef TREE_OS_H +#define TREE_OS_H + +extern void drawLogo(); + +#endif \ No newline at end of file diff --git a/src/kernel/kernel.c b/src/kernel/kernel.c index cfdf333..d8ff7b8 100644 --- a/src/kernel/kernel.c +++ b/src/kernel/kernel.c @@ -1,10 +1,10 @@ #include -#include +#include #include -#include -#include -#include -#include +#include +#include +#include +#include extern uint32_t _kernel_end; diff --git a/src/kernel/lib/memory/alloc.h b/src/kernel/lib/memory/alloc.h deleted file mode 100644 index 42910ce..0000000 --- a/src/kernel/lib/memory/alloc.h +++ /dev/null @@ -1,28 +0,0 @@ -#ifndef ALLOC_H -#define ALLOC_H - -#include -#include - -typedef enum MemoryState { - FREE = 0, - IN_USE = 1 -} MemoryState; - -typedef struct MemoryBlock { - struct MemoryBlock* last; - struct MemoryBlock* next; - MemoryState state; - uint32_t size; - Task* task; -} MemoryBlock; - -extern void initMemoryAllocation(uint32_t kernelEnd); -extern void* malloc(uint32_t size); -extern void* mallocTask(uint32_t size, Task* task); -extern void free(void* location); -extern void printMemoryStack(); -extern void freeTaskAllocations(Task* task); -extern Task* getCurrentTask(); - -#endif \ No newline at end of file diff --git a/src/kernel/lib/ports.c b/src/kernel/lib/ports.c index b2a8fab..6cfbb2a 100644 --- a/src/kernel/lib/ports.c +++ b/src/kernel/lib/ports.c @@ -1,4 +1,4 @@ -#include +#include #include void outb(uint16_t port, uint8_t val) { diff --git a/src/kernel/lib/ports.h b/src/kernel/lib/ports.h deleted file mode 100644 index 716fd0a..0000000 --- a/src/kernel/lib/ports.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef PORTS_H -#define PORTS_H - -#include - -extern void outb(uint16_t port, uint8_t val); -extern uint8_t inb(uint16_t port); - -#endif \ No newline at end of file diff --git a/src/kernel/lib/task/message.h b/src/kernel/lib/task/message.h deleted file mode 100644 index 2f8ddbe..0000000 --- a/src/kernel/lib/task/message.h +++ /dev/null @@ -1,12 +0,0 @@ -#ifndef MESSAGE_H -#define MESSAGE_H - -#include - -typedef struct Message { - void* data; - uint32_t size; - struct Message* next; -} Message; - -#endif \ No newline at end of file diff --git a/src/kernel/lib/task/osTasks.c b/src/kernel/lib/task/osTasks.c index 439a26d..c3d6a43 100644 --- a/src/kernel/lib/task/osTasks.c +++ b/src/kernel/lib/task/osTasks.c @@ -1,8 +1,8 @@ -#include -#include -#include +#include +#include +#include #include -#include +#include Task mainTask; Task printerTask; diff --git a/src/kernel/lib/task/osTasks.h b/src/kernel/lib/task/osTasks.h deleted file mode 100644 index b1adecb..0000000 --- a/src/kernel/lib/task/osTasks.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef OS_TASKS_H -#define OS_TASKS_H - -#include - -extern void initOSTasks(); - -extern Task* getPrinterTask(); - -#endif \ No newline at end of file diff --git a/src/kernel/lib/task/task.c b/src/kernel/lib/task/task.c index 5d57403..e4201c5 100644 --- a/src/kernel/lib/task/task.c +++ b/src/kernel/lib/task/task.c @@ -1,6 +1,6 @@ -#include -#include -#include +#include +#include +#include #define STACK_SIZE 0xF000 diff --git a/src/kernel/lib/task/task.h b/src/kernel/lib/task/task.h deleted file mode 100644 index 0c5e1d0..0000000 --- a/src/kernel/lib/task/task.h +++ /dev/null @@ -1,34 +0,0 @@ -#ifndef TASK_H -#define TASK_H - -#include -#include - -extern void initTasking(); - -typedef struct __attribute__ ((packed)) { - uint32_t eax, ebx, ecx, edx, esi, edi, esp, ebp, eip, eflags, cr3; -} Registers; - -typedef struct Task { - Registers registers; // the register states for the task - struct Task *nextTask; // linked list of tasks that need to be done - void* stack; - Message* message; -} Task; - -extern void initTasking(); -extern void createTask(Task *task, uint32_t mainFunction, uint32_t flags, uint32_t *pagedir); - -extern void yield(); -extern void yields(); // yield, but schedule the currently running task -extern void switchTask(Registers *old, Registers *new); -extern void schedule(Task* task); // schedule a task to be run in the future -extern void destroyCurrentTask(); - -extern void setRunningTask(Task* task); // set the task currently executed -extern void sendMessage(Task* task, Message* message); - -extern Message* popMessage(Task* task); - -#endif \ No newline at end of file diff --git a/Makefile b/Makefile index e0b541a..0a31a7a 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ CC = i686-elf-gcc -CCFLAGS = -m32 -mtune=generic -ffreestanding -nostdlib -c -I src/kernel +CCFLAGS = -m32 -mtune=generic -ffreestanding -nostdlib -c -I src/headers LD = i686-elf-ld LD_FLAGS = -z max-page-size=0x1000 -T linker.ld AS = nasm diff --git a/src/headers/alloc.h b/src/headers/alloc.h new file mode 100644 index 0000000..82023d4 --- /dev/null +++ b/src/headers/alloc.h @@ -0,0 +1,28 @@ +#ifndef ALLOC_H +#define ALLOC_H + +#include +#include + +typedef enum MemoryState { + FREE = 0, + IN_USE = 1 +} MemoryState; + +typedef struct MemoryBlock { + struct MemoryBlock* last; + struct MemoryBlock* next; + MemoryState state; + uint32_t size; + Task* task; +} MemoryBlock; + +extern void initMemoryAllocation(uint32_t kernelEnd); +extern void* malloc(uint32_t size); +extern void* mallocTask(uint32_t size, Task* task); +extern void free(void* location); +extern void printMemoryStack(); +extern void freeTaskAllocations(Task* task); +extern Task* getCurrentTask(); + +#endif \ No newline at end of file diff --git a/src/headers/cursor.h b/src/headers/cursor.h new file mode 100644 index 0000000..30f91c1 --- /dev/null +++ b/src/headers/cursor.h @@ -0,0 +1,10 @@ +#ifndef CURSOR_H +#define CURSOR_H + +#include + +extern void setCursorOffset(uint16_t offset); +extern void setCursorPosition(uint8_t x, uint8_t y); +extern uint16_t getCursorOffset(); + +#endif \ No newline at end of file diff --git a/src/headers/message.h b/src/headers/message.h new file mode 100644 index 0000000..2f8ddbe --- /dev/null +++ b/src/headers/message.h @@ -0,0 +1,12 @@ +#ifndef MESSAGE_H +#define MESSAGE_H + +#include + +typedef struct Message { + void* data; + uint32_t size; + struct Message* next; +} Message; + +#endif \ No newline at end of file diff --git a/src/headers/osTasks.h b/src/headers/osTasks.h new file mode 100644 index 0000000..2865863 --- /dev/null +++ b/src/headers/osTasks.h @@ -0,0 +1,10 @@ +#ifndef OS_TASKS_H +#define OS_TASKS_H + +#include + +extern void initOSTasks(); + +extern Task* getPrinterTask(); + +#endif \ No newline at end of file diff --git a/src/headers/ports.h b/src/headers/ports.h new file mode 100644 index 0000000..716fd0a --- /dev/null +++ b/src/headers/ports.h @@ -0,0 +1,9 @@ +#ifndef PORTS_H +#define PORTS_H + +#include + +extern void outb(uint16_t port, uint8_t val); +extern uint8_t inb(uint16_t port); + +#endif \ No newline at end of file diff --git a/src/headers/stdio.h b/src/headers/stdio.h new file mode 100644 index 0000000..b5d4f87 --- /dev/null +++ b/src/headers/stdio.h @@ -0,0 +1,20 @@ +#ifndef STDIO_H +#define STDIO_H + +#include + +#define FRAMEBUFFER_LOCATION 0x000B8000 +#define VIDEO_WIDTH 80 +#define VIDEO_HEIGHT 25 + +extern void setTextStyle(uint8_t style); +extern void clearScreen(); +extern void printf(const char* format, ...); +extern void putCharAt(char c, uint8_t x, uint8_t y); +extern void putCharsAt(char* string, uint8_t x, uint8_t y); +extern void puts(char* string); +extern void putChars(char* string, uint32_t length); + +extern uint32_t strlen(char* string); + +#endif \ No newline at end of file diff --git a/src/headers/task.h b/src/headers/task.h new file mode 100644 index 0000000..0b8e1b4 --- /dev/null +++ b/src/headers/task.h @@ -0,0 +1,34 @@ +#ifndef TASK_H +#define TASK_H + +#include +#include + +extern void initTasking(); + +typedef struct __attribute__ ((packed)) { + uint32_t eax, ebx, ecx, edx, esi, edi, esp, ebp, eip, eflags, cr3; +} Registers; + +typedef struct Task { + Registers registers; // the register states for the task + struct Task *nextTask; // linked list of tasks that need to be done + void* stack; + Message* message; +} Task; + +extern void initTasking(); +extern void createTask(Task *task, uint32_t mainFunction, uint32_t flags, uint32_t *pagedir); + +extern void yield(); +extern void yields(); // yield, but schedule the currently running task +extern void switchTask(Registers *old, Registers *new); +extern void schedule(Task* task); // schedule a task to be run in the future +extern void destroyCurrentTask(); + +extern void setRunningTask(Task* task); // set the task currently executed +extern void sendMessage(Task* task, Message* message); + +extern Message* popMessage(Task* task); + +#endif \ No newline at end of file diff --git a/src/headers/tree-os.h b/src/headers/tree-os.h new file mode 100644 index 0000000..71476fe --- /dev/null +++ b/src/headers/tree-os.h @@ -0,0 +1,6 @@ +#ifndef TREE_OS_H +#define TREE_OS_H + +extern void drawLogo(); + +#endif \ No newline at end of file diff --git a/src/kernel/kernel.c b/src/kernel/kernel.c index cfdf333..d8ff7b8 100644 --- a/src/kernel/kernel.c +++ b/src/kernel/kernel.c @@ -1,10 +1,10 @@ #include -#include +#include #include -#include -#include -#include -#include +#include +#include +#include +#include extern uint32_t _kernel_end; diff --git a/src/kernel/lib/memory/alloc.h b/src/kernel/lib/memory/alloc.h deleted file mode 100644 index 42910ce..0000000 --- a/src/kernel/lib/memory/alloc.h +++ /dev/null @@ -1,28 +0,0 @@ -#ifndef ALLOC_H -#define ALLOC_H - -#include -#include - -typedef enum MemoryState { - FREE = 0, - IN_USE = 1 -} MemoryState; - -typedef struct MemoryBlock { - struct MemoryBlock* last; - struct MemoryBlock* next; - MemoryState state; - uint32_t size; - Task* task; -} MemoryBlock; - -extern void initMemoryAllocation(uint32_t kernelEnd); -extern void* malloc(uint32_t size); -extern void* mallocTask(uint32_t size, Task* task); -extern void free(void* location); -extern void printMemoryStack(); -extern void freeTaskAllocations(Task* task); -extern Task* getCurrentTask(); - -#endif \ No newline at end of file diff --git a/src/kernel/lib/ports.c b/src/kernel/lib/ports.c index b2a8fab..6cfbb2a 100644 --- a/src/kernel/lib/ports.c +++ b/src/kernel/lib/ports.c @@ -1,4 +1,4 @@ -#include +#include #include void outb(uint16_t port, uint8_t val) { diff --git a/src/kernel/lib/ports.h b/src/kernel/lib/ports.h deleted file mode 100644 index 716fd0a..0000000 --- a/src/kernel/lib/ports.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef PORTS_H -#define PORTS_H - -#include - -extern void outb(uint16_t port, uint8_t val); -extern uint8_t inb(uint16_t port); - -#endif \ No newline at end of file diff --git a/src/kernel/lib/task/message.h b/src/kernel/lib/task/message.h deleted file mode 100644 index 2f8ddbe..0000000 --- a/src/kernel/lib/task/message.h +++ /dev/null @@ -1,12 +0,0 @@ -#ifndef MESSAGE_H -#define MESSAGE_H - -#include - -typedef struct Message { - void* data; - uint32_t size; - struct Message* next; -} Message; - -#endif \ No newline at end of file diff --git a/src/kernel/lib/task/osTasks.c b/src/kernel/lib/task/osTasks.c index 439a26d..c3d6a43 100644 --- a/src/kernel/lib/task/osTasks.c +++ b/src/kernel/lib/task/osTasks.c @@ -1,8 +1,8 @@ -#include -#include -#include +#include +#include +#include #include -#include +#include Task mainTask; Task printerTask; diff --git a/src/kernel/lib/task/osTasks.h b/src/kernel/lib/task/osTasks.h deleted file mode 100644 index b1adecb..0000000 --- a/src/kernel/lib/task/osTasks.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef OS_TASKS_H -#define OS_TASKS_H - -#include - -extern void initOSTasks(); - -extern Task* getPrinterTask(); - -#endif \ No newline at end of file diff --git a/src/kernel/lib/task/task.c b/src/kernel/lib/task/task.c index 5d57403..e4201c5 100644 --- a/src/kernel/lib/task/task.c +++ b/src/kernel/lib/task/task.c @@ -1,6 +1,6 @@ -#include -#include -#include +#include +#include +#include #define STACK_SIZE 0xF000 diff --git a/src/kernel/lib/task/task.h b/src/kernel/lib/task/task.h deleted file mode 100644 index 0c5e1d0..0000000 --- a/src/kernel/lib/task/task.h +++ /dev/null @@ -1,34 +0,0 @@ -#ifndef TASK_H -#define TASK_H - -#include -#include - -extern void initTasking(); - -typedef struct __attribute__ ((packed)) { - uint32_t eax, ebx, ecx, edx, esi, edi, esp, ebp, eip, eflags, cr3; -} Registers; - -typedef struct Task { - Registers registers; // the register states for the task - struct Task *nextTask; // linked list of tasks that need to be done - void* stack; - Message* message; -} Task; - -extern void initTasking(); -extern void createTask(Task *task, uint32_t mainFunction, uint32_t flags, uint32_t *pagedir); - -extern void yield(); -extern void yields(); // yield, but schedule the currently running task -extern void switchTask(Registers *old, Registers *new); -extern void schedule(Task* task); // schedule a task to be run in the future -extern void destroyCurrentTask(); - -extern void setRunningTask(Task* task); // set the task currently executed -extern void sendMessage(Task* task, Message* message); - -extern Message* popMessage(Task* task); - -#endif \ No newline at end of file diff --git a/src/kernel/lib/textMode/cursor.c b/src/kernel/lib/textMode/cursor.c index eb9bd36..e5cc8f9 100644 --- a/src/kernel/lib/textMode/cursor.c +++ b/src/kernel/lib/textMode/cursor.c @@ -1,7 +1,7 @@ #include -#include -#include -#include +#include +#include +#include void setCursorOffset(uint16_t offset) { outb(0x3D4, 0x0F); diff --git a/Makefile b/Makefile index e0b541a..0a31a7a 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ CC = i686-elf-gcc -CCFLAGS = -m32 -mtune=generic -ffreestanding -nostdlib -c -I src/kernel +CCFLAGS = -m32 -mtune=generic -ffreestanding -nostdlib -c -I src/headers LD = i686-elf-ld LD_FLAGS = -z max-page-size=0x1000 -T linker.ld AS = nasm diff --git a/src/headers/alloc.h b/src/headers/alloc.h new file mode 100644 index 0000000..82023d4 --- /dev/null +++ b/src/headers/alloc.h @@ -0,0 +1,28 @@ +#ifndef ALLOC_H +#define ALLOC_H + +#include +#include + +typedef enum MemoryState { + FREE = 0, + IN_USE = 1 +} MemoryState; + +typedef struct MemoryBlock { + struct MemoryBlock* last; + struct MemoryBlock* next; + MemoryState state; + uint32_t size; + Task* task; +} MemoryBlock; + +extern void initMemoryAllocation(uint32_t kernelEnd); +extern void* malloc(uint32_t size); +extern void* mallocTask(uint32_t size, Task* task); +extern void free(void* location); +extern void printMemoryStack(); +extern void freeTaskAllocations(Task* task); +extern Task* getCurrentTask(); + +#endif \ No newline at end of file diff --git a/src/headers/cursor.h b/src/headers/cursor.h new file mode 100644 index 0000000..30f91c1 --- /dev/null +++ b/src/headers/cursor.h @@ -0,0 +1,10 @@ +#ifndef CURSOR_H +#define CURSOR_H + +#include + +extern void setCursorOffset(uint16_t offset); +extern void setCursorPosition(uint8_t x, uint8_t y); +extern uint16_t getCursorOffset(); + +#endif \ No newline at end of file diff --git a/src/headers/message.h b/src/headers/message.h new file mode 100644 index 0000000..2f8ddbe --- /dev/null +++ b/src/headers/message.h @@ -0,0 +1,12 @@ +#ifndef MESSAGE_H +#define MESSAGE_H + +#include + +typedef struct Message { + void* data; + uint32_t size; + struct Message* next; +} Message; + +#endif \ No newline at end of file diff --git a/src/headers/osTasks.h b/src/headers/osTasks.h new file mode 100644 index 0000000..2865863 --- /dev/null +++ b/src/headers/osTasks.h @@ -0,0 +1,10 @@ +#ifndef OS_TASKS_H +#define OS_TASKS_H + +#include + +extern void initOSTasks(); + +extern Task* getPrinterTask(); + +#endif \ No newline at end of file diff --git a/src/headers/ports.h b/src/headers/ports.h new file mode 100644 index 0000000..716fd0a --- /dev/null +++ b/src/headers/ports.h @@ -0,0 +1,9 @@ +#ifndef PORTS_H +#define PORTS_H + +#include + +extern void outb(uint16_t port, uint8_t val); +extern uint8_t inb(uint16_t port); + +#endif \ No newline at end of file diff --git a/src/headers/stdio.h b/src/headers/stdio.h new file mode 100644 index 0000000..b5d4f87 --- /dev/null +++ b/src/headers/stdio.h @@ -0,0 +1,20 @@ +#ifndef STDIO_H +#define STDIO_H + +#include + +#define FRAMEBUFFER_LOCATION 0x000B8000 +#define VIDEO_WIDTH 80 +#define VIDEO_HEIGHT 25 + +extern void setTextStyle(uint8_t style); +extern void clearScreen(); +extern void printf(const char* format, ...); +extern void putCharAt(char c, uint8_t x, uint8_t y); +extern void putCharsAt(char* string, uint8_t x, uint8_t y); +extern void puts(char* string); +extern void putChars(char* string, uint32_t length); + +extern uint32_t strlen(char* string); + +#endif \ No newline at end of file diff --git a/src/headers/task.h b/src/headers/task.h new file mode 100644 index 0000000..0b8e1b4 --- /dev/null +++ b/src/headers/task.h @@ -0,0 +1,34 @@ +#ifndef TASK_H +#define TASK_H + +#include +#include + +extern void initTasking(); + +typedef struct __attribute__ ((packed)) { + uint32_t eax, ebx, ecx, edx, esi, edi, esp, ebp, eip, eflags, cr3; +} Registers; + +typedef struct Task { + Registers registers; // the register states for the task + struct Task *nextTask; // linked list of tasks that need to be done + void* stack; + Message* message; +} Task; + +extern void initTasking(); +extern void createTask(Task *task, uint32_t mainFunction, uint32_t flags, uint32_t *pagedir); + +extern void yield(); +extern void yields(); // yield, but schedule the currently running task +extern void switchTask(Registers *old, Registers *new); +extern void schedule(Task* task); // schedule a task to be run in the future +extern void destroyCurrentTask(); + +extern void setRunningTask(Task* task); // set the task currently executed +extern void sendMessage(Task* task, Message* message); + +extern Message* popMessage(Task* task); + +#endif \ No newline at end of file diff --git a/src/headers/tree-os.h b/src/headers/tree-os.h new file mode 100644 index 0000000..71476fe --- /dev/null +++ b/src/headers/tree-os.h @@ -0,0 +1,6 @@ +#ifndef TREE_OS_H +#define TREE_OS_H + +extern void drawLogo(); + +#endif \ No newline at end of file diff --git a/src/kernel/kernel.c b/src/kernel/kernel.c index cfdf333..d8ff7b8 100644 --- a/src/kernel/kernel.c +++ b/src/kernel/kernel.c @@ -1,10 +1,10 @@ #include -#include +#include #include -#include -#include -#include -#include +#include +#include +#include +#include extern uint32_t _kernel_end; diff --git a/src/kernel/lib/memory/alloc.h b/src/kernel/lib/memory/alloc.h deleted file mode 100644 index 42910ce..0000000 --- a/src/kernel/lib/memory/alloc.h +++ /dev/null @@ -1,28 +0,0 @@ -#ifndef ALLOC_H -#define ALLOC_H - -#include -#include - -typedef enum MemoryState { - FREE = 0, - IN_USE = 1 -} MemoryState; - -typedef struct MemoryBlock { - struct MemoryBlock* last; - struct MemoryBlock* next; - MemoryState state; - uint32_t size; - Task* task; -} MemoryBlock; - -extern void initMemoryAllocation(uint32_t kernelEnd); -extern void* malloc(uint32_t size); -extern void* mallocTask(uint32_t size, Task* task); -extern void free(void* location); -extern void printMemoryStack(); -extern void freeTaskAllocations(Task* task); -extern Task* getCurrentTask(); - -#endif \ No newline at end of file diff --git a/src/kernel/lib/ports.c b/src/kernel/lib/ports.c index b2a8fab..6cfbb2a 100644 --- a/src/kernel/lib/ports.c +++ b/src/kernel/lib/ports.c @@ -1,4 +1,4 @@ -#include +#include #include void outb(uint16_t port, uint8_t val) { diff --git a/src/kernel/lib/ports.h b/src/kernel/lib/ports.h deleted file mode 100644 index 716fd0a..0000000 --- a/src/kernel/lib/ports.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef PORTS_H -#define PORTS_H - -#include - -extern void outb(uint16_t port, uint8_t val); -extern uint8_t inb(uint16_t port); - -#endif \ No newline at end of file diff --git a/src/kernel/lib/task/message.h b/src/kernel/lib/task/message.h deleted file mode 100644 index 2f8ddbe..0000000 --- a/src/kernel/lib/task/message.h +++ /dev/null @@ -1,12 +0,0 @@ -#ifndef MESSAGE_H -#define MESSAGE_H - -#include - -typedef struct Message { - void* data; - uint32_t size; - struct Message* next; -} Message; - -#endif \ No newline at end of file diff --git a/src/kernel/lib/task/osTasks.c b/src/kernel/lib/task/osTasks.c index 439a26d..c3d6a43 100644 --- a/src/kernel/lib/task/osTasks.c +++ b/src/kernel/lib/task/osTasks.c @@ -1,8 +1,8 @@ -#include -#include -#include +#include +#include +#include #include -#include +#include Task mainTask; Task printerTask; diff --git a/src/kernel/lib/task/osTasks.h b/src/kernel/lib/task/osTasks.h deleted file mode 100644 index b1adecb..0000000 --- a/src/kernel/lib/task/osTasks.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef OS_TASKS_H -#define OS_TASKS_H - -#include - -extern void initOSTasks(); - -extern Task* getPrinterTask(); - -#endif \ No newline at end of file diff --git a/src/kernel/lib/task/task.c b/src/kernel/lib/task/task.c index 5d57403..e4201c5 100644 --- a/src/kernel/lib/task/task.c +++ b/src/kernel/lib/task/task.c @@ -1,6 +1,6 @@ -#include -#include -#include +#include +#include +#include #define STACK_SIZE 0xF000 diff --git a/src/kernel/lib/task/task.h b/src/kernel/lib/task/task.h deleted file mode 100644 index 0c5e1d0..0000000 --- a/src/kernel/lib/task/task.h +++ /dev/null @@ -1,34 +0,0 @@ -#ifndef TASK_H -#define TASK_H - -#include -#include - -extern void initTasking(); - -typedef struct __attribute__ ((packed)) { - uint32_t eax, ebx, ecx, edx, esi, edi, esp, ebp, eip, eflags, cr3; -} Registers; - -typedef struct Task { - Registers registers; // the register states for the task - struct Task *nextTask; // linked list of tasks that need to be done - void* stack; - Message* message; -} Task; - -extern void initTasking(); -extern void createTask(Task *task, uint32_t mainFunction, uint32_t flags, uint32_t *pagedir); - -extern void yield(); -extern void yields(); // yield, but schedule the currently running task -extern void switchTask(Registers *old, Registers *new); -extern void schedule(Task* task); // schedule a task to be run in the future -extern void destroyCurrentTask(); - -extern void setRunningTask(Task* task); // set the task currently executed -extern void sendMessage(Task* task, Message* message); - -extern Message* popMessage(Task* task); - -#endif \ No newline at end of file diff --git a/src/kernel/lib/textMode/cursor.c b/src/kernel/lib/textMode/cursor.c index eb9bd36..e5cc8f9 100644 --- a/src/kernel/lib/textMode/cursor.c +++ b/src/kernel/lib/textMode/cursor.c @@ -1,7 +1,7 @@ #include -#include -#include -#include +#include +#include +#include void setCursorOffset(uint16_t offset) { outb(0x3D4, 0x0F); diff --git a/src/kernel/lib/textMode/cursor.h b/src/kernel/lib/textMode/cursor.h deleted file mode 100644 index 30f91c1..0000000 --- a/src/kernel/lib/textMode/cursor.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef CURSOR_H -#define CURSOR_H - -#include - -extern void setCursorOffset(uint16_t offset); -extern void setCursorPosition(uint8_t x, uint8_t y); -extern uint16_t getCursorOffset(); - -#endif \ No newline at end of file diff --git a/Makefile b/Makefile index e0b541a..0a31a7a 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ CC = i686-elf-gcc -CCFLAGS = -m32 -mtune=generic -ffreestanding -nostdlib -c -I src/kernel +CCFLAGS = -m32 -mtune=generic -ffreestanding -nostdlib -c -I src/headers LD = i686-elf-ld LD_FLAGS = -z max-page-size=0x1000 -T linker.ld AS = nasm diff --git a/src/headers/alloc.h b/src/headers/alloc.h new file mode 100644 index 0000000..82023d4 --- /dev/null +++ b/src/headers/alloc.h @@ -0,0 +1,28 @@ +#ifndef ALLOC_H +#define ALLOC_H + +#include +#include + +typedef enum MemoryState { + FREE = 0, + IN_USE = 1 +} MemoryState; + +typedef struct MemoryBlock { + struct MemoryBlock* last; + struct MemoryBlock* next; + MemoryState state; + uint32_t size; + Task* task; +} MemoryBlock; + +extern void initMemoryAllocation(uint32_t kernelEnd); +extern void* malloc(uint32_t size); +extern void* mallocTask(uint32_t size, Task* task); +extern void free(void* location); +extern void printMemoryStack(); +extern void freeTaskAllocations(Task* task); +extern Task* getCurrentTask(); + +#endif \ No newline at end of file diff --git a/src/headers/cursor.h b/src/headers/cursor.h new file mode 100644 index 0000000..30f91c1 --- /dev/null +++ b/src/headers/cursor.h @@ -0,0 +1,10 @@ +#ifndef CURSOR_H +#define CURSOR_H + +#include + +extern void setCursorOffset(uint16_t offset); +extern void setCursorPosition(uint8_t x, uint8_t y); +extern uint16_t getCursorOffset(); + +#endif \ No newline at end of file diff --git a/src/headers/message.h b/src/headers/message.h new file mode 100644 index 0000000..2f8ddbe --- /dev/null +++ b/src/headers/message.h @@ -0,0 +1,12 @@ +#ifndef MESSAGE_H +#define MESSAGE_H + +#include + +typedef struct Message { + void* data; + uint32_t size; + struct Message* next; +} Message; + +#endif \ No newline at end of file diff --git a/src/headers/osTasks.h b/src/headers/osTasks.h new file mode 100644 index 0000000..2865863 --- /dev/null +++ b/src/headers/osTasks.h @@ -0,0 +1,10 @@ +#ifndef OS_TASKS_H +#define OS_TASKS_H + +#include + +extern void initOSTasks(); + +extern Task* getPrinterTask(); + +#endif \ No newline at end of file diff --git a/src/headers/ports.h b/src/headers/ports.h new file mode 100644 index 0000000..716fd0a --- /dev/null +++ b/src/headers/ports.h @@ -0,0 +1,9 @@ +#ifndef PORTS_H +#define PORTS_H + +#include + +extern void outb(uint16_t port, uint8_t val); +extern uint8_t inb(uint16_t port); + +#endif \ No newline at end of file diff --git a/src/headers/stdio.h b/src/headers/stdio.h new file mode 100644 index 0000000..b5d4f87 --- /dev/null +++ b/src/headers/stdio.h @@ -0,0 +1,20 @@ +#ifndef STDIO_H +#define STDIO_H + +#include + +#define FRAMEBUFFER_LOCATION 0x000B8000 +#define VIDEO_WIDTH 80 +#define VIDEO_HEIGHT 25 + +extern void setTextStyle(uint8_t style); +extern void clearScreen(); +extern void printf(const char* format, ...); +extern void putCharAt(char c, uint8_t x, uint8_t y); +extern void putCharsAt(char* string, uint8_t x, uint8_t y); +extern void puts(char* string); +extern void putChars(char* string, uint32_t length); + +extern uint32_t strlen(char* string); + +#endif \ No newline at end of file diff --git a/src/headers/task.h b/src/headers/task.h new file mode 100644 index 0000000..0b8e1b4 --- /dev/null +++ b/src/headers/task.h @@ -0,0 +1,34 @@ +#ifndef TASK_H +#define TASK_H + +#include +#include + +extern void initTasking(); + +typedef struct __attribute__ ((packed)) { + uint32_t eax, ebx, ecx, edx, esi, edi, esp, ebp, eip, eflags, cr3; +} Registers; + +typedef struct Task { + Registers registers; // the register states for the task + struct Task *nextTask; // linked list of tasks that need to be done + void* stack; + Message* message; +} Task; + +extern void initTasking(); +extern void createTask(Task *task, uint32_t mainFunction, uint32_t flags, uint32_t *pagedir); + +extern void yield(); +extern void yields(); // yield, but schedule the currently running task +extern void switchTask(Registers *old, Registers *new); +extern void schedule(Task* task); // schedule a task to be run in the future +extern void destroyCurrentTask(); + +extern void setRunningTask(Task* task); // set the task currently executed +extern void sendMessage(Task* task, Message* message); + +extern Message* popMessage(Task* task); + +#endif \ No newline at end of file diff --git a/src/headers/tree-os.h b/src/headers/tree-os.h new file mode 100644 index 0000000..71476fe --- /dev/null +++ b/src/headers/tree-os.h @@ -0,0 +1,6 @@ +#ifndef TREE_OS_H +#define TREE_OS_H + +extern void drawLogo(); + +#endif \ No newline at end of file diff --git a/src/kernel/kernel.c b/src/kernel/kernel.c index cfdf333..d8ff7b8 100644 --- a/src/kernel/kernel.c +++ b/src/kernel/kernel.c @@ -1,10 +1,10 @@ #include -#include +#include #include -#include -#include -#include -#include +#include +#include +#include +#include extern uint32_t _kernel_end; diff --git a/src/kernel/lib/memory/alloc.h b/src/kernel/lib/memory/alloc.h deleted file mode 100644 index 42910ce..0000000 --- a/src/kernel/lib/memory/alloc.h +++ /dev/null @@ -1,28 +0,0 @@ -#ifndef ALLOC_H -#define ALLOC_H - -#include -#include - -typedef enum MemoryState { - FREE = 0, - IN_USE = 1 -} MemoryState; - -typedef struct MemoryBlock { - struct MemoryBlock* last; - struct MemoryBlock* next; - MemoryState state; - uint32_t size; - Task* task; -} MemoryBlock; - -extern void initMemoryAllocation(uint32_t kernelEnd); -extern void* malloc(uint32_t size); -extern void* mallocTask(uint32_t size, Task* task); -extern void free(void* location); -extern void printMemoryStack(); -extern void freeTaskAllocations(Task* task); -extern Task* getCurrentTask(); - -#endif \ No newline at end of file diff --git a/src/kernel/lib/ports.c b/src/kernel/lib/ports.c index b2a8fab..6cfbb2a 100644 --- a/src/kernel/lib/ports.c +++ b/src/kernel/lib/ports.c @@ -1,4 +1,4 @@ -#include +#include #include void outb(uint16_t port, uint8_t val) { diff --git a/src/kernel/lib/ports.h b/src/kernel/lib/ports.h deleted file mode 100644 index 716fd0a..0000000 --- a/src/kernel/lib/ports.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef PORTS_H -#define PORTS_H - -#include - -extern void outb(uint16_t port, uint8_t val); -extern uint8_t inb(uint16_t port); - -#endif \ No newline at end of file diff --git a/src/kernel/lib/task/message.h b/src/kernel/lib/task/message.h deleted file mode 100644 index 2f8ddbe..0000000 --- a/src/kernel/lib/task/message.h +++ /dev/null @@ -1,12 +0,0 @@ -#ifndef MESSAGE_H -#define MESSAGE_H - -#include - -typedef struct Message { - void* data; - uint32_t size; - struct Message* next; -} Message; - -#endif \ No newline at end of file diff --git a/src/kernel/lib/task/osTasks.c b/src/kernel/lib/task/osTasks.c index 439a26d..c3d6a43 100644 --- a/src/kernel/lib/task/osTasks.c +++ b/src/kernel/lib/task/osTasks.c @@ -1,8 +1,8 @@ -#include -#include -#include +#include +#include +#include #include -#include +#include Task mainTask; Task printerTask; diff --git a/src/kernel/lib/task/osTasks.h b/src/kernel/lib/task/osTasks.h deleted file mode 100644 index b1adecb..0000000 --- a/src/kernel/lib/task/osTasks.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef OS_TASKS_H -#define OS_TASKS_H - -#include - -extern void initOSTasks(); - -extern Task* getPrinterTask(); - -#endif \ No newline at end of file diff --git a/src/kernel/lib/task/task.c b/src/kernel/lib/task/task.c index 5d57403..e4201c5 100644 --- a/src/kernel/lib/task/task.c +++ b/src/kernel/lib/task/task.c @@ -1,6 +1,6 @@ -#include -#include -#include +#include +#include +#include #define STACK_SIZE 0xF000 diff --git a/src/kernel/lib/task/task.h b/src/kernel/lib/task/task.h deleted file mode 100644 index 0c5e1d0..0000000 --- a/src/kernel/lib/task/task.h +++ /dev/null @@ -1,34 +0,0 @@ -#ifndef TASK_H -#define TASK_H - -#include -#include - -extern void initTasking(); - -typedef struct __attribute__ ((packed)) { - uint32_t eax, ebx, ecx, edx, esi, edi, esp, ebp, eip, eflags, cr3; -} Registers; - -typedef struct Task { - Registers registers; // the register states for the task - struct Task *nextTask; // linked list of tasks that need to be done - void* stack; - Message* message; -} Task; - -extern void initTasking(); -extern void createTask(Task *task, uint32_t mainFunction, uint32_t flags, uint32_t *pagedir); - -extern void yield(); -extern void yields(); // yield, but schedule the currently running task -extern void switchTask(Registers *old, Registers *new); -extern void schedule(Task* task); // schedule a task to be run in the future -extern void destroyCurrentTask(); - -extern void setRunningTask(Task* task); // set the task currently executed -extern void sendMessage(Task* task, Message* message); - -extern Message* popMessage(Task* task); - -#endif \ No newline at end of file diff --git a/src/kernel/lib/textMode/cursor.c b/src/kernel/lib/textMode/cursor.c index eb9bd36..e5cc8f9 100644 --- a/src/kernel/lib/textMode/cursor.c +++ b/src/kernel/lib/textMode/cursor.c @@ -1,7 +1,7 @@ #include -#include -#include -#include +#include +#include +#include void setCursorOffset(uint16_t offset) { outb(0x3D4, 0x0F); diff --git a/src/kernel/lib/textMode/cursor.h b/src/kernel/lib/textMode/cursor.h deleted file mode 100644 index 30f91c1..0000000 --- a/src/kernel/lib/textMode/cursor.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef CURSOR_H -#define CURSOR_H - -#include - -extern void setCursorOffset(uint16_t offset); -extern void setCursorPosition(uint8_t x, uint8_t y); -extern uint16_t getCursorOffset(); - -#endif \ No newline at end of file diff --git a/src/kernel/lib/textMode/stdio.c b/src/kernel/lib/textMode/stdio.c index 747a710..5f1b3a0 100644 --- a/src/kernel/lib/textMode/stdio.c +++ b/src/kernel/lib/textMode/stdio.c @@ -1,12 +1,12 @@ #include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include uint16_t* framebuffer = (uint16_t*) FRAMEBUFFER_LOCATION; char format = 0x0F; diff --git a/Makefile b/Makefile index e0b541a..0a31a7a 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ CC = i686-elf-gcc -CCFLAGS = -m32 -mtune=generic -ffreestanding -nostdlib -c -I src/kernel +CCFLAGS = -m32 -mtune=generic -ffreestanding -nostdlib -c -I src/headers LD = i686-elf-ld LD_FLAGS = -z max-page-size=0x1000 -T linker.ld AS = nasm diff --git a/src/headers/alloc.h b/src/headers/alloc.h new file mode 100644 index 0000000..82023d4 --- /dev/null +++ b/src/headers/alloc.h @@ -0,0 +1,28 @@ +#ifndef ALLOC_H +#define ALLOC_H + +#include +#include + +typedef enum MemoryState { + FREE = 0, + IN_USE = 1 +} MemoryState; + +typedef struct MemoryBlock { + struct MemoryBlock* last; + struct MemoryBlock* next; + MemoryState state; + uint32_t size; + Task* task; +} MemoryBlock; + +extern void initMemoryAllocation(uint32_t kernelEnd); +extern void* malloc(uint32_t size); +extern void* mallocTask(uint32_t size, Task* task); +extern void free(void* location); +extern void printMemoryStack(); +extern void freeTaskAllocations(Task* task); +extern Task* getCurrentTask(); + +#endif \ No newline at end of file diff --git a/src/headers/cursor.h b/src/headers/cursor.h new file mode 100644 index 0000000..30f91c1 --- /dev/null +++ b/src/headers/cursor.h @@ -0,0 +1,10 @@ +#ifndef CURSOR_H +#define CURSOR_H + +#include + +extern void setCursorOffset(uint16_t offset); +extern void setCursorPosition(uint8_t x, uint8_t y); +extern uint16_t getCursorOffset(); + +#endif \ No newline at end of file diff --git a/src/headers/message.h b/src/headers/message.h new file mode 100644 index 0000000..2f8ddbe --- /dev/null +++ b/src/headers/message.h @@ -0,0 +1,12 @@ +#ifndef MESSAGE_H +#define MESSAGE_H + +#include + +typedef struct Message { + void* data; + uint32_t size; + struct Message* next; +} Message; + +#endif \ No newline at end of file diff --git a/src/headers/osTasks.h b/src/headers/osTasks.h new file mode 100644 index 0000000..2865863 --- /dev/null +++ b/src/headers/osTasks.h @@ -0,0 +1,10 @@ +#ifndef OS_TASKS_H +#define OS_TASKS_H + +#include + +extern void initOSTasks(); + +extern Task* getPrinterTask(); + +#endif \ No newline at end of file diff --git a/src/headers/ports.h b/src/headers/ports.h new file mode 100644 index 0000000..716fd0a --- /dev/null +++ b/src/headers/ports.h @@ -0,0 +1,9 @@ +#ifndef PORTS_H +#define PORTS_H + +#include + +extern void outb(uint16_t port, uint8_t val); +extern uint8_t inb(uint16_t port); + +#endif \ No newline at end of file diff --git a/src/headers/stdio.h b/src/headers/stdio.h new file mode 100644 index 0000000..b5d4f87 --- /dev/null +++ b/src/headers/stdio.h @@ -0,0 +1,20 @@ +#ifndef STDIO_H +#define STDIO_H + +#include + +#define FRAMEBUFFER_LOCATION 0x000B8000 +#define VIDEO_WIDTH 80 +#define VIDEO_HEIGHT 25 + +extern void setTextStyle(uint8_t style); +extern void clearScreen(); +extern void printf(const char* format, ...); +extern void putCharAt(char c, uint8_t x, uint8_t y); +extern void putCharsAt(char* string, uint8_t x, uint8_t y); +extern void puts(char* string); +extern void putChars(char* string, uint32_t length); + +extern uint32_t strlen(char* string); + +#endif \ No newline at end of file diff --git a/src/headers/task.h b/src/headers/task.h new file mode 100644 index 0000000..0b8e1b4 --- /dev/null +++ b/src/headers/task.h @@ -0,0 +1,34 @@ +#ifndef TASK_H +#define TASK_H + +#include +#include + +extern void initTasking(); + +typedef struct __attribute__ ((packed)) { + uint32_t eax, ebx, ecx, edx, esi, edi, esp, ebp, eip, eflags, cr3; +} Registers; + +typedef struct Task { + Registers registers; // the register states for the task + struct Task *nextTask; // linked list of tasks that need to be done + void* stack; + Message* message; +} Task; + +extern void initTasking(); +extern void createTask(Task *task, uint32_t mainFunction, uint32_t flags, uint32_t *pagedir); + +extern void yield(); +extern void yields(); // yield, but schedule the currently running task +extern void switchTask(Registers *old, Registers *new); +extern void schedule(Task* task); // schedule a task to be run in the future +extern void destroyCurrentTask(); + +extern void setRunningTask(Task* task); // set the task currently executed +extern void sendMessage(Task* task, Message* message); + +extern Message* popMessage(Task* task); + +#endif \ No newline at end of file diff --git a/src/headers/tree-os.h b/src/headers/tree-os.h new file mode 100644 index 0000000..71476fe --- /dev/null +++ b/src/headers/tree-os.h @@ -0,0 +1,6 @@ +#ifndef TREE_OS_H +#define TREE_OS_H + +extern void drawLogo(); + +#endif \ No newline at end of file diff --git a/src/kernel/kernel.c b/src/kernel/kernel.c index cfdf333..d8ff7b8 100644 --- a/src/kernel/kernel.c +++ b/src/kernel/kernel.c @@ -1,10 +1,10 @@ #include -#include +#include #include -#include -#include -#include -#include +#include +#include +#include +#include extern uint32_t _kernel_end; diff --git a/src/kernel/lib/memory/alloc.h b/src/kernel/lib/memory/alloc.h deleted file mode 100644 index 42910ce..0000000 --- a/src/kernel/lib/memory/alloc.h +++ /dev/null @@ -1,28 +0,0 @@ -#ifndef ALLOC_H -#define ALLOC_H - -#include -#include - -typedef enum MemoryState { - FREE = 0, - IN_USE = 1 -} MemoryState; - -typedef struct MemoryBlock { - struct MemoryBlock* last; - struct MemoryBlock* next; - MemoryState state; - uint32_t size; - Task* task; -} MemoryBlock; - -extern void initMemoryAllocation(uint32_t kernelEnd); -extern void* malloc(uint32_t size); -extern void* mallocTask(uint32_t size, Task* task); -extern void free(void* location); -extern void printMemoryStack(); -extern void freeTaskAllocations(Task* task); -extern Task* getCurrentTask(); - -#endif \ No newline at end of file diff --git a/src/kernel/lib/ports.c b/src/kernel/lib/ports.c index b2a8fab..6cfbb2a 100644 --- a/src/kernel/lib/ports.c +++ b/src/kernel/lib/ports.c @@ -1,4 +1,4 @@ -#include +#include #include void outb(uint16_t port, uint8_t val) { diff --git a/src/kernel/lib/ports.h b/src/kernel/lib/ports.h deleted file mode 100644 index 716fd0a..0000000 --- a/src/kernel/lib/ports.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef PORTS_H -#define PORTS_H - -#include - -extern void outb(uint16_t port, uint8_t val); -extern uint8_t inb(uint16_t port); - -#endif \ No newline at end of file diff --git a/src/kernel/lib/task/message.h b/src/kernel/lib/task/message.h deleted file mode 100644 index 2f8ddbe..0000000 --- a/src/kernel/lib/task/message.h +++ /dev/null @@ -1,12 +0,0 @@ -#ifndef MESSAGE_H -#define MESSAGE_H - -#include - -typedef struct Message { - void* data; - uint32_t size; - struct Message* next; -} Message; - -#endif \ No newline at end of file diff --git a/src/kernel/lib/task/osTasks.c b/src/kernel/lib/task/osTasks.c index 439a26d..c3d6a43 100644 --- a/src/kernel/lib/task/osTasks.c +++ b/src/kernel/lib/task/osTasks.c @@ -1,8 +1,8 @@ -#include -#include -#include +#include +#include +#include #include -#include +#include Task mainTask; Task printerTask; diff --git a/src/kernel/lib/task/osTasks.h b/src/kernel/lib/task/osTasks.h deleted file mode 100644 index b1adecb..0000000 --- a/src/kernel/lib/task/osTasks.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef OS_TASKS_H -#define OS_TASKS_H - -#include - -extern void initOSTasks(); - -extern Task* getPrinterTask(); - -#endif \ No newline at end of file diff --git a/src/kernel/lib/task/task.c b/src/kernel/lib/task/task.c index 5d57403..e4201c5 100644 --- a/src/kernel/lib/task/task.c +++ b/src/kernel/lib/task/task.c @@ -1,6 +1,6 @@ -#include -#include -#include +#include +#include +#include #define STACK_SIZE 0xF000 diff --git a/src/kernel/lib/task/task.h b/src/kernel/lib/task/task.h deleted file mode 100644 index 0c5e1d0..0000000 --- a/src/kernel/lib/task/task.h +++ /dev/null @@ -1,34 +0,0 @@ -#ifndef TASK_H -#define TASK_H - -#include -#include - -extern void initTasking(); - -typedef struct __attribute__ ((packed)) { - uint32_t eax, ebx, ecx, edx, esi, edi, esp, ebp, eip, eflags, cr3; -} Registers; - -typedef struct Task { - Registers registers; // the register states for the task - struct Task *nextTask; // linked list of tasks that need to be done - void* stack; - Message* message; -} Task; - -extern void initTasking(); -extern void createTask(Task *task, uint32_t mainFunction, uint32_t flags, uint32_t *pagedir); - -extern void yield(); -extern void yields(); // yield, but schedule the currently running task -extern void switchTask(Registers *old, Registers *new); -extern void schedule(Task* task); // schedule a task to be run in the future -extern void destroyCurrentTask(); - -extern void setRunningTask(Task* task); // set the task currently executed -extern void sendMessage(Task* task, Message* message); - -extern Message* popMessage(Task* task); - -#endif \ No newline at end of file diff --git a/src/kernel/lib/textMode/cursor.c b/src/kernel/lib/textMode/cursor.c index eb9bd36..e5cc8f9 100644 --- a/src/kernel/lib/textMode/cursor.c +++ b/src/kernel/lib/textMode/cursor.c @@ -1,7 +1,7 @@ #include -#include -#include -#include +#include +#include +#include void setCursorOffset(uint16_t offset) { outb(0x3D4, 0x0F); diff --git a/src/kernel/lib/textMode/cursor.h b/src/kernel/lib/textMode/cursor.h deleted file mode 100644 index 30f91c1..0000000 --- a/src/kernel/lib/textMode/cursor.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef CURSOR_H -#define CURSOR_H - -#include - -extern void setCursorOffset(uint16_t offset); -extern void setCursorPosition(uint8_t x, uint8_t y); -extern uint16_t getCursorOffset(); - -#endif \ No newline at end of file diff --git a/src/kernel/lib/textMode/stdio.c b/src/kernel/lib/textMode/stdio.c index 747a710..5f1b3a0 100644 --- a/src/kernel/lib/textMode/stdio.c +++ b/src/kernel/lib/textMode/stdio.c @@ -1,12 +1,12 @@ #include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include uint16_t* framebuffer = (uint16_t*) FRAMEBUFFER_LOCATION; char format = 0x0F; diff --git a/src/kernel/lib/textMode/stdio.h b/src/kernel/lib/textMode/stdio.h deleted file mode 100644 index b5d4f87..0000000 --- a/src/kernel/lib/textMode/stdio.h +++ /dev/null @@ -1,20 +0,0 @@ -#ifndef STDIO_H -#define STDIO_H - -#include - -#define FRAMEBUFFER_LOCATION 0x000B8000 -#define VIDEO_WIDTH 80 -#define VIDEO_HEIGHT 25 - -extern void setTextStyle(uint8_t style); -extern void clearScreen(); -extern void printf(const char* format, ...); -extern void putCharAt(char c, uint8_t x, uint8_t y); -extern void putCharsAt(char* string, uint8_t x, uint8_t y); -extern void puts(char* string); -extern void putChars(char* string, uint32_t length); - -extern uint32_t strlen(char* string); - -#endif \ No newline at end of file diff --git a/Makefile b/Makefile index e0b541a..0a31a7a 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ CC = i686-elf-gcc -CCFLAGS = -m32 -mtune=generic -ffreestanding -nostdlib -c -I src/kernel +CCFLAGS = -m32 -mtune=generic -ffreestanding -nostdlib -c -I src/headers LD = i686-elf-ld LD_FLAGS = -z max-page-size=0x1000 -T linker.ld AS = nasm diff --git a/src/headers/alloc.h b/src/headers/alloc.h new file mode 100644 index 0000000..82023d4 --- /dev/null +++ b/src/headers/alloc.h @@ -0,0 +1,28 @@ +#ifndef ALLOC_H +#define ALLOC_H + +#include +#include + +typedef enum MemoryState { + FREE = 0, + IN_USE = 1 +} MemoryState; + +typedef struct MemoryBlock { + struct MemoryBlock* last; + struct MemoryBlock* next; + MemoryState state; + uint32_t size; + Task* task; +} MemoryBlock; + +extern void initMemoryAllocation(uint32_t kernelEnd); +extern void* malloc(uint32_t size); +extern void* mallocTask(uint32_t size, Task* task); +extern void free(void* location); +extern void printMemoryStack(); +extern void freeTaskAllocations(Task* task); +extern Task* getCurrentTask(); + +#endif \ No newline at end of file diff --git a/src/headers/cursor.h b/src/headers/cursor.h new file mode 100644 index 0000000..30f91c1 --- /dev/null +++ b/src/headers/cursor.h @@ -0,0 +1,10 @@ +#ifndef CURSOR_H +#define CURSOR_H + +#include + +extern void setCursorOffset(uint16_t offset); +extern void setCursorPosition(uint8_t x, uint8_t y); +extern uint16_t getCursorOffset(); + +#endif \ No newline at end of file diff --git a/src/headers/message.h b/src/headers/message.h new file mode 100644 index 0000000..2f8ddbe --- /dev/null +++ b/src/headers/message.h @@ -0,0 +1,12 @@ +#ifndef MESSAGE_H +#define MESSAGE_H + +#include + +typedef struct Message { + void* data; + uint32_t size; + struct Message* next; +} Message; + +#endif \ No newline at end of file diff --git a/src/headers/osTasks.h b/src/headers/osTasks.h new file mode 100644 index 0000000..2865863 --- /dev/null +++ b/src/headers/osTasks.h @@ -0,0 +1,10 @@ +#ifndef OS_TASKS_H +#define OS_TASKS_H + +#include + +extern void initOSTasks(); + +extern Task* getPrinterTask(); + +#endif \ No newline at end of file diff --git a/src/headers/ports.h b/src/headers/ports.h new file mode 100644 index 0000000..716fd0a --- /dev/null +++ b/src/headers/ports.h @@ -0,0 +1,9 @@ +#ifndef PORTS_H +#define PORTS_H + +#include + +extern void outb(uint16_t port, uint8_t val); +extern uint8_t inb(uint16_t port); + +#endif \ No newline at end of file diff --git a/src/headers/stdio.h b/src/headers/stdio.h new file mode 100644 index 0000000..b5d4f87 --- /dev/null +++ b/src/headers/stdio.h @@ -0,0 +1,20 @@ +#ifndef STDIO_H +#define STDIO_H + +#include + +#define FRAMEBUFFER_LOCATION 0x000B8000 +#define VIDEO_WIDTH 80 +#define VIDEO_HEIGHT 25 + +extern void setTextStyle(uint8_t style); +extern void clearScreen(); +extern void printf(const char* format, ...); +extern void putCharAt(char c, uint8_t x, uint8_t y); +extern void putCharsAt(char* string, uint8_t x, uint8_t y); +extern void puts(char* string); +extern void putChars(char* string, uint32_t length); + +extern uint32_t strlen(char* string); + +#endif \ No newline at end of file diff --git a/src/headers/task.h b/src/headers/task.h new file mode 100644 index 0000000..0b8e1b4 --- /dev/null +++ b/src/headers/task.h @@ -0,0 +1,34 @@ +#ifndef TASK_H +#define TASK_H + +#include +#include + +extern void initTasking(); + +typedef struct __attribute__ ((packed)) { + uint32_t eax, ebx, ecx, edx, esi, edi, esp, ebp, eip, eflags, cr3; +} Registers; + +typedef struct Task { + Registers registers; // the register states for the task + struct Task *nextTask; // linked list of tasks that need to be done + void* stack; + Message* message; +} Task; + +extern void initTasking(); +extern void createTask(Task *task, uint32_t mainFunction, uint32_t flags, uint32_t *pagedir); + +extern void yield(); +extern void yields(); // yield, but schedule the currently running task +extern void switchTask(Registers *old, Registers *new); +extern void schedule(Task* task); // schedule a task to be run in the future +extern void destroyCurrentTask(); + +extern void setRunningTask(Task* task); // set the task currently executed +extern void sendMessage(Task* task, Message* message); + +extern Message* popMessage(Task* task); + +#endif \ No newline at end of file diff --git a/src/headers/tree-os.h b/src/headers/tree-os.h new file mode 100644 index 0000000..71476fe --- /dev/null +++ b/src/headers/tree-os.h @@ -0,0 +1,6 @@ +#ifndef TREE_OS_H +#define TREE_OS_H + +extern void drawLogo(); + +#endif \ No newline at end of file diff --git a/src/kernel/kernel.c b/src/kernel/kernel.c index cfdf333..d8ff7b8 100644 --- a/src/kernel/kernel.c +++ b/src/kernel/kernel.c @@ -1,10 +1,10 @@ #include -#include +#include #include -#include -#include -#include -#include +#include +#include +#include +#include extern uint32_t _kernel_end; diff --git a/src/kernel/lib/memory/alloc.h b/src/kernel/lib/memory/alloc.h deleted file mode 100644 index 42910ce..0000000 --- a/src/kernel/lib/memory/alloc.h +++ /dev/null @@ -1,28 +0,0 @@ -#ifndef ALLOC_H -#define ALLOC_H - -#include -#include - -typedef enum MemoryState { - FREE = 0, - IN_USE = 1 -} MemoryState; - -typedef struct MemoryBlock { - struct MemoryBlock* last; - struct MemoryBlock* next; - MemoryState state; - uint32_t size; - Task* task; -} MemoryBlock; - -extern void initMemoryAllocation(uint32_t kernelEnd); -extern void* malloc(uint32_t size); -extern void* mallocTask(uint32_t size, Task* task); -extern void free(void* location); -extern void printMemoryStack(); -extern void freeTaskAllocations(Task* task); -extern Task* getCurrentTask(); - -#endif \ No newline at end of file diff --git a/src/kernel/lib/ports.c b/src/kernel/lib/ports.c index b2a8fab..6cfbb2a 100644 --- a/src/kernel/lib/ports.c +++ b/src/kernel/lib/ports.c @@ -1,4 +1,4 @@ -#include +#include #include void outb(uint16_t port, uint8_t val) { diff --git a/src/kernel/lib/ports.h b/src/kernel/lib/ports.h deleted file mode 100644 index 716fd0a..0000000 --- a/src/kernel/lib/ports.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef PORTS_H -#define PORTS_H - -#include - -extern void outb(uint16_t port, uint8_t val); -extern uint8_t inb(uint16_t port); - -#endif \ No newline at end of file diff --git a/src/kernel/lib/task/message.h b/src/kernel/lib/task/message.h deleted file mode 100644 index 2f8ddbe..0000000 --- a/src/kernel/lib/task/message.h +++ /dev/null @@ -1,12 +0,0 @@ -#ifndef MESSAGE_H -#define MESSAGE_H - -#include - -typedef struct Message { - void* data; - uint32_t size; - struct Message* next; -} Message; - -#endif \ No newline at end of file diff --git a/src/kernel/lib/task/osTasks.c b/src/kernel/lib/task/osTasks.c index 439a26d..c3d6a43 100644 --- a/src/kernel/lib/task/osTasks.c +++ b/src/kernel/lib/task/osTasks.c @@ -1,8 +1,8 @@ -#include -#include -#include +#include +#include +#include #include -#include +#include Task mainTask; Task printerTask; diff --git a/src/kernel/lib/task/osTasks.h b/src/kernel/lib/task/osTasks.h deleted file mode 100644 index b1adecb..0000000 --- a/src/kernel/lib/task/osTasks.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef OS_TASKS_H -#define OS_TASKS_H - -#include - -extern void initOSTasks(); - -extern Task* getPrinterTask(); - -#endif \ No newline at end of file diff --git a/src/kernel/lib/task/task.c b/src/kernel/lib/task/task.c index 5d57403..e4201c5 100644 --- a/src/kernel/lib/task/task.c +++ b/src/kernel/lib/task/task.c @@ -1,6 +1,6 @@ -#include -#include -#include +#include +#include +#include #define STACK_SIZE 0xF000 diff --git a/src/kernel/lib/task/task.h b/src/kernel/lib/task/task.h deleted file mode 100644 index 0c5e1d0..0000000 --- a/src/kernel/lib/task/task.h +++ /dev/null @@ -1,34 +0,0 @@ -#ifndef TASK_H -#define TASK_H - -#include -#include - -extern void initTasking(); - -typedef struct __attribute__ ((packed)) { - uint32_t eax, ebx, ecx, edx, esi, edi, esp, ebp, eip, eflags, cr3; -} Registers; - -typedef struct Task { - Registers registers; // the register states for the task - struct Task *nextTask; // linked list of tasks that need to be done - void* stack; - Message* message; -} Task; - -extern void initTasking(); -extern void createTask(Task *task, uint32_t mainFunction, uint32_t flags, uint32_t *pagedir); - -extern void yield(); -extern void yields(); // yield, but schedule the currently running task -extern void switchTask(Registers *old, Registers *new); -extern void schedule(Task* task); // schedule a task to be run in the future -extern void destroyCurrentTask(); - -extern void setRunningTask(Task* task); // set the task currently executed -extern void sendMessage(Task* task, Message* message); - -extern Message* popMessage(Task* task); - -#endif \ No newline at end of file diff --git a/src/kernel/lib/textMode/cursor.c b/src/kernel/lib/textMode/cursor.c index eb9bd36..e5cc8f9 100644 --- a/src/kernel/lib/textMode/cursor.c +++ b/src/kernel/lib/textMode/cursor.c @@ -1,7 +1,7 @@ #include -#include -#include -#include +#include +#include +#include void setCursorOffset(uint16_t offset) { outb(0x3D4, 0x0F); diff --git a/src/kernel/lib/textMode/cursor.h b/src/kernel/lib/textMode/cursor.h deleted file mode 100644 index 30f91c1..0000000 --- a/src/kernel/lib/textMode/cursor.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef CURSOR_H -#define CURSOR_H - -#include - -extern void setCursorOffset(uint16_t offset); -extern void setCursorPosition(uint8_t x, uint8_t y); -extern uint16_t getCursorOffset(); - -#endif \ No newline at end of file diff --git a/src/kernel/lib/textMode/stdio.c b/src/kernel/lib/textMode/stdio.c index 747a710..5f1b3a0 100644 --- a/src/kernel/lib/textMode/stdio.c +++ b/src/kernel/lib/textMode/stdio.c @@ -1,12 +1,12 @@ #include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include uint16_t* framebuffer = (uint16_t*) FRAMEBUFFER_LOCATION; char format = 0x0F; diff --git a/src/kernel/lib/textMode/stdio.h b/src/kernel/lib/textMode/stdio.h deleted file mode 100644 index b5d4f87..0000000 --- a/src/kernel/lib/textMode/stdio.h +++ /dev/null @@ -1,20 +0,0 @@ -#ifndef STDIO_H -#define STDIO_H - -#include - -#define FRAMEBUFFER_LOCATION 0x000B8000 -#define VIDEO_WIDTH 80 -#define VIDEO_HEIGHT 25 - -extern void setTextStyle(uint8_t style); -extern void clearScreen(); -extern void printf(const char* format, ...); -extern void putCharAt(char c, uint8_t x, uint8_t y); -extern void putCharsAt(char* string, uint8_t x, uint8_t y); -extern void puts(char* string); -extern void putChars(char* string, uint32_t length); - -extern uint32_t strlen(char* string); - -#endif \ No newline at end of file diff --git a/src/kernel/multiboot.h b/src/kernel/multiboot.h deleted file mode 100644 index c6f5ff8..0000000 --- a/src/kernel/multiboot.h +++ /dev/null @@ -1,274 +0,0 @@ -/* multiboot.h - Multiboot header file. */ -/* Copyright (C) 1999,2003,2007,2008,2009,2010 Free Software Foundation, Inc. - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to - * deal in the Software without restriction, including without limitation the - * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or - * sell copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL ANY - * DEVELOPER OR DISTRIBUTOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, - * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR - * IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -#ifndef MULTIBOOT_HEADER -#define MULTIBOOT_HEADER 1 - -/* How many bytes from the start of the file we search for the header. */ -#define MULTIBOOT_SEARCH 8192 -#define MULTIBOOT_HEADER_ALIGN 4 - -/* The magic field should contain this. */ -#define MULTIBOOT_HEADER_MAGIC 0x1BADB002 - -/* This should be in %eax. */ -#define MULTIBOOT_BOOTLOADER_MAGIC 0x2BADB002 - -/* Alignment of multiboot modules. */ -#define MULTIBOOT_MOD_ALIGN 0x00001000 - -/* Alignment of the multiboot info structure. */ -#define MULTIBOOT_INFO_ALIGN 0x00000004 - -/* Flags set in the ’flags’ member of the multiboot header. */ - -/* Align all boot modules on i386 page (4KB) boundaries. */ -#define MULTIBOOT_PAGE_ALIGN 0x00000001 - -/* Must pass memory information to OS. */ -#define MULTIBOOT_MEMORY_INFO 0x00000002 - -/* Must pass video information to OS. */ -#define MULTIBOOT_VIDEO_MODE 0x00000004 - -/* This flag indicates the use of the address fields in the header. */ -#define MULTIBOOT_AOUT_KLUDGE 0x00010000 - -/* Flags to be set in the ’flags’ member of the multiboot info structure. */ - -/* is there basic lower/upper memory information? */ -#define MULTIBOOT_INFO_MEMORY 0x00000001 -/* is there a boot device set? */ -#define MULTIBOOT_INFO_BOOTDEV 0x00000002 -/* is the command-line defined? */ -#define MULTIBOOT_INFO_CMDLINE 0x00000004 -/* are there modules to do something with? */ -#define MULTIBOOT_INFO_MODS 0x00000008 - -/* These next two are mutually exclusive */ - -/* is there a symbol table loaded? */ -#define MULTIBOOT_INFO_AOUT_SYMS 0x00000010 -/* is there an ELF section header table? */ -#define MULTIBOOT_INFO_ELF_SHDR 0X00000020 - -/* is there a full memory map? */ -#define MULTIBOOT_INFO_MEM_MAP 0x00000040 - -/* Is there drive info? */ -#define MULTIBOOT_INFO_DRIVE_INFO 0x00000080 - -/* Is there a config table? */ -#define MULTIBOOT_INFO_CONFIG_TABLE 0x00000100 - -/* Is there a boot loader name? */ -#define MULTIBOOT_INFO_BOOT_LOADER_NAME 0x00000200 - -/* Is there a APM table? */ -#define MULTIBOOT_INFO_APM_TABLE 0x00000400 - -/* Is there video information? */ -#define MULTIBOOT_INFO_VBE_INFO 0x00000800 -#define MULTIBOOT_INFO_FRAMEBUFFER_INFO 0x00001000 - -#ifndef ASM_FILE - -typedef unsigned char multiboot_uint8_t; -typedef unsigned short multiboot_uint16_t; -typedef unsigned int multiboot_uint32_t; -typedef unsigned long long multiboot_uint64_t; - -struct multiboot_header -{ - /* Must be MULTIBOOT_MAGIC - see above. */ - multiboot_uint32_t magic; - - /* Feature flags. */ - multiboot_uint32_t flags; - - /* The above fields plus this one must equal 0 mod 2^32. */ - multiboot_uint32_t checksum; - - /* These are only valid if MULTIBOOT_AOUT_KLUDGE is set. */ - multiboot_uint32_t header_addr; - multiboot_uint32_t load_addr; - multiboot_uint32_t load_end_addr; - multiboot_uint32_t bss_end_addr; - multiboot_uint32_t entry_addr; - - /* These are only valid if MULTIBOOT_VIDEO_MODE is set. */ - multiboot_uint32_t mode_type; - multiboot_uint32_t width; - multiboot_uint32_t height; - multiboot_uint32_t depth; -}; - -/* The symbol table for a.out. */ -struct multiboot_aout_symbol_table -{ - multiboot_uint32_t tabsize; - multiboot_uint32_t strsize; - multiboot_uint32_t addr; - multiboot_uint32_t reserved; -}; -typedef struct multiboot_aout_symbol_table multiboot_aout_symbol_table_t; - -/* The section header table for ELF. */ -struct multiboot_elf_section_header_table -{ - multiboot_uint32_t num; - multiboot_uint32_t size; - multiboot_uint32_t addr; - multiboot_uint32_t shndx; -}; -typedef struct multiboot_elf_section_header_table multiboot_elf_section_header_table_t; - -struct multiboot_info -{ - /* Multiboot info version number */ - multiboot_uint32_t flags; - - /* Available memory from BIOS */ - multiboot_uint32_t mem_lower; - multiboot_uint32_t mem_upper; - - /* "root" partition */ - multiboot_uint32_t boot_device; - - /* Kernel command line */ - multiboot_uint32_t cmdline; - - /* Boot-Module list */ - multiboot_uint32_t mods_count; - multiboot_uint32_t mods_addr; - - union - { - multiboot_aout_symbol_table_t aout_sym; - multiboot_elf_section_header_table_t elf_sec; - } u; - - /* Memory Mapping buffer */ - multiboot_uint32_t mmap_length; - multiboot_uint32_t mmap_addr; - - /* Drive Info buffer */ - multiboot_uint32_t drives_length; - multiboot_uint32_t drives_addr; - - /* ROM configuration table */ - multiboot_uint32_t config_table; - - /* Boot Loader Name */ - multiboot_uint32_t boot_loader_name; - - /* APM table */ - multiboot_uint32_t apm_table; - - /* Video */ - multiboot_uint32_t vbe_control_info; - multiboot_uint32_t vbe_mode_info; - multiboot_uint16_t vbe_mode; - multiboot_uint16_t vbe_interface_seg; - multiboot_uint16_t vbe_interface_off; - multiboot_uint16_t vbe_interface_len; - - multiboot_uint64_t framebuffer_addr; - multiboot_uint32_t framebuffer_pitch; - multiboot_uint32_t framebuffer_width; - multiboot_uint32_t framebuffer_height; - multiboot_uint8_t framebuffer_bpp; -#define MULTIBOOT_FRAMEBUFFER_TYPE_INDEXED 0 -#define MULTIBOOT_FRAMEBUFFER_TYPE_RGB 1 -#define MULTIBOOT_FRAMEBUFFER_TYPE_EGA_TEXT 2 - multiboot_uint8_t framebuffer_type; - union - { - struct - { - multiboot_uint32_t framebuffer_palette_addr; - multiboot_uint16_t framebuffer_palette_num_colors; - }; - struct - { - multiboot_uint8_t framebuffer_red_field_position; - multiboot_uint8_t framebuffer_red_mask_size; - multiboot_uint8_t framebuffer_green_field_position; - multiboot_uint8_t framebuffer_green_mask_size; - multiboot_uint8_t framebuffer_blue_field_position; - multiboot_uint8_t framebuffer_blue_mask_size; - }; - }; -}; -typedef struct multiboot_info multiboot_info_t; - -struct multiboot_color -{ - multiboot_uint8_t red; - multiboot_uint8_t green; - multiboot_uint8_t blue; -}; - -struct multiboot_mmap_entry -{ - multiboot_uint32_t size; - multiboot_uint64_t addr; - multiboot_uint64_t len; -#define MULTIBOOT_MEMORY_AVAILABLE 1 -#define MULTIBOOT_MEMORY_RESERVED 2 -#define MULTIBOOT_MEMORY_ACPI_RECLAIMABLE 3 -#define MULTIBOOT_MEMORY_NVS 4 -#define MULTIBOOT_MEMORY_BADRAM 5 - multiboot_uint32_t type; -} __attribute__((packed)); -typedef struct multiboot_mmap_entry multiboot_memory_map_t; - -struct multiboot_mod_list -{ - /* the memory used goes from bytes ’mod_start’ to ’mod_end-1’ inclusive */ - multiboot_uint32_t mod_start; - multiboot_uint32_t mod_end; - - /* Module command line */ - multiboot_uint32_t cmdline; - - /* padding to take it to 16 bytes (must be zero) */ - multiboot_uint32_t pad; -}; -typedef struct multiboot_mod_list multiboot_module_t; - -/* APM BIOS info. */ -struct multiboot_apm_info -{ - multiboot_uint16_t version; - multiboot_uint16_t cseg; - multiboot_uint32_t offset; - multiboot_uint16_t cseg_16; - multiboot_uint16_t dseg; - multiboot_uint16_t flags; - multiboot_uint16_t cseg_len; - multiboot_uint16_t cseg_16_len; - multiboot_uint16_t dseg_len; -}; - -#endif /* ! ASM_FILE */ - -#endif /* ! MULTIBOOT_HEADER */ \ No newline at end of file diff --git a/Makefile b/Makefile index e0b541a..0a31a7a 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ CC = i686-elf-gcc -CCFLAGS = -m32 -mtune=generic -ffreestanding -nostdlib -c -I src/kernel +CCFLAGS = -m32 -mtune=generic -ffreestanding -nostdlib -c -I src/headers LD = i686-elf-ld LD_FLAGS = -z max-page-size=0x1000 -T linker.ld AS = nasm diff --git a/src/headers/alloc.h b/src/headers/alloc.h new file mode 100644 index 0000000..82023d4 --- /dev/null +++ b/src/headers/alloc.h @@ -0,0 +1,28 @@ +#ifndef ALLOC_H +#define ALLOC_H + +#include +#include + +typedef enum MemoryState { + FREE = 0, + IN_USE = 1 +} MemoryState; + +typedef struct MemoryBlock { + struct MemoryBlock* last; + struct MemoryBlock* next; + MemoryState state; + uint32_t size; + Task* task; +} MemoryBlock; + +extern void initMemoryAllocation(uint32_t kernelEnd); +extern void* malloc(uint32_t size); +extern void* mallocTask(uint32_t size, Task* task); +extern void free(void* location); +extern void printMemoryStack(); +extern void freeTaskAllocations(Task* task); +extern Task* getCurrentTask(); + +#endif \ No newline at end of file diff --git a/src/headers/cursor.h b/src/headers/cursor.h new file mode 100644 index 0000000..30f91c1 --- /dev/null +++ b/src/headers/cursor.h @@ -0,0 +1,10 @@ +#ifndef CURSOR_H +#define CURSOR_H + +#include + +extern void setCursorOffset(uint16_t offset); +extern void setCursorPosition(uint8_t x, uint8_t y); +extern uint16_t getCursorOffset(); + +#endif \ No newline at end of file diff --git a/src/headers/message.h b/src/headers/message.h new file mode 100644 index 0000000..2f8ddbe --- /dev/null +++ b/src/headers/message.h @@ -0,0 +1,12 @@ +#ifndef MESSAGE_H +#define MESSAGE_H + +#include + +typedef struct Message { + void* data; + uint32_t size; + struct Message* next; +} Message; + +#endif \ No newline at end of file diff --git a/src/headers/osTasks.h b/src/headers/osTasks.h new file mode 100644 index 0000000..2865863 --- /dev/null +++ b/src/headers/osTasks.h @@ -0,0 +1,10 @@ +#ifndef OS_TASKS_H +#define OS_TASKS_H + +#include + +extern void initOSTasks(); + +extern Task* getPrinterTask(); + +#endif \ No newline at end of file diff --git a/src/headers/ports.h b/src/headers/ports.h new file mode 100644 index 0000000..716fd0a --- /dev/null +++ b/src/headers/ports.h @@ -0,0 +1,9 @@ +#ifndef PORTS_H +#define PORTS_H + +#include + +extern void outb(uint16_t port, uint8_t val); +extern uint8_t inb(uint16_t port); + +#endif \ No newline at end of file diff --git a/src/headers/stdio.h b/src/headers/stdio.h new file mode 100644 index 0000000..b5d4f87 --- /dev/null +++ b/src/headers/stdio.h @@ -0,0 +1,20 @@ +#ifndef STDIO_H +#define STDIO_H + +#include + +#define FRAMEBUFFER_LOCATION 0x000B8000 +#define VIDEO_WIDTH 80 +#define VIDEO_HEIGHT 25 + +extern void setTextStyle(uint8_t style); +extern void clearScreen(); +extern void printf(const char* format, ...); +extern void putCharAt(char c, uint8_t x, uint8_t y); +extern void putCharsAt(char* string, uint8_t x, uint8_t y); +extern void puts(char* string); +extern void putChars(char* string, uint32_t length); + +extern uint32_t strlen(char* string); + +#endif \ No newline at end of file diff --git a/src/headers/task.h b/src/headers/task.h new file mode 100644 index 0000000..0b8e1b4 --- /dev/null +++ b/src/headers/task.h @@ -0,0 +1,34 @@ +#ifndef TASK_H +#define TASK_H + +#include +#include + +extern void initTasking(); + +typedef struct __attribute__ ((packed)) { + uint32_t eax, ebx, ecx, edx, esi, edi, esp, ebp, eip, eflags, cr3; +} Registers; + +typedef struct Task { + Registers registers; // the register states for the task + struct Task *nextTask; // linked list of tasks that need to be done + void* stack; + Message* message; +} Task; + +extern void initTasking(); +extern void createTask(Task *task, uint32_t mainFunction, uint32_t flags, uint32_t *pagedir); + +extern void yield(); +extern void yields(); // yield, but schedule the currently running task +extern void switchTask(Registers *old, Registers *new); +extern void schedule(Task* task); // schedule a task to be run in the future +extern void destroyCurrentTask(); + +extern void setRunningTask(Task* task); // set the task currently executed +extern void sendMessage(Task* task, Message* message); + +extern Message* popMessage(Task* task); + +#endif \ No newline at end of file diff --git a/src/headers/tree-os.h b/src/headers/tree-os.h new file mode 100644 index 0000000..71476fe --- /dev/null +++ b/src/headers/tree-os.h @@ -0,0 +1,6 @@ +#ifndef TREE_OS_H +#define TREE_OS_H + +extern void drawLogo(); + +#endif \ No newline at end of file diff --git a/src/kernel/kernel.c b/src/kernel/kernel.c index cfdf333..d8ff7b8 100644 --- a/src/kernel/kernel.c +++ b/src/kernel/kernel.c @@ -1,10 +1,10 @@ #include -#include +#include #include -#include -#include -#include -#include +#include +#include +#include +#include extern uint32_t _kernel_end; diff --git a/src/kernel/lib/memory/alloc.h b/src/kernel/lib/memory/alloc.h deleted file mode 100644 index 42910ce..0000000 --- a/src/kernel/lib/memory/alloc.h +++ /dev/null @@ -1,28 +0,0 @@ -#ifndef ALLOC_H -#define ALLOC_H - -#include -#include - -typedef enum MemoryState { - FREE = 0, - IN_USE = 1 -} MemoryState; - -typedef struct MemoryBlock { - struct MemoryBlock* last; - struct MemoryBlock* next; - MemoryState state; - uint32_t size; - Task* task; -} MemoryBlock; - -extern void initMemoryAllocation(uint32_t kernelEnd); -extern void* malloc(uint32_t size); -extern void* mallocTask(uint32_t size, Task* task); -extern void free(void* location); -extern void printMemoryStack(); -extern void freeTaskAllocations(Task* task); -extern Task* getCurrentTask(); - -#endif \ No newline at end of file diff --git a/src/kernel/lib/ports.c b/src/kernel/lib/ports.c index b2a8fab..6cfbb2a 100644 --- a/src/kernel/lib/ports.c +++ b/src/kernel/lib/ports.c @@ -1,4 +1,4 @@ -#include +#include #include void outb(uint16_t port, uint8_t val) { diff --git a/src/kernel/lib/ports.h b/src/kernel/lib/ports.h deleted file mode 100644 index 716fd0a..0000000 --- a/src/kernel/lib/ports.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef PORTS_H -#define PORTS_H - -#include - -extern void outb(uint16_t port, uint8_t val); -extern uint8_t inb(uint16_t port); - -#endif \ No newline at end of file diff --git a/src/kernel/lib/task/message.h b/src/kernel/lib/task/message.h deleted file mode 100644 index 2f8ddbe..0000000 --- a/src/kernel/lib/task/message.h +++ /dev/null @@ -1,12 +0,0 @@ -#ifndef MESSAGE_H -#define MESSAGE_H - -#include - -typedef struct Message { - void* data; - uint32_t size; - struct Message* next; -} Message; - -#endif \ No newline at end of file diff --git a/src/kernel/lib/task/osTasks.c b/src/kernel/lib/task/osTasks.c index 439a26d..c3d6a43 100644 --- a/src/kernel/lib/task/osTasks.c +++ b/src/kernel/lib/task/osTasks.c @@ -1,8 +1,8 @@ -#include -#include -#include +#include +#include +#include #include -#include +#include Task mainTask; Task printerTask; diff --git a/src/kernel/lib/task/osTasks.h b/src/kernel/lib/task/osTasks.h deleted file mode 100644 index b1adecb..0000000 --- a/src/kernel/lib/task/osTasks.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef OS_TASKS_H -#define OS_TASKS_H - -#include - -extern void initOSTasks(); - -extern Task* getPrinterTask(); - -#endif \ No newline at end of file diff --git a/src/kernel/lib/task/task.c b/src/kernel/lib/task/task.c index 5d57403..e4201c5 100644 --- a/src/kernel/lib/task/task.c +++ b/src/kernel/lib/task/task.c @@ -1,6 +1,6 @@ -#include -#include -#include +#include +#include +#include #define STACK_SIZE 0xF000 diff --git a/src/kernel/lib/task/task.h b/src/kernel/lib/task/task.h deleted file mode 100644 index 0c5e1d0..0000000 --- a/src/kernel/lib/task/task.h +++ /dev/null @@ -1,34 +0,0 @@ -#ifndef TASK_H -#define TASK_H - -#include -#include - -extern void initTasking(); - -typedef struct __attribute__ ((packed)) { - uint32_t eax, ebx, ecx, edx, esi, edi, esp, ebp, eip, eflags, cr3; -} Registers; - -typedef struct Task { - Registers registers; // the register states for the task - struct Task *nextTask; // linked list of tasks that need to be done - void* stack; - Message* message; -} Task; - -extern void initTasking(); -extern void createTask(Task *task, uint32_t mainFunction, uint32_t flags, uint32_t *pagedir); - -extern void yield(); -extern void yields(); // yield, but schedule the currently running task -extern void switchTask(Registers *old, Registers *new); -extern void schedule(Task* task); // schedule a task to be run in the future -extern void destroyCurrentTask(); - -extern void setRunningTask(Task* task); // set the task currently executed -extern void sendMessage(Task* task, Message* message); - -extern Message* popMessage(Task* task); - -#endif \ No newline at end of file diff --git a/src/kernel/lib/textMode/cursor.c b/src/kernel/lib/textMode/cursor.c index eb9bd36..e5cc8f9 100644 --- a/src/kernel/lib/textMode/cursor.c +++ b/src/kernel/lib/textMode/cursor.c @@ -1,7 +1,7 @@ #include -#include -#include -#include +#include +#include +#include void setCursorOffset(uint16_t offset) { outb(0x3D4, 0x0F); diff --git a/src/kernel/lib/textMode/cursor.h b/src/kernel/lib/textMode/cursor.h deleted file mode 100644 index 30f91c1..0000000 --- a/src/kernel/lib/textMode/cursor.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef CURSOR_H -#define CURSOR_H - -#include - -extern void setCursorOffset(uint16_t offset); -extern void setCursorPosition(uint8_t x, uint8_t y); -extern uint16_t getCursorOffset(); - -#endif \ No newline at end of file diff --git a/src/kernel/lib/textMode/stdio.c b/src/kernel/lib/textMode/stdio.c index 747a710..5f1b3a0 100644 --- a/src/kernel/lib/textMode/stdio.c +++ b/src/kernel/lib/textMode/stdio.c @@ -1,12 +1,12 @@ #include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include uint16_t* framebuffer = (uint16_t*) FRAMEBUFFER_LOCATION; char format = 0x0F; diff --git a/src/kernel/lib/textMode/stdio.h b/src/kernel/lib/textMode/stdio.h deleted file mode 100644 index b5d4f87..0000000 --- a/src/kernel/lib/textMode/stdio.h +++ /dev/null @@ -1,20 +0,0 @@ -#ifndef STDIO_H -#define STDIO_H - -#include - -#define FRAMEBUFFER_LOCATION 0x000B8000 -#define VIDEO_WIDTH 80 -#define VIDEO_HEIGHT 25 - -extern void setTextStyle(uint8_t style); -extern void clearScreen(); -extern void printf(const char* format, ...); -extern void putCharAt(char c, uint8_t x, uint8_t y); -extern void putCharsAt(char* string, uint8_t x, uint8_t y); -extern void puts(char* string); -extern void putChars(char* string, uint32_t length); - -extern uint32_t strlen(char* string); - -#endif \ No newline at end of file diff --git a/src/kernel/multiboot.h b/src/kernel/multiboot.h deleted file mode 100644 index c6f5ff8..0000000 --- a/src/kernel/multiboot.h +++ /dev/null @@ -1,274 +0,0 @@ -/* multiboot.h - Multiboot header file. */ -/* Copyright (C) 1999,2003,2007,2008,2009,2010 Free Software Foundation, Inc. - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to - * deal in the Software without restriction, including without limitation the - * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or - * sell copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL ANY - * DEVELOPER OR DISTRIBUTOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, - * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR - * IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -#ifndef MULTIBOOT_HEADER -#define MULTIBOOT_HEADER 1 - -/* How many bytes from the start of the file we search for the header. */ -#define MULTIBOOT_SEARCH 8192 -#define MULTIBOOT_HEADER_ALIGN 4 - -/* The magic field should contain this. */ -#define MULTIBOOT_HEADER_MAGIC 0x1BADB002 - -/* This should be in %eax. */ -#define MULTIBOOT_BOOTLOADER_MAGIC 0x2BADB002 - -/* Alignment of multiboot modules. */ -#define MULTIBOOT_MOD_ALIGN 0x00001000 - -/* Alignment of the multiboot info structure. */ -#define MULTIBOOT_INFO_ALIGN 0x00000004 - -/* Flags set in the ’flags’ member of the multiboot header. */ - -/* Align all boot modules on i386 page (4KB) boundaries. */ -#define MULTIBOOT_PAGE_ALIGN 0x00000001 - -/* Must pass memory information to OS. */ -#define MULTIBOOT_MEMORY_INFO 0x00000002 - -/* Must pass video information to OS. */ -#define MULTIBOOT_VIDEO_MODE 0x00000004 - -/* This flag indicates the use of the address fields in the header. */ -#define MULTIBOOT_AOUT_KLUDGE 0x00010000 - -/* Flags to be set in the ’flags’ member of the multiboot info structure. */ - -/* is there basic lower/upper memory information? */ -#define MULTIBOOT_INFO_MEMORY 0x00000001 -/* is there a boot device set? */ -#define MULTIBOOT_INFO_BOOTDEV 0x00000002 -/* is the command-line defined? */ -#define MULTIBOOT_INFO_CMDLINE 0x00000004 -/* are there modules to do something with? */ -#define MULTIBOOT_INFO_MODS 0x00000008 - -/* These next two are mutually exclusive */ - -/* is there a symbol table loaded? */ -#define MULTIBOOT_INFO_AOUT_SYMS 0x00000010 -/* is there an ELF section header table? */ -#define MULTIBOOT_INFO_ELF_SHDR 0X00000020 - -/* is there a full memory map? */ -#define MULTIBOOT_INFO_MEM_MAP 0x00000040 - -/* Is there drive info? */ -#define MULTIBOOT_INFO_DRIVE_INFO 0x00000080 - -/* Is there a config table? */ -#define MULTIBOOT_INFO_CONFIG_TABLE 0x00000100 - -/* Is there a boot loader name? */ -#define MULTIBOOT_INFO_BOOT_LOADER_NAME 0x00000200 - -/* Is there a APM table? */ -#define MULTIBOOT_INFO_APM_TABLE 0x00000400 - -/* Is there video information? */ -#define MULTIBOOT_INFO_VBE_INFO 0x00000800 -#define MULTIBOOT_INFO_FRAMEBUFFER_INFO 0x00001000 - -#ifndef ASM_FILE - -typedef unsigned char multiboot_uint8_t; -typedef unsigned short multiboot_uint16_t; -typedef unsigned int multiboot_uint32_t; -typedef unsigned long long multiboot_uint64_t; - -struct multiboot_header -{ - /* Must be MULTIBOOT_MAGIC - see above. */ - multiboot_uint32_t magic; - - /* Feature flags. */ - multiboot_uint32_t flags; - - /* The above fields plus this one must equal 0 mod 2^32. */ - multiboot_uint32_t checksum; - - /* These are only valid if MULTIBOOT_AOUT_KLUDGE is set. */ - multiboot_uint32_t header_addr; - multiboot_uint32_t load_addr; - multiboot_uint32_t load_end_addr; - multiboot_uint32_t bss_end_addr; - multiboot_uint32_t entry_addr; - - /* These are only valid if MULTIBOOT_VIDEO_MODE is set. */ - multiboot_uint32_t mode_type; - multiboot_uint32_t width; - multiboot_uint32_t height; - multiboot_uint32_t depth; -}; - -/* The symbol table for a.out. */ -struct multiboot_aout_symbol_table -{ - multiboot_uint32_t tabsize; - multiboot_uint32_t strsize; - multiboot_uint32_t addr; - multiboot_uint32_t reserved; -}; -typedef struct multiboot_aout_symbol_table multiboot_aout_symbol_table_t; - -/* The section header table for ELF. */ -struct multiboot_elf_section_header_table -{ - multiboot_uint32_t num; - multiboot_uint32_t size; - multiboot_uint32_t addr; - multiboot_uint32_t shndx; -}; -typedef struct multiboot_elf_section_header_table multiboot_elf_section_header_table_t; - -struct multiboot_info -{ - /* Multiboot info version number */ - multiboot_uint32_t flags; - - /* Available memory from BIOS */ - multiboot_uint32_t mem_lower; - multiboot_uint32_t mem_upper; - - /* "root" partition */ - multiboot_uint32_t boot_device; - - /* Kernel command line */ - multiboot_uint32_t cmdline; - - /* Boot-Module list */ - multiboot_uint32_t mods_count; - multiboot_uint32_t mods_addr; - - union - { - multiboot_aout_symbol_table_t aout_sym; - multiboot_elf_section_header_table_t elf_sec; - } u; - - /* Memory Mapping buffer */ - multiboot_uint32_t mmap_length; - multiboot_uint32_t mmap_addr; - - /* Drive Info buffer */ - multiboot_uint32_t drives_length; - multiboot_uint32_t drives_addr; - - /* ROM configuration table */ - multiboot_uint32_t config_table; - - /* Boot Loader Name */ - multiboot_uint32_t boot_loader_name; - - /* APM table */ - multiboot_uint32_t apm_table; - - /* Video */ - multiboot_uint32_t vbe_control_info; - multiboot_uint32_t vbe_mode_info; - multiboot_uint16_t vbe_mode; - multiboot_uint16_t vbe_interface_seg; - multiboot_uint16_t vbe_interface_off; - multiboot_uint16_t vbe_interface_len; - - multiboot_uint64_t framebuffer_addr; - multiboot_uint32_t framebuffer_pitch; - multiboot_uint32_t framebuffer_width; - multiboot_uint32_t framebuffer_height; - multiboot_uint8_t framebuffer_bpp; -#define MULTIBOOT_FRAMEBUFFER_TYPE_INDEXED 0 -#define MULTIBOOT_FRAMEBUFFER_TYPE_RGB 1 -#define MULTIBOOT_FRAMEBUFFER_TYPE_EGA_TEXT 2 - multiboot_uint8_t framebuffer_type; - union - { - struct - { - multiboot_uint32_t framebuffer_palette_addr; - multiboot_uint16_t framebuffer_palette_num_colors; - }; - struct - { - multiboot_uint8_t framebuffer_red_field_position; - multiboot_uint8_t framebuffer_red_mask_size; - multiboot_uint8_t framebuffer_green_field_position; - multiboot_uint8_t framebuffer_green_mask_size; - multiboot_uint8_t framebuffer_blue_field_position; - multiboot_uint8_t framebuffer_blue_mask_size; - }; - }; -}; -typedef struct multiboot_info multiboot_info_t; - -struct multiboot_color -{ - multiboot_uint8_t red; - multiboot_uint8_t green; - multiboot_uint8_t blue; -}; - -struct multiboot_mmap_entry -{ - multiboot_uint32_t size; - multiboot_uint64_t addr; - multiboot_uint64_t len; -#define MULTIBOOT_MEMORY_AVAILABLE 1 -#define MULTIBOOT_MEMORY_RESERVED 2 -#define MULTIBOOT_MEMORY_ACPI_RECLAIMABLE 3 -#define MULTIBOOT_MEMORY_NVS 4 -#define MULTIBOOT_MEMORY_BADRAM 5 - multiboot_uint32_t type; -} __attribute__((packed)); -typedef struct multiboot_mmap_entry multiboot_memory_map_t; - -struct multiboot_mod_list -{ - /* the memory used goes from bytes ’mod_start’ to ’mod_end-1’ inclusive */ - multiboot_uint32_t mod_start; - multiboot_uint32_t mod_end; - - /* Module command line */ - multiboot_uint32_t cmdline; - - /* padding to take it to 16 bytes (must be zero) */ - multiboot_uint32_t pad; -}; -typedef struct multiboot_mod_list multiboot_module_t; - -/* APM BIOS info. */ -struct multiboot_apm_info -{ - multiboot_uint16_t version; - multiboot_uint16_t cseg; - multiboot_uint32_t offset; - multiboot_uint16_t cseg_16; - multiboot_uint16_t dseg; - multiboot_uint16_t flags; - multiboot_uint16_t cseg_len; - multiboot_uint16_t cseg_16_len; - multiboot_uint16_t dseg_len; -}; - -#endif /* ! ASM_FILE */ - -#endif /* ! MULTIBOOT_HEADER */ \ No newline at end of file diff --git a/src/kernel/tree-os.c b/src/kernel/tree-os.c index 3c7efcc..913bb93 100644 --- a/src/kernel/tree-os.c +++ b/src/kernel/tree-os.c @@ -1,5 +1,5 @@ #include -#include +#include const char* logo = "\ _______ \n\ diff --git a/Makefile b/Makefile index e0b541a..0a31a7a 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ CC = i686-elf-gcc -CCFLAGS = -m32 -mtune=generic -ffreestanding -nostdlib -c -I src/kernel +CCFLAGS = -m32 -mtune=generic -ffreestanding -nostdlib -c -I src/headers LD = i686-elf-ld LD_FLAGS = -z max-page-size=0x1000 -T linker.ld AS = nasm diff --git a/src/headers/alloc.h b/src/headers/alloc.h new file mode 100644 index 0000000..82023d4 --- /dev/null +++ b/src/headers/alloc.h @@ -0,0 +1,28 @@ +#ifndef ALLOC_H +#define ALLOC_H + +#include +#include + +typedef enum MemoryState { + FREE = 0, + IN_USE = 1 +} MemoryState; + +typedef struct MemoryBlock { + struct MemoryBlock* last; + struct MemoryBlock* next; + MemoryState state; + uint32_t size; + Task* task; +} MemoryBlock; + +extern void initMemoryAllocation(uint32_t kernelEnd); +extern void* malloc(uint32_t size); +extern void* mallocTask(uint32_t size, Task* task); +extern void free(void* location); +extern void printMemoryStack(); +extern void freeTaskAllocations(Task* task); +extern Task* getCurrentTask(); + +#endif \ No newline at end of file diff --git a/src/headers/cursor.h b/src/headers/cursor.h new file mode 100644 index 0000000..30f91c1 --- /dev/null +++ b/src/headers/cursor.h @@ -0,0 +1,10 @@ +#ifndef CURSOR_H +#define CURSOR_H + +#include + +extern void setCursorOffset(uint16_t offset); +extern void setCursorPosition(uint8_t x, uint8_t y); +extern uint16_t getCursorOffset(); + +#endif \ No newline at end of file diff --git a/src/headers/message.h b/src/headers/message.h new file mode 100644 index 0000000..2f8ddbe --- /dev/null +++ b/src/headers/message.h @@ -0,0 +1,12 @@ +#ifndef MESSAGE_H +#define MESSAGE_H + +#include + +typedef struct Message { + void* data; + uint32_t size; + struct Message* next; +} Message; + +#endif \ No newline at end of file diff --git a/src/headers/osTasks.h b/src/headers/osTasks.h new file mode 100644 index 0000000..2865863 --- /dev/null +++ b/src/headers/osTasks.h @@ -0,0 +1,10 @@ +#ifndef OS_TASKS_H +#define OS_TASKS_H + +#include + +extern void initOSTasks(); + +extern Task* getPrinterTask(); + +#endif \ No newline at end of file diff --git a/src/headers/ports.h b/src/headers/ports.h new file mode 100644 index 0000000..716fd0a --- /dev/null +++ b/src/headers/ports.h @@ -0,0 +1,9 @@ +#ifndef PORTS_H +#define PORTS_H + +#include + +extern void outb(uint16_t port, uint8_t val); +extern uint8_t inb(uint16_t port); + +#endif \ No newline at end of file diff --git a/src/headers/stdio.h b/src/headers/stdio.h new file mode 100644 index 0000000..b5d4f87 --- /dev/null +++ b/src/headers/stdio.h @@ -0,0 +1,20 @@ +#ifndef STDIO_H +#define STDIO_H + +#include + +#define FRAMEBUFFER_LOCATION 0x000B8000 +#define VIDEO_WIDTH 80 +#define VIDEO_HEIGHT 25 + +extern void setTextStyle(uint8_t style); +extern void clearScreen(); +extern void printf(const char* format, ...); +extern void putCharAt(char c, uint8_t x, uint8_t y); +extern void putCharsAt(char* string, uint8_t x, uint8_t y); +extern void puts(char* string); +extern void putChars(char* string, uint32_t length); + +extern uint32_t strlen(char* string); + +#endif \ No newline at end of file diff --git a/src/headers/task.h b/src/headers/task.h new file mode 100644 index 0000000..0b8e1b4 --- /dev/null +++ b/src/headers/task.h @@ -0,0 +1,34 @@ +#ifndef TASK_H +#define TASK_H + +#include +#include + +extern void initTasking(); + +typedef struct __attribute__ ((packed)) { + uint32_t eax, ebx, ecx, edx, esi, edi, esp, ebp, eip, eflags, cr3; +} Registers; + +typedef struct Task { + Registers registers; // the register states for the task + struct Task *nextTask; // linked list of tasks that need to be done + void* stack; + Message* message; +} Task; + +extern void initTasking(); +extern void createTask(Task *task, uint32_t mainFunction, uint32_t flags, uint32_t *pagedir); + +extern void yield(); +extern void yields(); // yield, but schedule the currently running task +extern void switchTask(Registers *old, Registers *new); +extern void schedule(Task* task); // schedule a task to be run in the future +extern void destroyCurrentTask(); + +extern void setRunningTask(Task* task); // set the task currently executed +extern void sendMessage(Task* task, Message* message); + +extern Message* popMessage(Task* task); + +#endif \ No newline at end of file diff --git a/src/headers/tree-os.h b/src/headers/tree-os.h new file mode 100644 index 0000000..71476fe --- /dev/null +++ b/src/headers/tree-os.h @@ -0,0 +1,6 @@ +#ifndef TREE_OS_H +#define TREE_OS_H + +extern void drawLogo(); + +#endif \ No newline at end of file diff --git a/src/kernel/kernel.c b/src/kernel/kernel.c index cfdf333..d8ff7b8 100644 --- a/src/kernel/kernel.c +++ b/src/kernel/kernel.c @@ -1,10 +1,10 @@ #include -#include +#include #include -#include -#include -#include -#include +#include +#include +#include +#include extern uint32_t _kernel_end; diff --git a/src/kernel/lib/memory/alloc.h b/src/kernel/lib/memory/alloc.h deleted file mode 100644 index 42910ce..0000000 --- a/src/kernel/lib/memory/alloc.h +++ /dev/null @@ -1,28 +0,0 @@ -#ifndef ALLOC_H -#define ALLOC_H - -#include -#include - -typedef enum MemoryState { - FREE = 0, - IN_USE = 1 -} MemoryState; - -typedef struct MemoryBlock { - struct MemoryBlock* last; - struct MemoryBlock* next; - MemoryState state; - uint32_t size; - Task* task; -} MemoryBlock; - -extern void initMemoryAllocation(uint32_t kernelEnd); -extern void* malloc(uint32_t size); -extern void* mallocTask(uint32_t size, Task* task); -extern void free(void* location); -extern void printMemoryStack(); -extern void freeTaskAllocations(Task* task); -extern Task* getCurrentTask(); - -#endif \ No newline at end of file diff --git a/src/kernel/lib/ports.c b/src/kernel/lib/ports.c index b2a8fab..6cfbb2a 100644 --- a/src/kernel/lib/ports.c +++ b/src/kernel/lib/ports.c @@ -1,4 +1,4 @@ -#include +#include #include void outb(uint16_t port, uint8_t val) { diff --git a/src/kernel/lib/ports.h b/src/kernel/lib/ports.h deleted file mode 100644 index 716fd0a..0000000 --- a/src/kernel/lib/ports.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef PORTS_H -#define PORTS_H - -#include - -extern void outb(uint16_t port, uint8_t val); -extern uint8_t inb(uint16_t port); - -#endif \ No newline at end of file diff --git a/src/kernel/lib/task/message.h b/src/kernel/lib/task/message.h deleted file mode 100644 index 2f8ddbe..0000000 --- a/src/kernel/lib/task/message.h +++ /dev/null @@ -1,12 +0,0 @@ -#ifndef MESSAGE_H -#define MESSAGE_H - -#include - -typedef struct Message { - void* data; - uint32_t size; - struct Message* next; -} Message; - -#endif \ No newline at end of file diff --git a/src/kernel/lib/task/osTasks.c b/src/kernel/lib/task/osTasks.c index 439a26d..c3d6a43 100644 --- a/src/kernel/lib/task/osTasks.c +++ b/src/kernel/lib/task/osTasks.c @@ -1,8 +1,8 @@ -#include -#include -#include +#include +#include +#include #include -#include +#include Task mainTask; Task printerTask; diff --git a/src/kernel/lib/task/osTasks.h b/src/kernel/lib/task/osTasks.h deleted file mode 100644 index b1adecb..0000000 --- a/src/kernel/lib/task/osTasks.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef OS_TASKS_H -#define OS_TASKS_H - -#include - -extern void initOSTasks(); - -extern Task* getPrinterTask(); - -#endif \ No newline at end of file diff --git a/src/kernel/lib/task/task.c b/src/kernel/lib/task/task.c index 5d57403..e4201c5 100644 --- a/src/kernel/lib/task/task.c +++ b/src/kernel/lib/task/task.c @@ -1,6 +1,6 @@ -#include -#include -#include +#include +#include +#include #define STACK_SIZE 0xF000 diff --git a/src/kernel/lib/task/task.h b/src/kernel/lib/task/task.h deleted file mode 100644 index 0c5e1d0..0000000 --- a/src/kernel/lib/task/task.h +++ /dev/null @@ -1,34 +0,0 @@ -#ifndef TASK_H -#define TASK_H - -#include -#include - -extern void initTasking(); - -typedef struct __attribute__ ((packed)) { - uint32_t eax, ebx, ecx, edx, esi, edi, esp, ebp, eip, eflags, cr3; -} Registers; - -typedef struct Task { - Registers registers; // the register states for the task - struct Task *nextTask; // linked list of tasks that need to be done - void* stack; - Message* message; -} Task; - -extern void initTasking(); -extern void createTask(Task *task, uint32_t mainFunction, uint32_t flags, uint32_t *pagedir); - -extern void yield(); -extern void yields(); // yield, but schedule the currently running task -extern void switchTask(Registers *old, Registers *new); -extern void schedule(Task* task); // schedule a task to be run in the future -extern void destroyCurrentTask(); - -extern void setRunningTask(Task* task); // set the task currently executed -extern void sendMessage(Task* task, Message* message); - -extern Message* popMessage(Task* task); - -#endif \ No newline at end of file diff --git a/src/kernel/lib/textMode/cursor.c b/src/kernel/lib/textMode/cursor.c index eb9bd36..e5cc8f9 100644 --- a/src/kernel/lib/textMode/cursor.c +++ b/src/kernel/lib/textMode/cursor.c @@ -1,7 +1,7 @@ #include -#include -#include -#include +#include +#include +#include void setCursorOffset(uint16_t offset) { outb(0x3D4, 0x0F); diff --git a/src/kernel/lib/textMode/cursor.h b/src/kernel/lib/textMode/cursor.h deleted file mode 100644 index 30f91c1..0000000 --- a/src/kernel/lib/textMode/cursor.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef CURSOR_H -#define CURSOR_H - -#include - -extern void setCursorOffset(uint16_t offset); -extern void setCursorPosition(uint8_t x, uint8_t y); -extern uint16_t getCursorOffset(); - -#endif \ No newline at end of file diff --git a/src/kernel/lib/textMode/stdio.c b/src/kernel/lib/textMode/stdio.c index 747a710..5f1b3a0 100644 --- a/src/kernel/lib/textMode/stdio.c +++ b/src/kernel/lib/textMode/stdio.c @@ -1,12 +1,12 @@ #include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include uint16_t* framebuffer = (uint16_t*) FRAMEBUFFER_LOCATION; char format = 0x0F; diff --git a/src/kernel/lib/textMode/stdio.h b/src/kernel/lib/textMode/stdio.h deleted file mode 100644 index b5d4f87..0000000 --- a/src/kernel/lib/textMode/stdio.h +++ /dev/null @@ -1,20 +0,0 @@ -#ifndef STDIO_H -#define STDIO_H - -#include - -#define FRAMEBUFFER_LOCATION 0x000B8000 -#define VIDEO_WIDTH 80 -#define VIDEO_HEIGHT 25 - -extern void setTextStyle(uint8_t style); -extern void clearScreen(); -extern void printf(const char* format, ...); -extern void putCharAt(char c, uint8_t x, uint8_t y); -extern void putCharsAt(char* string, uint8_t x, uint8_t y); -extern void puts(char* string); -extern void putChars(char* string, uint32_t length); - -extern uint32_t strlen(char* string); - -#endif \ No newline at end of file diff --git a/src/kernel/multiboot.h b/src/kernel/multiboot.h deleted file mode 100644 index c6f5ff8..0000000 --- a/src/kernel/multiboot.h +++ /dev/null @@ -1,274 +0,0 @@ -/* multiboot.h - Multiboot header file. */ -/* Copyright (C) 1999,2003,2007,2008,2009,2010 Free Software Foundation, Inc. - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to - * deal in the Software without restriction, including without limitation the - * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or - * sell copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL ANY - * DEVELOPER OR DISTRIBUTOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, - * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR - * IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -#ifndef MULTIBOOT_HEADER -#define MULTIBOOT_HEADER 1 - -/* How many bytes from the start of the file we search for the header. */ -#define MULTIBOOT_SEARCH 8192 -#define MULTIBOOT_HEADER_ALIGN 4 - -/* The magic field should contain this. */ -#define MULTIBOOT_HEADER_MAGIC 0x1BADB002 - -/* This should be in %eax. */ -#define MULTIBOOT_BOOTLOADER_MAGIC 0x2BADB002 - -/* Alignment of multiboot modules. */ -#define MULTIBOOT_MOD_ALIGN 0x00001000 - -/* Alignment of the multiboot info structure. */ -#define MULTIBOOT_INFO_ALIGN 0x00000004 - -/* Flags set in the ’flags’ member of the multiboot header. */ - -/* Align all boot modules on i386 page (4KB) boundaries. */ -#define MULTIBOOT_PAGE_ALIGN 0x00000001 - -/* Must pass memory information to OS. */ -#define MULTIBOOT_MEMORY_INFO 0x00000002 - -/* Must pass video information to OS. */ -#define MULTIBOOT_VIDEO_MODE 0x00000004 - -/* This flag indicates the use of the address fields in the header. */ -#define MULTIBOOT_AOUT_KLUDGE 0x00010000 - -/* Flags to be set in the ’flags’ member of the multiboot info structure. */ - -/* is there basic lower/upper memory information? */ -#define MULTIBOOT_INFO_MEMORY 0x00000001 -/* is there a boot device set? */ -#define MULTIBOOT_INFO_BOOTDEV 0x00000002 -/* is the command-line defined? */ -#define MULTIBOOT_INFO_CMDLINE 0x00000004 -/* are there modules to do something with? */ -#define MULTIBOOT_INFO_MODS 0x00000008 - -/* These next two are mutually exclusive */ - -/* is there a symbol table loaded? */ -#define MULTIBOOT_INFO_AOUT_SYMS 0x00000010 -/* is there an ELF section header table? */ -#define MULTIBOOT_INFO_ELF_SHDR 0X00000020 - -/* is there a full memory map? */ -#define MULTIBOOT_INFO_MEM_MAP 0x00000040 - -/* Is there drive info? */ -#define MULTIBOOT_INFO_DRIVE_INFO 0x00000080 - -/* Is there a config table? */ -#define MULTIBOOT_INFO_CONFIG_TABLE 0x00000100 - -/* Is there a boot loader name? */ -#define MULTIBOOT_INFO_BOOT_LOADER_NAME 0x00000200 - -/* Is there a APM table? */ -#define MULTIBOOT_INFO_APM_TABLE 0x00000400 - -/* Is there video information? */ -#define MULTIBOOT_INFO_VBE_INFO 0x00000800 -#define MULTIBOOT_INFO_FRAMEBUFFER_INFO 0x00001000 - -#ifndef ASM_FILE - -typedef unsigned char multiboot_uint8_t; -typedef unsigned short multiboot_uint16_t; -typedef unsigned int multiboot_uint32_t; -typedef unsigned long long multiboot_uint64_t; - -struct multiboot_header -{ - /* Must be MULTIBOOT_MAGIC - see above. */ - multiboot_uint32_t magic; - - /* Feature flags. */ - multiboot_uint32_t flags; - - /* The above fields plus this one must equal 0 mod 2^32. */ - multiboot_uint32_t checksum; - - /* These are only valid if MULTIBOOT_AOUT_KLUDGE is set. */ - multiboot_uint32_t header_addr; - multiboot_uint32_t load_addr; - multiboot_uint32_t load_end_addr; - multiboot_uint32_t bss_end_addr; - multiboot_uint32_t entry_addr; - - /* These are only valid if MULTIBOOT_VIDEO_MODE is set. */ - multiboot_uint32_t mode_type; - multiboot_uint32_t width; - multiboot_uint32_t height; - multiboot_uint32_t depth; -}; - -/* The symbol table for a.out. */ -struct multiboot_aout_symbol_table -{ - multiboot_uint32_t tabsize; - multiboot_uint32_t strsize; - multiboot_uint32_t addr; - multiboot_uint32_t reserved; -}; -typedef struct multiboot_aout_symbol_table multiboot_aout_symbol_table_t; - -/* The section header table for ELF. */ -struct multiboot_elf_section_header_table -{ - multiboot_uint32_t num; - multiboot_uint32_t size; - multiboot_uint32_t addr; - multiboot_uint32_t shndx; -}; -typedef struct multiboot_elf_section_header_table multiboot_elf_section_header_table_t; - -struct multiboot_info -{ - /* Multiboot info version number */ - multiboot_uint32_t flags; - - /* Available memory from BIOS */ - multiboot_uint32_t mem_lower; - multiboot_uint32_t mem_upper; - - /* "root" partition */ - multiboot_uint32_t boot_device; - - /* Kernel command line */ - multiboot_uint32_t cmdline; - - /* Boot-Module list */ - multiboot_uint32_t mods_count; - multiboot_uint32_t mods_addr; - - union - { - multiboot_aout_symbol_table_t aout_sym; - multiboot_elf_section_header_table_t elf_sec; - } u; - - /* Memory Mapping buffer */ - multiboot_uint32_t mmap_length; - multiboot_uint32_t mmap_addr; - - /* Drive Info buffer */ - multiboot_uint32_t drives_length; - multiboot_uint32_t drives_addr; - - /* ROM configuration table */ - multiboot_uint32_t config_table; - - /* Boot Loader Name */ - multiboot_uint32_t boot_loader_name; - - /* APM table */ - multiboot_uint32_t apm_table; - - /* Video */ - multiboot_uint32_t vbe_control_info; - multiboot_uint32_t vbe_mode_info; - multiboot_uint16_t vbe_mode; - multiboot_uint16_t vbe_interface_seg; - multiboot_uint16_t vbe_interface_off; - multiboot_uint16_t vbe_interface_len; - - multiboot_uint64_t framebuffer_addr; - multiboot_uint32_t framebuffer_pitch; - multiboot_uint32_t framebuffer_width; - multiboot_uint32_t framebuffer_height; - multiboot_uint8_t framebuffer_bpp; -#define MULTIBOOT_FRAMEBUFFER_TYPE_INDEXED 0 -#define MULTIBOOT_FRAMEBUFFER_TYPE_RGB 1 -#define MULTIBOOT_FRAMEBUFFER_TYPE_EGA_TEXT 2 - multiboot_uint8_t framebuffer_type; - union - { - struct - { - multiboot_uint32_t framebuffer_palette_addr; - multiboot_uint16_t framebuffer_palette_num_colors; - }; - struct - { - multiboot_uint8_t framebuffer_red_field_position; - multiboot_uint8_t framebuffer_red_mask_size; - multiboot_uint8_t framebuffer_green_field_position; - multiboot_uint8_t framebuffer_green_mask_size; - multiboot_uint8_t framebuffer_blue_field_position; - multiboot_uint8_t framebuffer_blue_mask_size; - }; - }; -}; -typedef struct multiboot_info multiboot_info_t; - -struct multiboot_color -{ - multiboot_uint8_t red; - multiboot_uint8_t green; - multiboot_uint8_t blue; -}; - -struct multiboot_mmap_entry -{ - multiboot_uint32_t size; - multiboot_uint64_t addr; - multiboot_uint64_t len; -#define MULTIBOOT_MEMORY_AVAILABLE 1 -#define MULTIBOOT_MEMORY_RESERVED 2 -#define MULTIBOOT_MEMORY_ACPI_RECLAIMABLE 3 -#define MULTIBOOT_MEMORY_NVS 4 -#define MULTIBOOT_MEMORY_BADRAM 5 - multiboot_uint32_t type; -} __attribute__((packed)); -typedef struct multiboot_mmap_entry multiboot_memory_map_t; - -struct multiboot_mod_list -{ - /* the memory used goes from bytes ’mod_start’ to ’mod_end-1’ inclusive */ - multiboot_uint32_t mod_start; - multiboot_uint32_t mod_end; - - /* Module command line */ - multiboot_uint32_t cmdline; - - /* padding to take it to 16 bytes (must be zero) */ - multiboot_uint32_t pad; -}; -typedef struct multiboot_mod_list multiboot_module_t; - -/* APM BIOS info. */ -struct multiboot_apm_info -{ - multiboot_uint16_t version; - multiboot_uint16_t cseg; - multiboot_uint32_t offset; - multiboot_uint16_t cseg_16; - multiboot_uint16_t dseg; - multiboot_uint16_t flags; - multiboot_uint16_t cseg_len; - multiboot_uint16_t cseg_16_len; - multiboot_uint16_t dseg_len; -}; - -#endif /* ! ASM_FILE */ - -#endif /* ! MULTIBOOT_HEADER */ \ No newline at end of file diff --git a/src/kernel/tree-os.c b/src/kernel/tree-os.c index 3c7efcc..913bb93 100644 --- a/src/kernel/tree-os.c +++ b/src/kernel/tree-os.c @@ -1,5 +1,5 @@ #include -#include +#include const char* logo = "\ _______ \n\ diff --git a/src/kernel/tree-os.h b/src/kernel/tree-os.h deleted file mode 100644 index 71476fe..0000000 --- a/src/kernel/tree-os.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef TREE_OS_H -#define TREE_OS_H - -extern void drawLogo(); - -#endif \ No newline at end of file diff --git a/Makefile b/Makefile index e0b541a..0a31a7a 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ CC = i686-elf-gcc -CCFLAGS = -m32 -mtune=generic -ffreestanding -nostdlib -c -I src/kernel +CCFLAGS = -m32 -mtune=generic -ffreestanding -nostdlib -c -I src/headers LD = i686-elf-ld LD_FLAGS = -z max-page-size=0x1000 -T linker.ld AS = nasm diff --git a/src/headers/alloc.h b/src/headers/alloc.h new file mode 100644 index 0000000..82023d4 --- /dev/null +++ b/src/headers/alloc.h @@ -0,0 +1,28 @@ +#ifndef ALLOC_H +#define ALLOC_H + +#include +#include + +typedef enum MemoryState { + FREE = 0, + IN_USE = 1 +} MemoryState; + +typedef struct MemoryBlock { + struct MemoryBlock* last; + struct MemoryBlock* next; + MemoryState state; + uint32_t size; + Task* task; +} MemoryBlock; + +extern void initMemoryAllocation(uint32_t kernelEnd); +extern void* malloc(uint32_t size); +extern void* mallocTask(uint32_t size, Task* task); +extern void free(void* location); +extern void printMemoryStack(); +extern void freeTaskAllocations(Task* task); +extern Task* getCurrentTask(); + +#endif \ No newline at end of file diff --git a/src/headers/cursor.h b/src/headers/cursor.h new file mode 100644 index 0000000..30f91c1 --- /dev/null +++ b/src/headers/cursor.h @@ -0,0 +1,10 @@ +#ifndef CURSOR_H +#define CURSOR_H + +#include + +extern void setCursorOffset(uint16_t offset); +extern void setCursorPosition(uint8_t x, uint8_t y); +extern uint16_t getCursorOffset(); + +#endif \ No newline at end of file diff --git a/src/headers/message.h b/src/headers/message.h new file mode 100644 index 0000000..2f8ddbe --- /dev/null +++ b/src/headers/message.h @@ -0,0 +1,12 @@ +#ifndef MESSAGE_H +#define MESSAGE_H + +#include + +typedef struct Message { + void* data; + uint32_t size; + struct Message* next; +} Message; + +#endif \ No newline at end of file diff --git a/src/headers/osTasks.h b/src/headers/osTasks.h new file mode 100644 index 0000000..2865863 --- /dev/null +++ b/src/headers/osTasks.h @@ -0,0 +1,10 @@ +#ifndef OS_TASKS_H +#define OS_TASKS_H + +#include + +extern void initOSTasks(); + +extern Task* getPrinterTask(); + +#endif \ No newline at end of file diff --git a/src/headers/ports.h b/src/headers/ports.h new file mode 100644 index 0000000..716fd0a --- /dev/null +++ b/src/headers/ports.h @@ -0,0 +1,9 @@ +#ifndef PORTS_H +#define PORTS_H + +#include + +extern void outb(uint16_t port, uint8_t val); +extern uint8_t inb(uint16_t port); + +#endif \ No newline at end of file diff --git a/src/headers/stdio.h b/src/headers/stdio.h new file mode 100644 index 0000000..b5d4f87 --- /dev/null +++ b/src/headers/stdio.h @@ -0,0 +1,20 @@ +#ifndef STDIO_H +#define STDIO_H + +#include + +#define FRAMEBUFFER_LOCATION 0x000B8000 +#define VIDEO_WIDTH 80 +#define VIDEO_HEIGHT 25 + +extern void setTextStyle(uint8_t style); +extern void clearScreen(); +extern void printf(const char* format, ...); +extern void putCharAt(char c, uint8_t x, uint8_t y); +extern void putCharsAt(char* string, uint8_t x, uint8_t y); +extern void puts(char* string); +extern void putChars(char* string, uint32_t length); + +extern uint32_t strlen(char* string); + +#endif \ No newline at end of file diff --git a/src/headers/task.h b/src/headers/task.h new file mode 100644 index 0000000..0b8e1b4 --- /dev/null +++ b/src/headers/task.h @@ -0,0 +1,34 @@ +#ifndef TASK_H +#define TASK_H + +#include +#include + +extern void initTasking(); + +typedef struct __attribute__ ((packed)) { + uint32_t eax, ebx, ecx, edx, esi, edi, esp, ebp, eip, eflags, cr3; +} Registers; + +typedef struct Task { + Registers registers; // the register states for the task + struct Task *nextTask; // linked list of tasks that need to be done + void* stack; + Message* message; +} Task; + +extern void initTasking(); +extern void createTask(Task *task, uint32_t mainFunction, uint32_t flags, uint32_t *pagedir); + +extern void yield(); +extern void yields(); // yield, but schedule the currently running task +extern void switchTask(Registers *old, Registers *new); +extern void schedule(Task* task); // schedule a task to be run in the future +extern void destroyCurrentTask(); + +extern void setRunningTask(Task* task); // set the task currently executed +extern void sendMessage(Task* task, Message* message); + +extern Message* popMessage(Task* task); + +#endif \ No newline at end of file diff --git a/src/headers/tree-os.h b/src/headers/tree-os.h new file mode 100644 index 0000000..71476fe --- /dev/null +++ b/src/headers/tree-os.h @@ -0,0 +1,6 @@ +#ifndef TREE_OS_H +#define TREE_OS_H + +extern void drawLogo(); + +#endif \ No newline at end of file diff --git a/src/kernel/kernel.c b/src/kernel/kernel.c index cfdf333..d8ff7b8 100644 --- a/src/kernel/kernel.c +++ b/src/kernel/kernel.c @@ -1,10 +1,10 @@ #include -#include +#include #include -#include -#include -#include -#include +#include +#include +#include +#include extern uint32_t _kernel_end; diff --git a/src/kernel/lib/memory/alloc.h b/src/kernel/lib/memory/alloc.h deleted file mode 100644 index 42910ce..0000000 --- a/src/kernel/lib/memory/alloc.h +++ /dev/null @@ -1,28 +0,0 @@ -#ifndef ALLOC_H -#define ALLOC_H - -#include -#include - -typedef enum MemoryState { - FREE = 0, - IN_USE = 1 -} MemoryState; - -typedef struct MemoryBlock { - struct MemoryBlock* last; - struct MemoryBlock* next; - MemoryState state; - uint32_t size; - Task* task; -} MemoryBlock; - -extern void initMemoryAllocation(uint32_t kernelEnd); -extern void* malloc(uint32_t size); -extern void* mallocTask(uint32_t size, Task* task); -extern void free(void* location); -extern void printMemoryStack(); -extern void freeTaskAllocations(Task* task); -extern Task* getCurrentTask(); - -#endif \ No newline at end of file diff --git a/src/kernel/lib/ports.c b/src/kernel/lib/ports.c index b2a8fab..6cfbb2a 100644 --- a/src/kernel/lib/ports.c +++ b/src/kernel/lib/ports.c @@ -1,4 +1,4 @@ -#include +#include #include void outb(uint16_t port, uint8_t val) { diff --git a/src/kernel/lib/ports.h b/src/kernel/lib/ports.h deleted file mode 100644 index 716fd0a..0000000 --- a/src/kernel/lib/ports.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef PORTS_H -#define PORTS_H - -#include - -extern void outb(uint16_t port, uint8_t val); -extern uint8_t inb(uint16_t port); - -#endif \ No newline at end of file diff --git a/src/kernel/lib/task/message.h b/src/kernel/lib/task/message.h deleted file mode 100644 index 2f8ddbe..0000000 --- a/src/kernel/lib/task/message.h +++ /dev/null @@ -1,12 +0,0 @@ -#ifndef MESSAGE_H -#define MESSAGE_H - -#include - -typedef struct Message { - void* data; - uint32_t size; - struct Message* next; -} Message; - -#endif \ No newline at end of file diff --git a/src/kernel/lib/task/osTasks.c b/src/kernel/lib/task/osTasks.c index 439a26d..c3d6a43 100644 --- a/src/kernel/lib/task/osTasks.c +++ b/src/kernel/lib/task/osTasks.c @@ -1,8 +1,8 @@ -#include -#include -#include +#include +#include +#include #include -#include +#include Task mainTask; Task printerTask; diff --git a/src/kernel/lib/task/osTasks.h b/src/kernel/lib/task/osTasks.h deleted file mode 100644 index b1adecb..0000000 --- a/src/kernel/lib/task/osTasks.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef OS_TASKS_H -#define OS_TASKS_H - -#include - -extern void initOSTasks(); - -extern Task* getPrinterTask(); - -#endif \ No newline at end of file diff --git a/src/kernel/lib/task/task.c b/src/kernel/lib/task/task.c index 5d57403..e4201c5 100644 --- a/src/kernel/lib/task/task.c +++ b/src/kernel/lib/task/task.c @@ -1,6 +1,6 @@ -#include -#include -#include +#include +#include +#include #define STACK_SIZE 0xF000 diff --git a/src/kernel/lib/task/task.h b/src/kernel/lib/task/task.h deleted file mode 100644 index 0c5e1d0..0000000 --- a/src/kernel/lib/task/task.h +++ /dev/null @@ -1,34 +0,0 @@ -#ifndef TASK_H -#define TASK_H - -#include -#include - -extern void initTasking(); - -typedef struct __attribute__ ((packed)) { - uint32_t eax, ebx, ecx, edx, esi, edi, esp, ebp, eip, eflags, cr3; -} Registers; - -typedef struct Task { - Registers registers; // the register states for the task - struct Task *nextTask; // linked list of tasks that need to be done - void* stack; - Message* message; -} Task; - -extern void initTasking(); -extern void createTask(Task *task, uint32_t mainFunction, uint32_t flags, uint32_t *pagedir); - -extern void yield(); -extern void yields(); // yield, but schedule the currently running task -extern void switchTask(Registers *old, Registers *new); -extern void schedule(Task* task); // schedule a task to be run in the future -extern void destroyCurrentTask(); - -extern void setRunningTask(Task* task); // set the task currently executed -extern void sendMessage(Task* task, Message* message); - -extern Message* popMessage(Task* task); - -#endif \ No newline at end of file diff --git a/src/kernel/lib/textMode/cursor.c b/src/kernel/lib/textMode/cursor.c index eb9bd36..e5cc8f9 100644 --- a/src/kernel/lib/textMode/cursor.c +++ b/src/kernel/lib/textMode/cursor.c @@ -1,7 +1,7 @@ #include -#include -#include -#include +#include +#include +#include void setCursorOffset(uint16_t offset) { outb(0x3D4, 0x0F); diff --git a/src/kernel/lib/textMode/cursor.h b/src/kernel/lib/textMode/cursor.h deleted file mode 100644 index 30f91c1..0000000 --- a/src/kernel/lib/textMode/cursor.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef CURSOR_H -#define CURSOR_H - -#include - -extern void setCursorOffset(uint16_t offset); -extern void setCursorPosition(uint8_t x, uint8_t y); -extern uint16_t getCursorOffset(); - -#endif \ No newline at end of file diff --git a/src/kernel/lib/textMode/stdio.c b/src/kernel/lib/textMode/stdio.c index 747a710..5f1b3a0 100644 --- a/src/kernel/lib/textMode/stdio.c +++ b/src/kernel/lib/textMode/stdio.c @@ -1,12 +1,12 @@ #include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include uint16_t* framebuffer = (uint16_t*) FRAMEBUFFER_LOCATION; char format = 0x0F; diff --git a/src/kernel/lib/textMode/stdio.h b/src/kernel/lib/textMode/stdio.h deleted file mode 100644 index b5d4f87..0000000 --- a/src/kernel/lib/textMode/stdio.h +++ /dev/null @@ -1,20 +0,0 @@ -#ifndef STDIO_H -#define STDIO_H - -#include - -#define FRAMEBUFFER_LOCATION 0x000B8000 -#define VIDEO_WIDTH 80 -#define VIDEO_HEIGHT 25 - -extern void setTextStyle(uint8_t style); -extern void clearScreen(); -extern void printf(const char* format, ...); -extern void putCharAt(char c, uint8_t x, uint8_t y); -extern void putCharsAt(char* string, uint8_t x, uint8_t y); -extern void puts(char* string); -extern void putChars(char* string, uint32_t length); - -extern uint32_t strlen(char* string); - -#endif \ No newline at end of file diff --git a/src/kernel/multiboot.h b/src/kernel/multiboot.h deleted file mode 100644 index c6f5ff8..0000000 --- a/src/kernel/multiboot.h +++ /dev/null @@ -1,274 +0,0 @@ -/* multiboot.h - Multiboot header file. */ -/* Copyright (C) 1999,2003,2007,2008,2009,2010 Free Software Foundation, Inc. - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to - * deal in the Software without restriction, including without limitation the - * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or - * sell copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL ANY - * DEVELOPER OR DISTRIBUTOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, - * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR - * IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -#ifndef MULTIBOOT_HEADER -#define MULTIBOOT_HEADER 1 - -/* How many bytes from the start of the file we search for the header. */ -#define MULTIBOOT_SEARCH 8192 -#define MULTIBOOT_HEADER_ALIGN 4 - -/* The magic field should contain this. */ -#define MULTIBOOT_HEADER_MAGIC 0x1BADB002 - -/* This should be in %eax. */ -#define MULTIBOOT_BOOTLOADER_MAGIC 0x2BADB002 - -/* Alignment of multiboot modules. */ -#define MULTIBOOT_MOD_ALIGN 0x00001000 - -/* Alignment of the multiboot info structure. */ -#define MULTIBOOT_INFO_ALIGN 0x00000004 - -/* Flags set in the ’flags’ member of the multiboot header. */ - -/* Align all boot modules on i386 page (4KB) boundaries. */ -#define MULTIBOOT_PAGE_ALIGN 0x00000001 - -/* Must pass memory information to OS. */ -#define MULTIBOOT_MEMORY_INFO 0x00000002 - -/* Must pass video information to OS. */ -#define MULTIBOOT_VIDEO_MODE 0x00000004 - -/* This flag indicates the use of the address fields in the header. */ -#define MULTIBOOT_AOUT_KLUDGE 0x00010000 - -/* Flags to be set in the ’flags’ member of the multiboot info structure. */ - -/* is there basic lower/upper memory information? */ -#define MULTIBOOT_INFO_MEMORY 0x00000001 -/* is there a boot device set? */ -#define MULTIBOOT_INFO_BOOTDEV 0x00000002 -/* is the command-line defined? */ -#define MULTIBOOT_INFO_CMDLINE 0x00000004 -/* are there modules to do something with? */ -#define MULTIBOOT_INFO_MODS 0x00000008 - -/* These next two are mutually exclusive */ - -/* is there a symbol table loaded? */ -#define MULTIBOOT_INFO_AOUT_SYMS 0x00000010 -/* is there an ELF section header table? */ -#define MULTIBOOT_INFO_ELF_SHDR 0X00000020 - -/* is there a full memory map? */ -#define MULTIBOOT_INFO_MEM_MAP 0x00000040 - -/* Is there drive info? */ -#define MULTIBOOT_INFO_DRIVE_INFO 0x00000080 - -/* Is there a config table? */ -#define MULTIBOOT_INFO_CONFIG_TABLE 0x00000100 - -/* Is there a boot loader name? */ -#define MULTIBOOT_INFO_BOOT_LOADER_NAME 0x00000200 - -/* Is there a APM table? */ -#define MULTIBOOT_INFO_APM_TABLE 0x00000400 - -/* Is there video information? */ -#define MULTIBOOT_INFO_VBE_INFO 0x00000800 -#define MULTIBOOT_INFO_FRAMEBUFFER_INFO 0x00001000 - -#ifndef ASM_FILE - -typedef unsigned char multiboot_uint8_t; -typedef unsigned short multiboot_uint16_t; -typedef unsigned int multiboot_uint32_t; -typedef unsigned long long multiboot_uint64_t; - -struct multiboot_header -{ - /* Must be MULTIBOOT_MAGIC - see above. */ - multiboot_uint32_t magic; - - /* Feature flags. */ - multiboot_uint32_t flags; - - /* The above fields plus this one must equal 0 mod 2^32. */ - multiboot_uint32_t checksum; - - /* These are only valid if MULTIBOOT_AOUT_KLUDGE is set. */ - multiboot_uint32_t header_addr; - multiboot_uint32_t load_addr; - multiboot_uint32_t load_end_addr; - multiboot_uint32_t bss_end_addr; - multiboot_uint32_t entry_addr; - - /* These are only valid if MULTIBOOT_VIDEO_MODE is set. */ - multiboot_uint32_t mode_type; - multiboot_uint32_t width; - multiboot_uint32_t height; - multiboot_uint32_t depth; -}; - -/* The symbol table for a.out. */ -struct multiboot_aout_symbol_table -{ - multiboot_uint32_t tabsize; - multiboot_uint32_t strsize; - multiboot_uint32_t addr; - multiboot_uint32_t reserved; -}; -typedef struct multiboot_aout_symbol_table multiboot_aout_symbol_table_t; - -/* The section header table for ELF. */ -struct multiboot_elf_section_header_table -{ - multiboot_uint32_t num; - multiboot_uint32_t size; - multiboot_uint32_t addr; - multiboot_uint32_t shndx; -}; -typedef struct multiboot_elf_section_header_table multiboot_elf_section_header_table_t; - -struct multiboot_info -{ - /* Multiboot info version number */ - multiboot_uint32_t flags; - - /* Available memory from BIOS */ - multiboot_uint32_t mem_lower; - multiboot_uint32_t mem_upper; - - /* "root" partition */ - multiboot_uint32_t boot_device; - - /* Kernel command line */ - multiboot_uint32_t cmdline; - - /* Boot-Module list */ - multiboot_uint32_t mods_count; - multiboot_uint32_t mods_addr; - - union - { - multiboot_aout_symbol_table_t aout_sym; - multiboot_elf_section_header_table_t elf_sec; - } u; - - /* Memory Mapping buffer */ - multiboot_uint32_t mmap_length; - multiboot_uint32_t mmap_addr; - - /* Drive Info buffer */ - multiboot_uint32_t drives_length; - multiboot_uint32_t drives_addr; - - /* ROM configuration table */ - multiboot_uint32_t config_table; - - /* Boot Loader Name */ - multiboot_uint32_t boot_loader_name; - - /* APM table */ - multiboot_uint32_t apm_table; - - /* Video */ - multiboot_uint32_t vbe_control_info; - multiboot_uint32_t vbe_mode_info; - multiboot_uint16_t vbe_mode; - multiboot_uint16_t vbe_interface_seg; - multiboot_uint16_t vbe_interface_off; - multiboot_uint16_t vbe_interface_len; - - multiboot_uint64_t framebuffer_addr; - multiboot_uint32_t framebuffer_pitch; - multiboot_uint32_t framebuffer_width; - multiboot_uint32_t framebuffer_height; - multiboot_uint8_t framebuffer_bpp; -#define MULTIBOOT_FRAMEBUFFER_TYPE_INDEXED 0 -#define MULTIBOOT_FRAMEBUFFER_TYPE_RGB 1 -#define MULTIBOOT_FRAMEBUFFER_TYPE_EGA_TEXT 2 - multiboot_uint8_t framebuffer_type; - union - { - struct - { - multiboot_uint32_t framebuffer_palette_addr; - multiboot_uint16_t framebuffer_palette_num_colors; - }; - struct - { - multiboot_uint8_t framebuffer_red_field_position; - multiboot_uint8_t framebuffer_red_mask_size; - multiboot_uint8_t framebuffer_green_field_position; - multiboot_uint8_t framebuffer_green_mask_size; - multiboot_uint8_t framebuffer_blue_field_position; - multiboot_uint8_t framebuffer_blue_mask_size; - }; - }; -}; -typedef struct multiboot_info multiboot_info_t; - -struct multiboot_color -{ - multiboot_uint8_t red; - multiboot_uint8_t green; - multiboot_uint8_t blue; -}; - -struct multiboot_mmap_entry -{ - multiboot_uint32_t size; - multiboot_uint64_t addr; - multiboot_uint64_t len; -#define MULTIBOOT_MEMORY_AVAILABLE 1 -#define MULTIBOOT_MEMORY_RESERVED 2 -#define MULTIBOOT_MEMORY_ACPI_RECLAIMABLE 3 -#define MULTIBOOT_MEMORY_NVS 4 -#define MULTIBOOT_MEMORY_BADRAM 5 - multiboot_uint32_t type; -} __attribute__((packed)); -typedef struct multiboot_mmap_entry multiboot_memory_map_t; - -struct multiboot_mod_list -{ - /* the memory used goes from bytes ’mod_start’ to ’mod_end-1’ inclusive */ - multiboot_uint32_t mod_start; - multiboot_uint32_t mod_end; - - /* Module command line */ - multiboot_uint32_t cmdline; - - /* padding to take it to 16 bytes (must be zero) */ - multiboot_uint32_t pad; -}; -typedef struct multiboot_mod_list multiboot_module_t; - -/* APM BIOS info. */ -struct multiboot_apm_info -{ - multiboot_uint16_t version; - multiboot_uint16_t cseg; - multiboot_uint32_t offset; - multiboot_uint16_t cseg_16; - multiboot_uint16_t dseg; - multiboot_uint16_t flags; - multiboot_uint16_t cseg_len; - multiboot_uint16_t cseg_16_len; - multiboot_uint16_t dseg_len; -}; - -#endif /* ! ASM_FILE */ - -#endif /* ! MULTIBOOT_HEADER */ \ No newline at end of file diff --git a/src/kernel/tree-os.c b/src/kernel/tree-os.c index 3c7efcc..913bb93 100644 --- a/src/kernel/tree-os.c +++ b/src/kernel/tree-os.c @@ -1,5 +1,5 @@ #include -#include +#include const char* logo = "\ _______ \n\ diff --git a/src/kernel/tree-os.h b/src/kernel/tree-os.h deleted file mode 100644 index 71476fe..0000000 --- a/src/kernel/tree-os.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef TREE_OS_H -#define TREE_OS_H - -extern void drawLogo(); - -#endif \ No newline at end of file diff --git a/src/multiboot/boot.asm b/src/multiboot/boot.asm index 6ca5009..8498cb3 100644 --- a/src/multiboot/boot.asm +++ b/src/multiboot/boot.asm @@ -21,6 +21,12 @@ mov esp, stack + KERNEL_STACK_SIZE lgdt [gdt32.end] ; call main function + mov ax, 16 + mov ds, ax + mov ss, ax + mov es, ax + mov fs, ax + mov gs, ax call 0x08:kernelMain .loop: jmp .loop