From 82729bb62183e1c52360b1f266b857e886b50404 Mon Sep 17 00:00:00 2001 From: FeralChild64 Date: Tue, 2 Feb 2021 22:06:57 +0100 Subject: [PATCH] removed obsolete code, CBDOS is going to be based on hypervisor calls --- Makefile | 4 +--- src/,,config_mega65.s | 2 -- src/aliases/,aliases_config.s | 12 ----------- src/basic/assets/str_nolgpl3_warn.s | 15 -------------- src/basic/init/initmsg_m65.s | 9 --------- src/basic/init/initmsg_real.s | 2 -- src/dos_m65/,aliases_dos.s | 20 ------------------- .../{sdcard => ,disabled}/sdcard_helpers.s | 0 .../{sdcard => ,disabled}/sdcard_init.s | 0 .../{sdcard => ,disabled}/sdcard_readsector.s | 0 .../{sdcard => ,disabled}/sdcard_reset.s | 0 .../{sdcard => ,disabled}/sdcard_wait.s | 0 .../sdcard_writesector.s | 0 src/dos_m65/cmdrdos/,check_nonlgpl3.s | 4 ---- src/dos_m65/dos_init.s | 5 ----- 15 files changed, 1 insertion(+), 72 deletions(-) delete mode 100644 src/basic/assets/str_nolgpl3_warn.s rename src/dos_m65/{sdcard => ,disabled}/sdcard_helpers.s (100%) rename src/dos_m65/{sdcard => ,disabled}/sdcard_init.s (100%) rename src/dos_m65/{sdcard => ,disabled}/sdcard_readsector.s (100%) rename src/dos_m65/{sdcard => ,disabled}/sdcard_reset.s (100%) rename src/dos_m65/{sdcard => ,disabled}/sdcard_wait.s (100%) rename src/dos_m65/{sdcard => ,disabled}/sdcard_writesector.s (100%) delete mode 100644 src/dos_m65/cmdrdos/,check_nonlgpl3.s diff --git a/Makefile b/Makefile index f939a90f..782ad434 100644 --- a/Makefile +++ b/Makefile @@ -61,9 +61,7 @@ SRCDIR_KERNAL = $(SRCDIR_COMMON) \ src/kernal/time SRCDIR_DOS_M65 = $(SRCDIR_COMMON) \ - src/dos_m65 \ - # src/dos_m65/cmdrdos \ - src/dos_m65/sdcard + src/dos_m65 SRCDIR_MON_M65 = $(SRCDIR_COMMON) \ src/mon_m65 diff --git a/src/,,config_mega65.s b/src/,,config_mega65.s index dbf5f316..4d13d9f8 100644 --- a/src/,,config_mega65.s +++ b/src/,,config_mega65.s @@ -91,8 +91,6 @@ ; --- Built-in DOS configuration -;; #CONFIG# CMDRDOS NO ; do not change, DOS is not implemented yet - ;; #CONFIG# UNIT_SDCARD 0 ; do not change, DOS is not implemented yet ;; #CONFIG# UNIT_FLOPPY 0 ; do not change, DOS is not implemented yet ;; #CONFIG# UNIT_RAMDISK 0 ; do not change, DOS is not implemented yet diff --git a/src/aliases/,aliases_config.s b/src/aliases/,aliases_config.s index 524eaabc..5d00e55f 100644 --- a/src/aliases/,aliases_config.s +++ b/src/aliases/,aliases_config.s @@ -247,12 +247,6 @@ !ifndef CONFIG_VIC_PALETTE { !error "CONFIG_VIC_PALETTE not specified" } } -; Check that internal DOS configuration is correct - -!ifdef CONFIG_CMDRDOS { !ifndef CONFIG_MB_M65 { - !error "CONFIG_CMDRDOS requires CONFIG_MB_M65" -} } - ; Check that startup banner configuration is correct @@ -424,12 +418,6 @@ -; Handle non-LGPL3 code - -!ifdef CONFIG_CMDRDOS { !set HAS_NOLGPL3_WARN = 1 } - - - ; Determine if we need space-savings in BASIC code !ifndef CONFIG_MB_M65 { !ifndef ROM_LAYOUT_CRT { diff --git a/src/basic/assets/str_nolgpl3_warn.s b/src/basic/assets/str_nolgpl3_warn.s deleted file mode 100644 index 88bf8fa9..00000000 --- a/src/basic/assets/str_nolgpl3_warn.s +++ /dev/null @@ -1,15 +0,0 @@ -;; #LAYOUT# M65 BASIC_1 #TAKE -;; #LAYOUT# * * #IGNORE - - - -!ifdef HAS_NOLGPL3_WARN { - -str_nonlgpl3_warn: - - !byte $0D, $0D, $0D, $0D - !pet "build contains non-lgpl3 code" - !byte $0D - !pet " *** do not distribute ***" - !byte $0D, $0D, $00 -} diff --git a/src/basic/init/initmsg_m65.s b/src/basic/init/initmsg_m65.s index e36672d7..3608cc7a 100644 --- a/src/basic/init/initmsg_m65.s +++ b/src/basic/init/initmsg_m65.s @@ -64,18 +64,9 @@ INITMSG_native: jsr initmsg_bytes_free -!ifdef HAS_NOLGPL3_WARN { - - lda #str_nonlgpl3_warn - jmp STROUT - -} else { - ldx #$09 ldy #$00 jmp plot_set -} INITMSG_main_banner: diff --git a/src/basic/init/initmsg_real.s b/src/basic/init/initmsg_real.s index d8a21c32..01384071 100644 --- a/src/basic/init/initmsg_real.s +++ b/src/basic/init/initmsg_real.s @@ -115,5 +115,3 @@ initmsg_real: } } - -!ifdef HAS_NOLGPL3_WARN { !error "HAS_NOLGPL3_WARN not implemented" } diff --git a/src/dos_m65/,aliases_dos.s b/src/dos_m65/,aliases_dos.s index 9a00472e..ffc4f214 100644 --- a/src/dos_m65/,aliases_dos.s +++ b/src/dos_m65/,aliases_dos.s @@ -20,23 +20,3 @@ !addr UNIT_SDCARD = $05 !addr UNIT_FLOPPY = $06 !addr UNIT_RAMDISK = $07 - - ; SD/SDHC card variables - - !addr CARD_INIT_DONE = $08 ; $80 - init done, $00 - init not done - !addr CARD_IS_SDHC = $09 ; $00 = SD, $80 = SDHC - !addr CARD_SIZE = $0A ; 4 bytes - !addr CARD_SECNUM = $0E ; 4 bytes - sector number - - !addr CARD_TMP_STEP = $12 ; 4 bytes - !addr CARD_TMP_RETRIES = $16 ; 1 byte - - !addr CARD_BUFPNT1 = $17 ; 4 bytes - pointer to hardware sector buffer XXX replace copy routines with DMAgic - !addr CARD_BUFPNT2 = $1B ; 4 bytes - as above, but points to the 2nd page of the hardware buffer - - - ; - ; High memory - ; - - !addr CARD_BUF = $8100 ; 512 bytes, up to $82FF - buffer for reading/writing data diff --git a/src/dos_m65/sdcard/sdcard_helpers.s b/src/dos_m65/,disabled/sdcard_helpers.s similarity index 100% rename from src/dos_m65/sdcard/sdcard_helpers.s rename to src/dos_m65/,disabled/sdcard_helpers.s diff --git a/src/dos_m65/sdcard/sdcard_init.s b/src/dos_m65/,disabled/sdcard_init.s similarity index 100% rename from src/dos_m65/sdcard/sdcard_init.s rename to src/dos_m65/,disabled/sdcard_init.s diff --git a/src/dos_m65/sdcard/sdcard_readsector.s b/src/dos_m65/,disabled/sdcard_readsector.s similarity index 100% rename from src/dos_m65/sdcard/sdcard_readsector.s rename to src/dos_m65/,disabled/sdcard_readsector.s diff --git a/src/dos_m65/sdcard/sdcard_reset.s b/src/dos_m65/,disabled/sdcard_reset.s similarity index 100% rename from src/dos_m65/sdcard/sdcard_reset.s rename to src/dos_m65/,disabled/sdcard_reset.s diff --git a/src/dos_m65/sdcard/sdcard_wait.s b/src/dos_m65/,disabled/sdcard_wait.s similarity index 100% rename from src/dos_m65/sdcard/sdcard_wait.s rename to src/dos_m65/,disabled/sdcard_wait.s diff --git a/src/dos_m65/sdcard/sdcard_writesector.s b/src/dos_m65/,disabled/sdcard_writesector.s similarity index 100% rename from src/dos_m65/sdcard/sdcard_writesector.s rename to src/dos_m65/,disabled/sdcard_writesector.s diff --git a/src/dos_m65/cmdrdos/,check_nonlgpl3.s b/src/dos_m65/cmdrdos/,check_nonlgpl3.s deleted file mode 100644 index a5e16f82..00000000 --- a/src/dos_m65/cmdrdos/,check_nonlgpl3.s +++ /dev/null @@ -1,4 +0,0 @@ - -!ifndef HAS_NOLGPL3_WARN { - !error "No LGPL3 incompatible warning issued" -} diff --git a/src/dos_m65/dos_init.s b/src/dos_m65/dos_init.s index 5654e923..f7bd85f6 100644 --- a/src/dos_m65/dos_init.s +++ b/src/dos_m65/dos_init.s @@ -26,9 +26,4 @@ dos_INIT: lda #CONFIG_UNIT_RAMDISK sta UNIT_RAMDISK - ; Mark SD card as not initialized - - lda #$00 - sta CARD_INIT_DONE - rts