diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/as/Makefile | 5 | ||||
| -rw-r--r-- | src/as/boot.s (renamed from src/boot.s) | 0 | ||||
| -rw-r--r-- | src/as/crti.s (renamed from src/crti.s) | 0 | ||||
| -rw-r--r-- | src/as/crtn.s (renamed from src/crtn.s) | 0 | ||||
| -rw-r--r-- | src/c/Makefile | 5 | ||||
| -rw-r--r-- | src/c/gdt.c (renamed from src/gdt.c) | 2 | ||||
| -rw-r--r-- | src/c/heap.c (renamed from src/heap.c) | 2 | ||||
| -rw-r--r-- | src/c/idt.c (renamed from src/idt.c) | 2 | ||||
| -rw-r--r-- | src/c/kernel.c (renamed from src/kernel.c) | 5 | ||||
| -rw-r--r-- | src/c/keyboard.c (renamed from src/keyboard.c) | 6 | ||||
| -rw-r--r-- | src/c/keymap.c (renamed from src/keymap.c) | 0 | ||||
| -rw-r--r-- | src/c/stdio.c (renamed from src/stdio.c) | 4 | ||||
| -rw-r--r-- | src/c/string.c (renamed from src/string.c) | 2 | ||||
| -rw-r--r-- | src/c/tty.c (renamed from src/tty.c) | 8 | ||||
| -rw-r--r-- | src/c/vga.c (renamed from src/vga.c) | 6 | ||||
| -rw-r--r-- | src/include/asm.h (renamed from src/asm.h) | 0 | ||||
| -rw-r--r-- | src/include/heap.h (renamed from src/heap.h) | 0 | ||||
| -rw-r--r-- | src/include/stdio.h (renamed from src/stdio.h) | 0 | ||||
| -rw-r--r-- | src/include/string.h (renamed from src/string.h) | 0 | ||||
| -rw-r--r-- | src/include/types.h (renamed from src/types.h) | 0 |
20 files changed, 27 insertions, 20 deletions
diff --git a/src/as/Makefile b/src/as/Makefile new file mode 100644 index 0000000..e2c476d --- /dev/null +++ b/src/as/Makefile @@ -0,0 +1,5 @@ +.PHONY: all +all: $(AS_OBJECTS) + +$(BUILD_DIR)/%.o: %.s + $(AS) $< -o $@ diff --git a/src/boot.s b/src/as/boot.s index 6fe5ab8..6fe5ab8 100644 --- a/src/boot.s +++ b/src/as/boot.s diff --git a/src/crti.s b/src/as/crti.s index 30dd4ea..30dd4ea 100644 --- a/src/crti.s +++ b/src/as/crti.s diff --git a/src/crtn.s b/src/as/crtn.s index 1da795d..1da795d 100644 --- a/src/crtn.s +++ b/src/as/crtn.s diff --git a/src/c/Makefile b/src/c/Makefile new file mode 100644 index 0000000..7c5d1af --- /dev/null +++ b/src/c/Makefile @@ -0,0 +1,5 @@ +.PHONY: all +all: $(C_OBJECTS) + +$(BUILD_DIR)/%.o: %.c + $(CC) -c $< -o $@ -std=gnu99 $(CFLAGS) @@ -1,4 +1,4 @@ -#include"types.h" +#include"../include/types.h" struct gdt_entry { diff --git a/src/heap.c b/src/c/heap.c index 9b86ad6..1bad05e 100644 --- a/src/heap.c +++ b/src/c/heap.c @@ -1,4 +1,4 @@ -#include"types.h" +#include"../include/types.h" /* 2014 Leonard Kevin McGuire Jr (www.kmcg3413.net) (kmcg3413@gmail.com) @@ -1,4 +1,4 @@ -#include"types.h" +#include"../include/types.h" #define INTERRUPT_GATE_32 0x8e diff --git a/src/kernel.c b/src/c/kernel.c index b77bf2c..e18a7c0 100644 --- a/src/kernel.c +++ b/src/c/kernel.c @@ -1,13 +1,10 @@ -#include"heap.h" -#include"stdio.h" +#include"../include/heap.h" void terminal_initialize(void); void init_idt_table(void); void init_keyboard(void); void prompt(void); -void *f(); - void kernel_main(void) { terminal_initialize(); diff --git a/src/keyboard.c b/src/c/keyboard.c index c945acd..548cdda 100644 --- a/src/keyboard.c +++ b/src/c/keyboard.c @@ -1,6 +1,6 @@ -#include"types.h" -#include"asm.h" -#include"stdio.h" +#include"../include/types.h" +#include"../include/asm.h" +#include"../include/stdio.h" #define BUFFER_SIZE 200 char buffer[BUFFER_SIZE]; diff --git a/src/keymap.c b/src/c/keymap.c index 04c79b2..04c79b2 100644 --- a/src/keymap.c +++ b/src/c/keymap.c diff --git a/src/stdio.c b/src/c/stdio.c index e93dea1..83d2b0a 100644 --- a/src/stdio.c +++ b/src/c/stdio.c @@ -1,5 +1,5 @@ -#include"types.h" -#include"string.h" +#include"../include/types.h" +#include"../include/string.h" #include<stdarg.h> void terminal_putchar(char c); diff --git a/src/string.c b/src/c/string.c index b0c42f2..5667715 100644 --- a/src/string.c +++ b/src/c/string.c @@ -1,4 +1,4 @@ -#include"types.h" +#include"../include/types.h" size_t stringlen(char *str) { @@ -1,6 +1,6 @@ -#include"types.h" -#include"string.h" -#include"stdio.h" +#include"../include/types.h" +#include"../include/string.h" +#include"../include/stdio.h" #define CMD_LENGTH 20 @@ -48,7 +48,7 @@ void merge(char parts[][CMD_LENGTH]) void ls(size_t numberof,char parts[][CMD_LENGTH]) { - printf("filesystem not implemented yet\n"); + printf("filesystem not implemented yet, %d,%s\n",numberof,parts[0]); } void number(size_t numberof,char parts[][CMD_LENGTH]) @@ -1,6 +1,6 @@ -#include"types.h" -#include"string.h" -#include"asm.h" +#include"../include/types.h" +#include"../include/string.h" +#include"../include/asm.h" static const size_t VGA_WIDTH = 80; static const size_t VGA_HEIGHT = 25; diff --git a/src/asm.h b/src/include/asm.h index 1d61b88..1d61b88 100644 --- a/src/asm.h +++ b/src/include/asm.h diff --git a/src/heap.h b/src/include/heap.h index 2f66501..2f66501 100644 --- a/src/heap.h +++ b/src/include/heap.h diff --git a/src/stdio.h b/src/include/stdio.h index 2d0aa8a..2d0aa8a 100644 --- a/src/stdio.h +++ b/src/include/stdio.h diff --git a/src/string.h b/src/include/string.h index 500f545..500f545 100644 --- a/src/string.h +++ b/src/include/string.h diff --git a/src/types.h b/src/include/types.h index a6d6530..a6d6530 100644 --- a/src/types.h +++ b/src/include/types.h |