From 4be89373f6ca4a953562704ddcb4ae245ef22459 Mon Sep 17 00:00:00 2001 From: ry755 Date: Tue, 22 Feb 2022 14:05:39 -0800 Subject: [PATCH] fox32+fox32rom: Rename "mount"/"unmount" to "insert"/"remove" --- boot.asm | 2 +- main.asm | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/boot.asm b/boot.asm index 92f57e6..200116c 100644 --- a/boot.asm +++ b/boot.asm @@ -9,7 +9,7 @@ ; none (doesn't return) start_boot_process: ; in the future, this will check the header for various different types of disk types - ; but for now, just assume the user mounted a raw binary + ; but for now, just assume the user inserted a raw binary ; load it to 0x00000800 (immediately after the interrupt vectors) and jump ; r0 contains the size of the disk in bytes diff --git a/main.asm b/main.asm index ff46e58..e006423 100644 --- a/main.asm +++ b/main.asm @@ -108,8 +108,8 @@ event_loop: cmp r0, MENU_CLICK_EVENT_TYPE ifz call menu_click_event - ; check if a disk is mounted as disk 0 - ; if port 0x8000100n returns a non-zero value, then a disk is mounted as disk n + ; check if a disk is inserted as disk 0 + ; if port 0x8000100n returns a non-zero value, then a disk is inserted as disk n in r0, 0x80001000 cmp r0, 0 ifnz call start_boot_process @@ -123,9 +123,9 @@ menu_click_event: cmp r3, 0 ; - ; mount disk + ; insert disk cmp r3, 1 - ifz jmp mount_boot_disk + ifz jmp insert_boot_disk ; halt cmp r3, 2 @@ -134,7 +134,7 @@ menu_click_event: ret -mount_boot_disk: +insert_boot_disk: mov r0, 0x80001000 out r0, 0 ret @@ -254,10 +254,10 @@ menu_items_system_name: data.8 6 data.str "System" data.8 0x00 ; text length, text, null-terminator menu_items_system_list: data.8 3 ; number of items - data.8 12 ; menu width (usually longest item + 2) - data.8 5 data.str "About" data.8 0x00 ; text length, text, null-terminator - data.8 10 data.str "Mount Disk" data.8 0x00 ; text length, text, null-terminator - data.8 4 data.str "Halt" data.8 0x00 ; text length, text, null-terminator + data.8 13 ; menu width (usually longest item + 2) + data.8 5 data.str "About" data.8 0x00 ; text length, text, null-terminator + data.8 11 data.str "Insert Disk" data.8 0x00 ; text length, text, null-terminator + data.8 4 data.str "Halt" data.8 0x00 ; text length, text, null-terminator ; pad out to 512 KiB org.pad 0xF0080000