From 0316b6be40875a59a3b8f792ef5e90c742af5524 Mon Sep 17 00:00:00 2001 From: "E. Almqvist" Date: Sat, 31 Jul 2021 23:56:00 +0200 Subject: [PATCH 1/5] Refactor (again) --- src/bios/disk.asm | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/bios/disk.asm b/src/bios/disk.asm index 0f1b171..9cb7cbf 100644 --- a/src/bios/disk.asm +++ b/src/bios/disk.asm @@ -1,5 +1,4 @@ disk_read: - pusha push dx ; store dx on stack so that we can compare later mov ah, BIOS_DISK_READ ; specify function @@ -18,7 +17,6 @@ disk_read: cmp dh, al ; if dh != al then error jne sector_error - popa ret sector_error: From b2cd9ed46c81cca7bcb166dc94533ce22c817e92 Mon Sep 17 00:00:00 2001 From: "E. Almqvist" Date: Sun, 1 Aug 2021 16:03:21 +0200 Subject: [PATCH 2/5] Minor indentation fix --- src/bootloader.asm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/bootloader.asm b/src/bootloader.asm index 036c78b..61a325c 100644 --- a/src/bootloader.asm +++ b/src/bootloader.asm @@ -12,8 +12,8 @@ ; Read second sector (outside bootsector) mov bx, 0x9000 ; LOAD LOCATION - mov dh, 2 ; SECTOR-COUNT - mov dl, [BOOT_DRIVE] ; DISK-INDEX + mov dh, 2 ; SECTOR-COUNT + mov dl, [BOOT_DRIVE] ; DISK-INDEX call disk_read @@ -33,7 +33,7 @@ %include "bios.asm" ; Data -welcome_string: db "e Operating-System (eOS)", ASCII_CARRIAGE_RETURN, ASCII_LINEBREAK, "Version 2021 0.0", ASCII_END +welcome_string: db "e Operating-System (eOS)", ASCII_CARRIAGE_RETURN, ASCII_LINEBREAK, "Version 2021 0.0", ASCII_END BOOT_DRIVE: db 0 ; Bootsector From 0f20ea6978e08eb011284ca90cf9058556ad3d3d Mon Sep 17 00:00:00 2001 From: "E. Almqvist" Date: Sun, 1 Aug 2021 16:48:56 +0200 Subject: [PATCH 3/5] Minor refactor --- src/{ => pm}/vga/print.asm | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/{ => pm}/vga/print.asm (100%) diff --git a/src/vga/print.asm b/src/pm/vga/print.asm similarity index 100% rename from src/vga/print.asm rename to src/pm/vga/print.asm From ea012f5597087d9575a95300cbee3b5fd14341b1 Mon Sep 17 00:00:00 2001 From: "E. Almqvist" Date: Sun, 1 Aug 2021 16:51:35 +0200 Subject: [PATCH 4/5] Filename refactor (again) --- src/bios.asm | 2 +- src/bootloader.asm | 2 +- src/equ/{ASCII.asm => ascii.asm} | 0 src/equ/{BIOS.asm => bios.asm} | 0 src/equ/{VGA.asm => vga.asm} | 0 src/pm.asm | 0 6 files changed, 2 insertions(+), 2 deletions(-) rename src/equ/{ASCII.asm => ascii.asm} (100%) rename src/equ/{BIOS.asm => bios.asm} (100%) rename src/equ/{VGA.asm => vga.asm} (100%) create mode 100644 src/pm.asm diff --git a/src/bios.asm b/src/bios.asm index 9fdbef1..0796eea 100644 --- a/src/bios.asm +++ b/src/bios.asm @@ -1,5 +1,5 @@ ; EQUs -%include "equ/BIOS.asm" +%include "equ/bios.asm" ; SRs %include "bios/convert.asm" diff --git a/src/bootloader.asm b/src/bootloader.asm index 61a325c..556b3a3 100644 --- a/src/bootloader.asm +++ b/src/bootloader.asm @@ -29,7 +29,7 @@ jmp $ ; inf loop -%include "equ/ASCII.asm" +%include "equ/ascii.asm" %include "bios.asm" ; Data diff --git a/src/equ/ASCII.asm b/src/equ/ascii.asm similarity index 100% rename from src/equ/ASCII.asm rename to src/equ/ascii.asm diff --git a/src/equ/BIOS.asm b/src/equ/bios.asm similarity index 100% rename from src/equ/BIOS.asm rename to src/equ/bios.asm diff --git a/src/equ/VGA.asm b/src/equ/vga.asm similarity index 100% rename from src/equ/VGA.asm rename to src/equ/vga.asm diff --git a/src/pm.asm b/src/pm.asm new file mode 100644 index 0000000..e69de29 From 9289fa6ef673aa332a6e70d73f91443e690764af Mon Sep 17 00:00:00 2001 From: "E. Almqvist" Date: Sun, 1 Aug 2021 16:53:07 +0200 Subject: [PATCH 5/5] PM stuff --- src/bootloader.asm | 1 + src/pm.asm | 2 ++ 2 files changed, 3 insertions(+) diff --git a/src/bootloader.asm b/src/bootloader.asm index 556b3a3..e54643c 100644 --- a/src/bootloader.asm +++ b/src/bootloader.asm @@ -31,6 +31,7 @@ %include "equ/ascii.asm" %include "bios.asm" +%include "pm.asm" ; Data welcome_string: db "e Operating-System (eOS)", ASCII_CARRIAGE_RETURN, ASCII_LINEBREAK, "Version 2021 0.0", ASCII_END diff --git a/src/pm.asm b/src/pm.asm index e69de29..822cd96 100644 --- a/src/pm.asm +++ b/src/pm.asm @@ -0,0 +1,2 @@ +%include "equ/vga.asm" +%include "pm/vga/print.asm"