Merge branch 'development'

Author: Louis Jenkins

MoltarOS.sublime-workspace

@@ -12,16 +12,16 @@ The below depicts an early "schedule" or rather a path I will be taking in terms
 - [x] Interrupts (IRQ + ISR)
 - [x] VGA Display Driver
 - [x] Keyboard Driver
-- [ ] Interactive Shell
 - [ ] Memory Management (Physical + Virtual)
+- [ ] Interactive Shell
 - [ ] File System
 - [ ] Multitasking and Scheduling
 - [ ] Networking
 - [ ] Process Creation and Managements
 - [ ] ELF Binary Support
 - [ ] Graphical User Interfaces
 
-#Progress Update
+#Progress Update & Changelog
 
 ## Version .001a
 
@@ -34,4 +34,17 @@ Implemented the GDT, IDT (and IRQs and ISRs), reprogrammed the PIC's (Master and
 Implemented the keyboard driver, but it won't be able to communicate with other components (such as an interactive shell) until memory management is implemented... perhaps, not even until processes and scheduling is implemented. That is the next thing I will be releasing. Currently, when you execute
 the OS, it will have a blank screen, until you use the keyboard. When executing the keyboard, it will display what key has been pressed and what has been released... but only one at a time unfortunaately, no multi-key press events are supported.
 
-![Screenshot](/kbd_input.PNG)
+![Screenshot](/kbd_input.PNG)
+
+## Version .001c
+
+Began implementation of memory management, but not finished yet. Paging SHOULD be implemented very soon (and most code has been written), as well the heap is also mainly written using Pancakes' Bitmap Heap implementation, and paired with the identity paging technique, development of all other parts of the OS should proceed as expected. Today, I also managed to make use of the multiboot info struct that GRUB
+gives us that was pushed on the stack in 'kernel_init', and now it can detect the amount of physical memory (RAM) that the machine (or virtual machine) has to offer. This is crucial to finished memory management.
+
+As well, there has been a huge restructure in terms of the hierarchy and logical structure of the operating system. For example, the folders 'mm' and 'drivers' now also have their own respective folders in the
+include folder, I.E 'drivers/vga.c' will have it's header in 'include/drivers/vga.h'. While in terms of usability, it is not too much of an update (yet, memory management will be in version .002), there has been
+a significant amount of work and should be pushed to master.
+
+Lastly, I also added a nice logger macro, `KLOG`, and panic macro, `KPANIC`.
+
+![Screenshot](/ram_and_kbd.PNG)

README.md

@@ -33,4 +33,4 @@ if [ $? -ne 0 ]; then
 fi
 
 # Finally, run the virtual machine.
-bochs -f bochs.bxrc;
+bochs -f bochsrc.bxrc;

ram_and_kbd.PNG

@@ -1,5 +1,5 @@
 # Include directories
-INCLUDE := kernel include arch/i686 display drivers
+INCLUDE := kernel x86 drivers
 
 # List of all headers from the included directories
 HEADERS := $(shell find $(INCLUDE) -type f -name \*.h)
@@ -18,7 +18,7 @@ OBJECTS := $(C_OBJECTS) $(ASM_OBJECTS)
 DEPENDENCIES := $(patsubst %.c, %.d, $(C_SOURCES))
 
 # Linker to be used
-LINKER := arch/i686/linker.ld
+LINKER := x86/linker.ld
 
 # Compilers used during specific build sections
 LINKER_COMPILER := i686-elf-gcc -static

src/build.sh

@@ -1,7 +1,7 @@
-#include <include/kbd.h>
-#include <include/vga.h>
-#include <include/idt.h>
-#include <include/io_port.h>
+#include <include/drivers/kbd.h>
+#include <include/drivers/vga.h>
+#include <include/x86/idt.h>
+#include <include/x86/io_port.h>
 #include <include/helpers.h>
 #include <stdbool.h>
 #include <stdio.h>

src/kernel/Makefile

@@ -1,5 +1,5 @@
-#include <include/rtc.h>
-#include <include/io_port.h>
+#include <include/drivers/rtc.h>
+#include <include/x86/io_port.h>
 #include <stdio.h>
 #include <stdbool.h>
 

src/kernel/arch/i686/exceptions.c

@@ -1,11 +1,12 @@
-#include <include/timer.h>
-#include <include/io_port.h>
+#include <include/drivers/timer.h>
+#include <include/x86/io_port.h>
+#include <include/helpers.h>
 #include <stdio.h>
 #include <limits.h>
 
 static const uint32_t oscillator_frequency = 1193180;
 
-static void timer_default_irq(struct registers *regs) {
+static void timer_default_irq(struct registers *UNUSED(regs)) {
 	// NOP
 }
 

src/kernel/drivers/kbd.c

@@ -1,7 +1,7 @@
 #include <stdint.h>
 
-#include <include/vga.h>
-#include <include/io_port.h>
+#include <include/drivers/vga.h>
+#include <include/x86/io_port.h>
 
 /* X and Y coordinates for current position in VGA buffer */
 static size_t x, y;