diff --git a/README.md b/README.md index 79cda0f..900269e 100644 --- a/README.md +++ b/README.md @@ -1,28 +1,34 @@ -

e-Operting System

-

A simple x86 operating system. Maybe 64bit in the future.

-

+

+

A simple & lightweight x86 operating system

+ ### Building & Running Use the `Makefile` in order to build the binaries/objects et cetera- with make.
-Example: `$ make os-image` +**To build the OS image run**: `$ make os-image` +
+**To build the OS image (WITH GRUB) run**: `$ make grub`

-In order to run you can launch the OS with qemu. You can also launch qemu via make by doing: `$ make run`. +#### Emulation +You can launch eOS with a VM like qemu. You can also launch *qemu* via *make* by running: `$ make run`. $ make (option) run : Runs the OS with qemu drun : Recompiles the OS and runs it with qemu clean : Remove all object/binary/image files -### Features - - 32bit - - VGA - - And more to come! - ### Planned Features Read `TODO.md` for planned features. +
+
+
+
+ ### Resources -#### Books +These are the most common resources I used in order to build eOS. I highly recommend them. +##### Books - [Operating Systems: From 0 to 1](https://tuhdo.github.io/os01/) (Open-Source, unfinished) - [Writing a Simple Operating System - from Scratch](https://www.cs.bham.ac.uk/~exr/lectures/opsys/10_11/lectures/os-dev.pdf) +##### Wikis + - [OSDev.org](https://wiki.osdev.org/Expanded_Main_Page) diff --git a/drivers/vga.c b/drivers/vga.c index 959b491..48dfa60 100644 --- a/drivers/vga.c +++ b/drivers/vga.c @@ -73,5 +73,3 @@ void printalign(char* str, int attribute_byte, enum align alignment) { print(str, attribute_byte); } - - diff --git a/kernel/kernel.c b/kernel/kernel.c index ad32614..db926f0 100644 --- a/kernel/kernel.c +++ b/kernel/kernel.c @@ -1,3 +1,4 @@ +#include "memory.h" #include "../drivers/vga.h" #include "../lib/str.h" #include "../lib/strf.h" diff --git a/kernel/memory.c b/kernel/memory.c index b31569d..8986d54 100644 --- a/kernel/memory.c +++ b/kernel/memory.c @@ -1 +1,9 @@ #include "memory.h" + +char* malloc(unsigned int size) { + return " "; +} + +void mfree(char* p) { + +} diff --git a/logo.png b/logo.png new file mode 100644 index 0000000..d401a9d Binary files /dev/null and b/logo.png differ