diff --git a/Makefile b/Makefile index 6b85a09..31eb6d9 100644 --- a/Makefile +++ b/Makefile @@ -27,7 +27,7 @@ $(BUILD_DIR)/sv-terminal.o \ -SRC_DIR = src +SRC_DIR = source BUILD_DIR = build CRTBEGIN_OBJ = $(shell $(CC) $(CFLAGS) -print-file-name=crtbegin.o) @@ -50,7 +50,7 @@ clean_iso: iso: clean_iso clean build mkdir -p root/boot/grub cp build/myos.bin root/boot/myos.bin - cp src/grub.cfg root/boot/grub/grub.cfg + cp source/grub.cfg root/boot/grub/grub.cfg grub-mkrescue -o build/barinkOS.iso root run: all virtualboxvm --startvm "BarinkOS_test" @@ -62,7 +62,7 @@ test_iso: $(EMULATOR) -boot d -cdrom $(BUILD_DIR)/barinkOS.iso -serial stdio -vga std -display gtk -m 2G -cpu core2duo build_kernel: $(OBJ_LINK_LIST) - $(CC) -T $(SRC_DIR)/kernel//linker.ld -o $(BUILD_DIR)/myos.bin \ + $(CC) -T $(SRC_DIR)/kernel/linker.ld -o $(BUILD_DIR)/myos.bin \ -ffreestanding -O2 -nostdlib $(OBJ_LINK_LIST) -lgcc build_x86_64: diff --git a/src/grub.cfg b/source/grub.cfg similarity index 100% rename from src/grub.cfg rename to source/grub.cfg diff --git a/src/kernel/PartitionTable/MBR/MasterBootRecord.h b/source/kernel/PartitionTable/MBR/MasterBootRecord.h similarity index 100% rename from src/kernel/PartitionTable/MBR/MasterBootRecord.h rename to source/kernel/PartitionTable/MBR/MasterBootRecord.h diff --git a/src/kernel/PartitionTable/MBR/PartitionTableEntry.h b/source/kernel/PartitionTable/MBR/PartitionTableEntry.h similarity index 100% rename from src/kernel/PartitionTable/MBR/PartitionTableEntry.h rename to source/kernel/PartitionTable/MBR/PartitionTableEntry.h diff --git a/src/kernel/boot.s b/source/kernel/boot.s similarity index 84% rename from src/kernel/boot.s rename to source/kernel/boot.s index 78f5912..3015e8d 100644 --- a/src/kernel/boot.s +++ b/source/kernel/boot.s @@ -21,11 +21,11 @@ stack_bottom: stack_top: .section .text -.include "./src/kernel/gdt/gdt.s" -.include "./src/kernel/irs_table.s" -.include "./src/kernel/irq_table.s" -.include "./src/kernel/idt/idt.s" -.include "./src/kernel/memory/paging.s" +.include "./source/kernel/gdt/gdt.s" +.include "./source/kernel/irs_table.s" +.include "./source/kernel/irq_table.s" +.include "./source/kernel/idt/idt.s" +.include "./source/kernel/memory/paging.s" .global _start diff --git a/src/kernel/bootcheck.h b/source/kernel/bootcheck.h similarity index 100% rename from src/kernel/bootcheck.h rename to source/kernel/bootcheck.h diff --git a/src/kernel/bootinfo.h b/source/kernel/bootinfo.h similarity index 100% rename from src/kernel/bootinfo.h rename to source/kernel/bootinfo.h diff --git a/src/kernel/bootloader/multiboot.h b/source/kernel/bootloader/multiboot.h similarity index 100% rename from src/kernel/bootloader/multiboot.h rename to source/kernel/bootloader/multiboot.h diff --git a/src/kernel/cpu.h b/source/kernel/cpu.h similarity index 100% rename from src/kernel/cpu.h rename to source/kernel/cpu.h diff --git a/src/kernel/crti.s b/source/kernel/crti.s similarity index 100% rename from src/kernel/crti.s rename to source/kernel/crti.s diff --git a/src/kernel/crtn.s b/source/kernel/crtn.s similarity index 100% rename from src/kernel/crtn.s rename to source/kernel/crtn.s diff --git a/src/kernel/definitions.h b/source/kernel/definitions.h similarity index 100% rename from src/kernel/definitions.h rename to source/kernel/definitions.h diff --git a/src/kernel/drivers/ACPI/rsdp.cpp b/source/kernel/drivers/ACPI/rsdp.cpp similarity index 100% rename from src/kernel/drivers/ACPI/rsdp.cpp rename to source/kernel/drivers/ACPI/rsdp.cpp diff --git a/src/kernel/drivers/ACPI/rsdp.h b/source/kernel/drivers/ACPI/rsdp.h similarity index 100% rename from src/kernel/drivers/ACPI/rsdp.h rename to source/kernel/drivers/ACPI/rsdp.h diff --git a/src/kernel/drivers/IO/PCI/pci.cpp b/source/kernel/drivers/IO/PCI/pci.cpp similarity index 100% rename from src/kernel/drivers/IO/PCI/pci.cpp rename to source/kernel/drivers/IO/PCI/pci.cpp diff --git a/src/kernel/drivers/IO/PCI/pci.h b/source/kernel/drivers/IO/PCI/pci.h similarity index 100% rename from src/kernel/drivers/IO/PCI/pci.h rename to source/kernel/drivers/IO/PCI/pci.h diff --git a/src/kernel/drivers/IO/ata/ataDevice.cpp b/source/kernel/drivers/IO/ata/ataDevice.cpp similarity index 100% rename from src/kernel/drivers/IO/ata/ataDevice.cpp rename to source/kernel/drivers/IO/ata/ataDevice.cpp diff --git a/src/kernel/drivers/IO/ata/ataDevice.h b/source/kernel/drivers/IO/ata/ataDevice.h similarity index 100% rename from src/kernel/drivers/IO/ata/ataDevice.h rename to source/kernel/drivers/IO/ata/ataDevice.h diff --git a/src/kernel/drivers/IO/atapi/atapiDevice.cpp b/source/kernel/drivers/IO/atapi/atapiDevice.cpp similarity index 100% rename from src/kernel/drivers/IO/atapi/atapiDevice.cpp rename to source/kernel/drivers/IO/atapi/atapiDevice.cpp diff --git a/src/kernel/drivers/IO/atapi/atapiDevice.h b/source/kernel/drivers/IO/atapi/atapiDevice.h similarity index 100% rename from src/kernel/drivers/IO/atapi/atapiDevice.h rename to source/kernel/drivers/IO/atapi/atapiDevice.h diff --git a/src/kernel/drivers/IO/io.cpp b/source/kernel/drivers/IO/io.cpp similarity index 100% rename from src/kernel/drivers/IO/io.cpp rename to source/kernel/drivers/IO/io.cpp diff --git a/src/kernel/drivers/IO/io.h b/source/kernel/drivers/IO/io.h similarity index 100% rename from src/kernel/drivers/IO/io.h rename to source/kernel/drivers/IO/io.h diff --git a/src/kernel/drivers/VGA/VBE.h b/source/kernel/drivers/VGA/VBE.h similarity index 100% rename from src/kernel/drivers/VGA/VBE.h rename to source/kernel/drivers/VGA/VBE.h diff --git a/src/kernel/drivers/VGA/colors.h b/source/kernel/drivers/VGA/colors.h similarity index 100% rename from src/kernel/drivers/VGA/colors.h rename to source/kernel/drivers/VGA/colors.h diff --git a/src/kernel/drivers/cmos/cmos.cpp b/source/kernel/drivers/cmos/cmos.cpp similarity index 100% rename from src/kernel/drivers/cmos/cmos.cpp rename to source/kernel/drivers/cmos/cmos.cpp diff --git a/src/kernel/filesystems/EXT2/SuperBlock.h b/source/kernel/filesystems/EXT2/SuperBlock.h similarity index 100% rename from src/kernel/filesystems/EXT2/SuperBlock.h rename to source/kernel/filesystems/EXT2/SuperBlock.h diff --git a/src/kernel/filesystems/FAT/BiosParameterBlock.h b/source/kernel/filesystems/FAT/BiosParameterBlock.h similarity index 100% rename from src/kernel/filesystems/FAT/BiosParameterBlock.h rename to source/kernel/filesystems/FAT/BiosParameterBlock.h diff --git a/src/kernel/filesystems/FAT/DirectoryEntry.h b/source/kernel/filesystems/FAT/DirectoryEntry.h similarity index 100% rename from src/kernel/filesystems/FAT/DirectoryEntry.h rename to source/kernel/filesystems/FAT/DirectoryEntry.h diff --git a/src/kernel/filesystems/FAT/ExtendBootRecord.h b/source/kernel/filesystems/FAT/ExtendBootRecord.h similarity index 100% rename from src/kernel/filesystems/FAT/ExtendBootRecord.h rename to source/kernel/filesystems/FAT/ExtendBootRecord.h diff --git a/src/kernel/gdt/gdt.s b/source/kernel/gdt/gdt.s similarity index 100% rename from src/kernel/gdt/gdt.s rename to source/kernel/gdt/gdt.s diff --git a/src/kernel/gdt/gdtc.cpp b/source/kernel/gdt/gdtc.cpp similarity index 100% rename from src/kernel/gdt/gdtc.cpp rename to source/kernel/gdt/gdtc.cpp diff --git a/src/kernel/gdt/gdtc.h b/source/kernel/gdt/gdtc.h similarity index 100% rename from src/kernel/gdt/gdtc.h rename to source/kernel/gdt/gdtc.h diff --git a/src/kernel/ide/ide.h b/source/kernel/ide/ide.h similarity index 100% rename from src/kernel/ide/ide.h rename to source/kernel/ide/ide.h diff --git a/src/kernel/ide/ideCommands.h b/source/kernel/ide/ideCommands.h similarity index 100% rename from src/kernel/ide/ideCommands.h rename to source/kernel/ide/ideCommands.h diff --git a/src/kernel/ide/sampleIDE.definitions.h b/source/kernel/ide/sampleIDE.definitions.h similarity index 100% rename from src/kernel/ide/sampleIDE.definitions.h rename to source/kernel/ide/sampleIDE.definitions.h diff --git a/src/kernel/ide/sampleIDE.h b/source/kernel/ide/sampleIDE.h similarity index 100% rename from src/kernel/ide/sampleIDE.h rename to source/kernel/ide/sampleIDE.h diff --git a/src/kernel/idt/idt.cpp b/source/kernel/idt/idt.cpp similarity index 100% rename from src/kernel/idt/idt.cpp rename to source/kernel/idt/idt.cpp diff --git a/src/kernel/idt/idt.h b/source/kernel/idt/idt.h similarity index 100% rename from src/kernel/idt/idt.h rename to source/kernel/idt/idt.h diff --git a/src/kernel/idt/idt.s b/source/kernel/idt/idt.s similarity index 100% rename from src/kernel/idt/idt.s rename to source/kernel/idt/idt.s diff --git a/src/kernel/idt/scancodes/set1.h b/source/kernel/idt/scancodes/set1.h similarity index 100% rename from src/kernel/idt/scancodes/set1.h rename to source/kernel/idt/scancodes/set1.h diff --git a/src/kernel/irq_table.s b/source/kernel/irq_table.s similarity index 100% rename from src/kernel/irq_table.s rename to source/kernel/irq_table.s diff --git a/src/kernel/irs_table.s b/source/kernel/irs_table.s similarity index 100% rename from src/kernel/irs_table.s rename to source/kernel/irs_table.s diff --git a/src/kernel/kernel.cpp b/source/kernel/kernel.cpp similarity index 100% rename from src/kernel/kernel.cpp rename to source/kernel/kernel.cpp diff --git a/src/kernel/kernel.h b/source/kernel/kernel.h similarity index 100% rename from src/kernel/kernel.h rename to source/kernel/kernel.h diff --git a/src/kernel/keyboard/keyboard.cpp b/source/kernel/keyboard/keyboard.cpp similarity index 100% rename from src/kernel/keyboard/keyboard.cpp rename to source/kernel/keyboard/keyboard.cpp diff --git a/src/kernel/keyboard/keyboard.h b/source/kernel/keyboard/keyboard.h similarity index 100% rename from src/kernel/keyboard/keyboard.h rename to source/kernel/keyboard/keyboard.h diff --git a/src/kernel/kstructures/bitmap.h b/source/kernel/kstructures/bitmap.h similarity index 100% rename from src/kernel/kstructures/bitmap.h rename to source/kernel/kstructures/bitmap.h diff --git a/src/kernel/linker.ld b/source/kernel/linker.ld similarity index 100% rename from src/kernel/linker.ld rename to source/kernel/linker.ld diff --git a/src/kernel/memory/PageDirectory.cpp b/source/kernel/memory/PageDirectory.cpp similarity index 100% rename from src/kernel/memory/PageDirectory.cpp rename to source/kernel/memory/PageDirectory.cpp diff --git a/src/kernel/memory/PageDirectory.h b/source/kernel/memory/PageDirectory.h similarity index 100% rename from src/kernel/memory/PageDirectory.h rename to source/kernel/memory/PageDirectory.h diff --git a/src/kernel/memory/memory.cpp b/source/kernel/memory/memory.cpp similarity index 100% rename from src/kernel/memory/memory.cpp rename to source/kernel/memory/memory.cpp diff --git a/src/kernel/memory/memory.h b/source/kernel/memory/memory.h similarity index 100% rename from src/kernel/memory/memory.h rename to source/kernel/memory/memory.h diff --git a/src/kernel/memory/memoryinfo.h b/source/kernel/memory/memoryinfo.h similarity index 100% rename from src/kernel/memory/memoryinfo.h rename to source/kernel/memory/memoryinfo.h diff --git a/src/kernel/memory/paging.s b/source/kernel/memory/paging.s similarity index 100% rename from src/kernel/memory/paging.s rename to source/kernel/memory/paging.s diff --git a/src/kernel/pci/pciDevice.cpp b/source/kernel/pci/pciDevice.cpp similarity index 100% rename from src/kernel/pci/pciDevice.cpp rename to source/kernel/pci/pciDevice.cpp diff --git a/src/kernel/pci/pciDevice.h b/source/kernel/pci/pciDevice.h similarity index 100% rename from src/kernel/pci/pciDevice.h rename to source/kernel/pci/pciDevice.h diff --git a/src/kernel/pic/pic.cpp b/source/kernel/pic/pic.cpp similarity index 100% rename from src/kernel/pic/pic.cpp rename to source/kernel/pic/pic.cpp diff --git a/src/kernel/pic/pic.h b/source/kernel/pic/pic.h similarity index 100% rename from src/kernel/pic/pic.h rename to source/kernel/pic/pic.h diff --git a/src/kernel/pit.cpp b/source/kernel/pit.cpp similarity index 100% rename from src/kernel/pit.cpp rename to source/kernel/pit.cpp diff --git a/src/kernel/pit.h b/source/kernel/pit.h similarity index 100% rename from src/kernel/pit.h rename to source/kernel/pit.h diff --git a/src/kernel/serial.h b/source/kernel/serial.h similarity index 100% rename from src/kernel/serial.h rename to source/kernel/serial.h diff --git a/src/kernel/serial/serial.cpp b/source/kernel/serial/serial.cpp similarity index 100% rename from src/kernel/serial/serial.cpp rename to source/kernel/serial/serial.cpp diff --git a/src/kernel/serial/serial.h b/source/kernel/serial/serial.h similarity index 100% rename from src/kernel/serial/serial.h rename to source/kernel/serial/serial.h diff --git a/src/kernel/sv-terminal/superVisorTerminal.cpp b/source/kernel/sv-terminal/superVisorTerminal.cpp similarity index 100% rename from src/kernel/sv-terminal/superVisorTerminal.cpp rename to source/kernel/sv-terminal/superVisorTerminal.cpp diff --git a/src/kernel/sv-terminal/superVisorTerminal.h b/source/kernel/sv-terminal/superVisorTerminal.h similarity index 100% rename from src/kernel/sv-terminal/superVisorTerminal.h rename to source/kernel/sv-terminal/superVisorTerminal.h diff --git a/src/kernel/time.cpp b/source/kernel/time.cpp similarity index 100% rename from src/kernel/time.cpp rename to source/kernel/time.cpp diff --git a/src/kernel/time.h b/source/kernel/time.h similarity index 100% rename from src/kernel/time.h rename to source/kernel/time.h diff --git a/src/kernel/timer.cpp b/source/kernel/timer.cpp similarity index 100% rename from src/kernel/timer.cpp rename to source/kernel/timer.cpp diff --git a/src/kernel/timer.h b/source/kernel/timer.h similarity index 100% rename from src/kernel/timer.h rename to source/kernel/timer.h diff --git a/src/kernel/tty/kterm.cpp b/source/kernel/tty/kterm.cpp similarity index 100% rename from src/kernel/tty/kterm.cpp rename to source/kernel/tty/kterm.cpp diff --git a/src/kernel/tty/kterm.h b/source/kernel/tty/kterm.h similarity index 100% rename from src/kernel/tty/kterm.h rename to source/kernel/tty/kterm.h diff --git a/src/kernel/vfs/File.h b/source/kernel/vfs/File.h similarity index 100% rename from src/kernel/vfs/File.h rename to source/kernel/vfs/File.h diff --git a/src/kernel/vfs/VFS.cpp b/source/kernel/vfs/VFS.cpp similarity index 100% rename from src/kernel/vfs/VFS.cpp rename to source/kernel/vfs/VFS.cpp diff --git a/src/kernel/vfs/VFS.h b/source/kernel/vfs/VFS.h similarity index 100% rename from src/kernel/vfs/VFS.h rename to source/kernel/vfs/VFS.h diff --git a/src/libc/include/mem.h b/source/libc/include/mem.h similarity index 100% rename from src/libc/include/mem.h rename to source/libc/include/mem.h diff --git a/src/libc/include/string.c b/source/libc/include/string.c similarity index 100% rename from src/libc/include/string.c rename to source/libc/include/string.c diff --git a/src/libc/include/string.h b/source/libc/include/string.h similarity index 100% rename from src/libc/include/string.h rename to source/libc/include/string.h