From e7e052698f6535c48354ba844ec8121704cbb29d Mon Sep 17 00:00:00 2001 From: "E. Almqvist" Date: Fri, 21 May 2021 10:12:23 +0200 Subject: [PATCH] Updated file struc --- src/bios.asm | 3 +++ src/{elib => bios}/convert.asm | 0 src/{elib/bios_disk.asm => bios/disk.asm} | 0 src/{elib => bios}/io.asm | 1 - src/bootloader.asm | 7 ++----- 5 files changed, 5 insertions(+), 6 deletions(-) create mode 100644 src/bios.asm rename src/{elib => bios}/convert.asm (100%) rename src/{elib/bios_disk.asm => bios/disk.asm} (100%) rename src/{elib => bios}/io.asm (98%) diff --git a/src/bios.asm b/src/bios.asm new file mode 100644 index 0000000..f6fadcb --- /dev/null +++ b/src/bios.asm @@ -0,0 +1,3 @@ +%include "bios/convert.asm" +%include "bios/io.asm" +%include "bios/disk.asm" diff --git a/src/elib/convert.asm b/src/bios/convert.asm similarity index 100% rename from src/elib/convert.asm rename to src/bios/convert.asm diff --git a/src/elib/bios_disk.asm b/src/bios/disk.asm similarity index 100% rename from src/elib/bios_disk.asm rename to src/bios/disk.asm diff --git a/src/elib/io.asm b/src/bios/io.asm similarity index 98% rename from src/elib/io.asm rename to src/bios/io.asm index 4624849..24b8435 100644 --- a/src/elib/io.asm +++ b/src/bios/io.asm @@ -1,4 +1,3 @@ -; eLibrary ; Input/Output subroutines ; Subroutine to print a string diff --git a/src/bootloader.asm b/src/bootloader.asm index 7327666..074e264 100644 --- a/src/bootloader.asm +++ b/src/bootloader.asm @@ -35,11 +35,8 @@ %include "equ/BIOS.asm" %include "equ/ASCII.asm" -; SRs -%include "elib/convert.asm" -%include "elib/io.asm" - -%include "elib/bios_disk.asm" +; Load in BIOS stuff +%include "bios.asm" welcome_string: db "e Operating-System (eOS)", ASCII_END info_string: db "Version 2021 0.0", ASCII_END