Merge pull request #31 from E-Almqvist/dev

README update

README.md

@@ -1,28 +1,34 @@
-<h1 align="center">e-Operting System</h1>
+<p align="center"><img src="logo.png" width="180px" height="auto"></p>
-<p align="center">A simple x86 operating system. Maybe 64bit in the future.</p>
+<p align="center">A simple & lightweight x86 operating system</p>
-<p align="center"><img src="preview.png"></p>
+
 
 ### Building & Running
 Use the `Makefile` in order to build the binaries/objects et cetera- with <a href="https://linux.die.net/man/1/make" target="_blank">make</a>.
 <br>
-Example: `$ make os-image`
+**To build the OS image run**: `$ make os-image`
+<br>
+**To build the OS image (WITH GRUB) run**: `$ make grub`
 <br><br>
-In order to run you can launch the OS with <a href="https://www.qemu.org/documentation/" target="_blank">qemu</a>. You can also launch qemu via make by doing: `$ make run`.
+#### Emulation
+You can launch eOS with a VM like <a href="https://www.qemu.org/documentation/" target="_blank">qemu</a>. 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.
 
+<br>
+<br>
+<br>
+<br>
+
 ### 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)

drivers/vga.c

@@ -73,5 +73,3 @@ void printalign(char* str, int attribute_byte, enum align alignment) {
 
 	print(str, attribute_byte);
 }
-
-

kernel/kernel.c

@@ -1,3 +1,4 @@
+#include "memory.h"
 #include "../drivers/vga.h"
 #include "../lib/str.h"
 #include "../lib/strf.h"

kernel/memory.c

@@ -1 +1,9 @@
 #include "memory.h"
+
+char* malloc(unsigned int size) {
+	return " ";
+}
+
+void mfree(char* p) {
+
+}