gwoplock · xxc3nsoredxx · Sep 12, 2017 · Sep 12, 2017 · Sep 12, 2017 · Sep 12, 2017
diff --git a/makefile b/makefile
@@ -5,8 +5,8 @@ SUBDIRS = src
 include makefile.inc
 
 kernel.bin: $(SUBDIRS)
-	@$(GCC) -T $(OS_CPP)/linker.ld -o $(BUILD_TO) -ffreestanding -O2 -fno-rtti -fno-exceptions -nostartfiles -nostdlib $(OBJ_DIR)/*.o -lgcc 
+	@$(GCC) -T $(OS_CPP)/linker.ld -o $(BUILD_TO) -ffreestanding -O2 -fno-rtti -fno-exceptions -nostartfiles -nostdlib $(OBJ_DIR)/*.o -lgcc
 	@sync
 
 clean:
-	rm $(OBJ_DIR)/*.o
+	rm $(OBJ_DIR)/*.o
diff --git a/makefile.inc b/makefile.inc
@@ -1,9 +1,9 @@
 AS = i686-elf-as
 GPP = i686-elf-g++
 GCC = i686-elf-gcc
-OS_CPP = /media/sdcard/ExOS
-BUILD_TO = /mnt/boot/kernel.bin
-CFLAGS = -c -ffreestanding -O2 -Wall -Wextra -fno-rtti -fno-exceptions -std=gnu++14
+OS_CPP = /home/garrett/workspace/ExOS
+BUILD_TO = /run/media/garrett/EXOS/boot/kernel.bin
+CFLAGS = -c -ffreestanding -O2 -Wall -Wextra -fno-rtti -fno-exceptions -std=gnu++14 -I$(OS_CPP)/src
 OBJ_DIR = $(OS_CPP)/build
 
 %.o: %.c

diff --git a/src/global.h → src/Global.h b/src/global.h → src/Global.h
diff --git a/src/boot/boot.s → src/boot/Boot.s b/src/boot/boot.s → src/boot/Boot.s
diff --git a/src/clib_misc/Abort.c b/src/clib_misc/Abort.c
@@ -5,8 +5,8 @@
  *  Created on: Aug 14, 2017
  *      Author: garrett
  */
-#include "abort.h"
-#include "../drivers/TTY/Console.h"
+#include "clib_misc/Abort.h"
+#include "drivers/TTY/Console.h"
 
 extern "C"
 void /*__cxxabiv1::*/__cxa_pure_virtual(void) {

diff --git a/src/clib_misc/Abort.h b/src/clib_misc/Abort.h
@@ -8,7 +8,7 @@
 #ifndef SRC_CLIBMISC_ABORT_H_
 #define SRC_CLIBMISC_ABORT_H_
 
-#include "../global.h"
+#include "Global.h"
 
 #if defined(__cplusplus)
 extern "C" {/* Use C linkage for kernel_main. */

diff --git a/src/drivers/Keyboard.cpp b/src/drivers/Keyboard.cpp
@@ -5,7 +5,7 @@
  *      Author: garrett
  */
 
-#include "Keyboard.h"
+#include "drivers/Keyboard.h"
 
 Keyboard::Keyboard( ) {
 

diff --git a/src/drivers/Keyboard.h b/src/drivers/Keyboard.h
@@ -8,7 +8,7 @@
 #ifndef KEYBOARD_H_
 #define KEYBOARD_H_
 
-#include "../Global.h"
+#include "Global.h"
 /**
  * the possible scan code sets
  */

diff --git a/src/drivers/PCI/PCI.c b/src/drivers/PCI/PCI.c
@@ -5,7 +5,7 @@
  *      Author: garrett
  */
 
-#include "PCI.h"
+#include "drivers/PCI/PCI.h"
 
 //TODO clean up a lot
 

diff --git a/src/drivers/PCI/PCI.h b/src/drivers/PCI/PCI.h
@@ -8,7 +8,7 @@
 #ifndef SRC_DRIVERS_PCI_PCI_H_
 #define SRC_DRIVERS_PCI_PCI_H_
 
-#include "../../Global.h"
+#include "Global.h"
 
 extern int8_t MAX_PCI_FUNCTIONS;
 /**

diff --git a/src/drivers/PCI/PCIDeviceList.cpp b/src/drivers/PCI/PCIDeviceList.cpp
@@ -6,12 +6,12 @@
  *      Author: garrett
  */
 
-#include "PCIDeviceList.h"
-#include "PCI.h"
-#include "PCI_devices/PCIStandardDevice.h"
-#include "PCI_devices/PCIBridgeDevice.h"
-#include "PCI_devices/PCICardBusDevice.h"
-#include "../TTY/Console.h"
+#include "drivers/PCI/PCIDeviceList.h"
+#include "drivers/PCI/PCI.h"
+#include "drivers/PCI/PCI_devices/PCIStandardDevice.h"
+#include "drivers/PCI/PCI_devices/PCIBridgeDevice.h"
+#include "drivers/PCI/PCI_devices/PCICardBusDevice.h"
+#include "drivers/TTY/Console.h"
 
 PCIDeviceList::PCIDeviceList( ) {
 	_list = new LinkedList<PCIDevice*>;

diff --git a/src/drivers/PCI/PCIDeviceList.h b/src/drivers/PCI/PCIDeviceList.h
@@ -8,8 +8,8 @@
 #ifndef SRC_DRIVERS_PCI_PCIDEVICELIST_H_
 #define SRC_DRIVERS_PCI_PCIDEVICELIST_H_
 
-#include "../../Global.h"
-#include "../../utils/linked_list/LinkedList.h"
+#include "Global.h"
+#include "utils/linked_list/LinkedList.h"
 
 class PCIDevice;
 

diff --git a/src/drivers/PCI/PCI_devices/PCIBridgeDevice.cpp b/src/drivers/PCI/PCI_devices/PCIBridgeDevice.cpp
@@ -4,7 +4,7 @@
  *  Created on: Aug 16, 2017
  *      Author: garrett
  */
-#include "PCIBridgeDevice.h"
+#include "drivers/PCI/PCI_devices/PCIBridgeDevice.h"
 PCIBridgeDevice::PCIBridgeDevice( ) {
 	// TODO Auto-generated constructor stub
 

diff --git a/src/drivers/PCI/PCI_devices/PCIBridgeDevice.h b/src/drivers/PCI/PCI_devices/PCIBridgeDevice.h
@@ -8,8 +8,8 @@
 #ifndef SRC_DRIVERS_PCI_PCIDEVICES_PCIBRIDGEDEVICE_H_
 #define SRC_DRIVERS_PCI_PCIDEVICES_PCIBRIDGEDEVICE_H_
 
-#include "PCIDevice.h"
-#include "../../../Global.h"
+#include "drivers/PCI/PCI_devices/PCIDevice.h"
+#include "Global.h"
 
 class PCIBridgeDevice: public PCIDevice {
 	public:

diff --git a/src/drivers/PCI/PCI_devices/PCICardBusDevice.cpp b/src/drivers/PCI/PCI_devices/PCICardBusDevice.cpp
@@ -4,7 +4,7 @@
  *  Created on: Aug 16, 2017
  *      Author: garrett
  */
-#include "PCICardBusDevice.h"
+#include "drivers/PCI/PCI_devices/PCICardBusDevice.h"
 PCICardBusDevice::PCICardBusDevice( ) {
 	// TODO Auto-generated constructor stub
 

diff --git a/src/drivers/PCI/PCI_devices/PCICardBusDevice.h b/src/drivers/PCI/PCI_devices/PCICardBusDevice.h
@@ -8,8 +8,8 @@
 #ifndef SRC_DRIVERS_PCI_PCIDEVICES_PCICARDBUSDEVICE_H_
 #define SRC_DRIVERS_PCI_PCIDEVICES_PCICARDBUSDEVICE_H_
 
-#include "PCIDevice.h"
-#include "../../../Global.h"
+#include "drivers/PCI/PCI_devices/PCIDevice.h"
+#include "Global.h"
 
 class PCICardBusDevice: public PCIDevice {
 	public:

diff --git a/src/drivers/PCI/PCI_devices/PCIDevice.cpp b/src/drivers/PCI/PCI_devices/PCIDevice.cpp
@@ -5,8 +5,8 @@
  *      Author: garrett
  */
 
-#include "PCIDevice.h"
-#include "../PCI.h"
+#include "drivers/PCI/PCI_devices/PCIDevice.h"
+#include "drivers/PCI/PCI.h"
 
 PCIDevice::PCIDevice( ) {
 	// TODO Auto-generated constructor stub

diff --git a/src/drivers/PCI/PCI_devices/PCIDevice.h b/src/drivers/PCI/PCI_devices/PCIDevice.h
@@ -8,7 +8,7 @@
 #ifndef SRC_DRIVERS_PCI_PCIDEVICE_H_
 #define SRC_DRIVERS_PCI_PCIDEVICE_H_
 
-#include "../../../Global.h"
+#include "Global.h"
 
 
 class PCIDevice {

diff --git a/src/drivers/PCI/PCI_devices/PCIStandardDevice.cpp b/src/drivers/PCI/PCI_devices/PCIStandardDevice.cpp
@@ -5,8 +5,8 @@
  *      Author: garrett
  */
 
-#include "PCIStandardDevice.h"
-#include "../PCI.h"
+#include "drivers/PCI/PCI_devices/PCIStandardDevice.h"
+#include "drivers/PCI/PCI.h"
 
 PCIStandardDevice::PCIStandardDevice( ) :
 		PCIDevice( ) {

diff --git a/src/drivers/PCI/PCI_devices/PCIStandardDevice.h b/src/drivers/PCI/PCI_devices/PCIStandardDevice.h
@@ -8,8 +8,8 @@
 #ifndef PCISTANDARDDEVICE_H_
 #define PCISTANDARDDEVICE_H_
 
-#include "../../../global.h"
-#include "PCIDevice.h"
+#include "Global.h"
+#include "drivers/PCI/PCI_devices/PCIDevice.h"
 
 
 //class PCIDevice;

diff --git a/src/drivers/PCI/USB/USB.c b/src/drivers/PCI/USB/USB.c
@@ -5,7 +5,7 @@
  *      Author: garrett
  */
 
-#include "USB.h"
+#include "drivers/PCI/USB/USB.h"
 
 uint8_t maxUSBVersion = 0;
 USBController* uSBControllers;

diff --git a/src/drivers/PCI/USB/USB.h b/src/drivers/PCI/USB/USB.h
@@ -8,7 +8,7 @@
 #ifndef SRC_DRIVERS_PCI_USB_USB_H_
 #define SRC_DRIVERS_PCI_USB_USB_H_
 
-#include "../../../Global.h"
+#include "Global.h"
 class USBController;
 
 extern uint8_t maxUSBVersion;

diff --git a/src/drivers/PCI/USB/USBController.cpp b/src/drivers/PCI/USB/USBController.cpp
@@ -5,7 +5,7 @@
  *      Author: garrett
  */
 
-#include "USBController.h"
+#include "drivers/PCI/USB/USBController.h"
 
 USBController::USBController( ) {
 	// TODO Auto-generated constructor stub

diff --git a/src/drivers/PCI/USB/USBController.h b/src/drivers/PCI/USB/USBController.h
@@ -8,7 +8,7 @@
 #ifndef USBCONTROLLER_H_
 #define USBCONTROLLER_H_
 
-#include "../../../Global.h"
+#include "Global.h"
 
 class USBController {
 	public:

diff --git a/src/drivers/ProgrammableInterruptController.cpp b/src/drivers/ProgrammableInterruptController.cpp
@@ -5,7 +5,7 @@
  *      Author: garrett
  */
 
-#include "ProgrammableInterruptController.h"
+#include "drivers/ProgrammableInterruptController.h"
 
 //TODO comment
 

diff --git a/src/drivers/ProgrammableInterruptController.h b/src/drivers/ProgrammableInterruptController.h
@@ -8,7 +8,7 @@
 #ifndef PROGRAMMABLEINTERRUPTCONTROLLER_H_
 #define PROGRAMMABLEINTERRUPTCONTROLLER_H_
 
-#include "../Global.h"
+#include "Global.h"
 
 
 /*

diff --git a/src/drivers/TTY/Console.cpp b/src/drivers/TTY/Console.cpp
@@ -6,11 +6,11 @@
  *               Oskari
  */
 
-#include "Console.h"
-#include "../../Kernel.h"
-#include "../Keyboard.h"
-#include "../../memory/structures/PageTable.h"
-#include "../../memory/Mem.h"
+#include "drivers/TTY/Console.h"
+#include "Kernel.h"
+#include "drivers/Keyboard.h"
+#include "memory/structures/PageTable.h"
+#include "memory/Mem.h"
 
 /**
  * Function prototype for the internal use newline()
@@ -293,7 +293,9 @@ void writeIntBase(uint64_t num, uint64_t base) {
 
     /* Skip to the first non null char */
     int pos;
-    for (pos = 0; !out[pos]; pos++);
+    for (pos = 0; !out[pos]; pos++){
+
+    }
 
 	terminalWriteString((const char*)(out + pos));
 }
diff --git a/src/drivers/TTY/Console.h b/src/drivers/TTY/Console.h
@@ -9,7 +9,7 @@
 #ifndef CONSOLE_H_
 #define CONSOLE_H_
 
-#include "../../Global.h"
+#include "Global.h"
 
 /**
  * Dimensions of the VGA console

diff --git a/src/interrupts/InterruptDescriptorTable.cpp b/src/interrupts/InterruptDescriptorTable.cpp
@@ -5,7 +5,7 @@
  *      Author: garrett
  */
 
-#include "InterruptDescriptorTable.h"
+#include "interrupts/InterruptDescriptorTable.h"
 
 //TODO comment what each interrupt is
 InterruptDescriptorTable::InterruptDescriptorTable( ) {

diff --git a/src/interrupts/InterruptDescriptorTable.h b/src/interrupts/InterruptDescriptorTable.h
@@ -8,7 +8,7 @@
 #ifndef INTERRUPTDESCRIPTORTABLE_H_
 #define INTERRUPTDESCRIPTORTABLE_H_
 
-#include "../Global.h"
+#include "Global.h"
 
 /**
  * structure used by the cpu to handler interrupts

diff --git a/src/interrupts/InterruptHandler.cpp b/src/interrupts/InterruptHandler.cpp
@@ -5,11 +5,11 @@
  *      Author: garrett
  */
 
-#include "InterruptHandler.h"
-#include "../Kernel.h"
-#include "../drivers/Keyboard.h"
-#include "../drivers/TTY/Console.h"
-#include "../drivers/ProgrammableInterruptController.h"
+#include "interrupts/InterruptHandler.h"
+#include "Kernel.h"
+#include "drivers/Keyboard.h"
+#include "drivers/TTY/Console.h"
+#include "drivers/ProgrammableInterruptController.h"
 #if defined(__cplusplus)
 extern "C" {/* Use C linkage for kernel_main. */
 #endif

diff --git a/src/interrupts/InterruptHandler.h b/src/interrupts/InterruptHandler.h
@@ -8,7 +8,7 @@
 #ifndef INTERRUPTHANDLER_H_
 #define INTERRUPTHANDLER_H_
 
-#include "../Global.h"
+#include "Global.h"
 //#include "../drivers/Keyboard.h"
 
 #endif /* INTERRUPTHANDLER_H_ */
diff --git a/src/memory/Mem.cpp b/src/memory/Mem.cpp
@@ -5,8 +5,8 @@
  *      Author: garrett
  */
 
-#include "Mem.h"
-#include "structures/PageTable.h"
+#include "memory/Mem.h"
+#include "memory/structures/PageTable.h"
 MultibootMemoryMap memMap[256];
 /**
  * read the multiboot mem map

diff --git a/src/memory/Mem.h b/src/memory/Mem.h
@@ -8,9 +8,9 @@
 #ifndef MEM_H_
 #define MEM_H_
 
-#include "../Global.h"
-#include "../Kernel.h"
-#include "../multiboot_spec/Multiboot.h"
+#include "Global.h"
+#include "Kernel.h"
+#include "multiboot_spec/Multiboot.h"
 
 
 struct MultibootMemoryMap{

diff --git a/src/memory/alloc/Malloc.c b/src/memory/alloc/Malloc.c
@@ -5,10 +5,10 @@
  *      Author: garrett
  */
 
-#include "Malloc.h"
-#include "../../Kernel.h"
-#include "../structures/PageTable.h"
-#include "PageFrameAllocator.h"
+#include "memory/alloc/Malloc.h"
+#include "Kernel.h"
+#include "memory/structures/PageTable.h"
+#include "memory/alloc/PageFrameAllocator.h"
 
 /**
  * top of the paged in mem

diff --git a/src/memory/alloc/Malloc.h b/src/memory/alloc/Malloc.h
@@ -8,7 +8,7 @@
 #ifndef MALLOC_H_
 #define MALLOC_H_
 
-#include "../../Global.h"
+#include "Global.h"
 
 /**
  * top of the paged in mem

diff --git a/src/memory/alloc/New.cpp b/src/memory/alloc/New.cpp
@@ -5,7 +5,7 @@
  *      Author: garrett
  */
 
-#include "New.h"
+#include "memory/alloc/New.h"
 
 //TODO fix this file
 

diff --git a/src/memory/alloc/New.h b/src/memory/alloc/New.h
@@ -8,7 +8,7 @@
 #ifndef NEW_H_
 #define NEW_H_
 
-#include "../../Global.h"
+#include "Global.h"
 
 void * operator new(size_t size);
 void operator delete(void * p);