diff --git a/makefile b/makefile index 06d2919..22b81c8 100644 --- a/makefile +++ b/makefile @@ -4,7 +4,8 @@ LINK=ld ISO=genisoimage OBJECTS=mem.o kernel.o gdt_seg.o gdt.o interrupts.o loader.o serial.o \ - framebuffer.o ports.o stlio.o tests.o interrupt_entry.o + framebuffer.o ports.o stlio.o tests.o interrupt_entry.o pit.o + AFLAGS=-f elf32 CFLAGS=-masm=intel -O2 -m32 -nostdlib -nostdinc -fno-builtin -fno-stack-protector -nostartfiles \ -nodefaultlibs -Wall -Wextra -c #-Werror -c diff --git a/shell.c b/shell.c deleted file mode 100644 index 1830a5c..0000000 --- a/shell.c +++ /dev/null @@ -1,39 +0,0 @@ -// NOTE: we shouldn't have to worry about scrolling so the library/kernel -// should do this for us -// Oh yes -#include "stlio.h" -#include "types.h" - -#define bsize 101 - -#define banner0 "_______ _______ _________" -#define banner1 "\\ _ \\____________ ____ ____ ____ \\ _ \\ / _____/" -#define banner2 "/ /_\\ \\_ __ \\__ \\ / \\ / ___\\_/ __ \\/ /_\\ \\ \\_____ \\ " -#define banner3 "\\ \\_/ \\ | \\// __ \\| | \\/ /_/ > ___/\\ \\_/ \\/ \\" -#define banner4 " \\_____ /__| (____ /___| /\\___ / \\___ >\\_____ /_______ /" -#define banner5 " \\/ \\/ \\//_____/ \\/ \\/ \\/ " - -void smain(void) { - // print out a nice banner on start - printf(banner0); - printf(banner1); - printf(banner2); - printf(banner3); - printf(banner4); - printf(banner5); - - char buffer[bsize]; - while(1) { - // read into buffer bsize bytes, if we reach bsize then we just keep replacing that character - // keep in mind however that backspace will take us back as well - u32 bytes = read(buffer, bsize); // reeads n - 1 characters as the last one is always null - // now we process options - if(strcmp(buffer, "quit") == 0) { - break; - } - // generate a random number on the screen for now - if(strcmp(buffer, "rand") == 0) { - printHex(random32(5000)); - } - } -}