From 89b887cd12e1337639a9bb0785d7bab595a1d398 Mon Sep 17 00:00:00 2001 From: FeralChild64 Date: Wed, 4 Dec 2019 20:56:20 +0100 Subject: [PATCH] fixed bug preventing JiffDOS stack from loading files --- CONFIG.md | 6 ++++++ bin/basic_generic.rom | Bin 8192 -> 8192 bytes bin/basic_mega65.rom | Bin 8192 -> 8192 bytes bin/basic_testing.rom | Bin 8192 -> 8192 bytes bin/basic_ultimate64.rom | Bin 8192 -> 8192 bytes bin/kernal_generic.rom | Bin 8192 -> 8192 bytes bin/kernal_mega65.rom | Bin 8192 -> 8192 bytes bin/kernal_testing.rom | Bin 8192 -> 8192 bytes bin/kernal_ultimate64.rom | Bin 8192 -> 8192 bytes c64/,,config_generic.s | 2 +- c64/,,config_mega65.s | 2 +- c64/,,config_testing.s | 2 +- c64/,,config_ultimate64.s | 2 +- c64/aliases/,aliases_config.s | 2 +- c64/kernal/iec_fast/iec_tx_byte_jiffydos.s | 6 +----- 15 files changed, 12 insertions(+), 10 deletions(-) diff --git a/CONFIG.md b/CONFIG.md index 1d200f10..06cc3736 100644 --- a/CONFIG.md +++ b/CONFIG.md @@ -103,6 +103,12 @@ Adds support for the IEEC bus - for serial printers, disk drives, etc. Needs over 1000 bytes in KERNAL segment. If unsure - enable. +### `CONFIG_IEC_JIFFYDOS` + +Adds support for JiffyDOS pprotocol to the IEC bus (note, that it currentlyy lacks the optimized LOAD loop, so it will be slower than original JiffyDOS enabled Kernal ROMs). + +Needs over 320 bytes in KERNAL segment. If unsure - enable. + ### `CONFIG_TAPE_TURBO` Adds a minimal turbo tape support - just LOAD command (device 7, like on _Action Replay_ and _Final_ cartridges) diff --git a/bin/basic_generic.rom b/bin/basic_generic.rom index ea4a02dfff5342a22d27bc8279f2c6ba222fe85e..a20878cb34d096738e804d0f4ebb2490050232c5 100644 GIT binary patch delta 173 zcmZp0XmFU|q51RMN_&M%|1(x8%wMZe_HL0PkX~wa^8W{(Me< on#ZF9qR#MGf+%)g6A)#~+Xhs*`6%y9K}M6w@$&T`!3XjR00J9Q$p8QV delta 173 zcmZp0XmFU|p}FS$N_&M%|1(x8%wMbU`o$teAidP;) zg=x+E%?&KC8Kto40;&O`$*pYttjpi~!_4&h#pGn}ARu@0cJ8Mj pY95ach&sb#38L6}O+b__ZyQkM=A*nb1sM$|$II7)1RuyN002!GP&WVo diff --git a/bin/basic_mega65.rom b/bin/basic_mega65.rom index c708078c64d689db63b273bdadc1c60ae1d509d0..e988783a56400f87e278d0d20ae2dacfe2cdd37d 100644 GIT binary patch delta 140 zcmZp0XmHqYh=pnUhs{S=elkjJ|FF_t;nM$%RSNUhD(v~NND)MD{{Tdrud~fzWZLs# zaw$g;Ncl+)BSs)S`7fsqh|=b=1W{>RCLqZnY|sCe^H-kE}oCX?gk7XkpF4Iv=_ delta 84 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 O%m@rKYvlHQuJ8Znb#E&G diff --git a/bin/kernal_mega65.rom b/bin/kernal_mega65.rom index 5b9fd48db413866a5733ce84e016068759d9f89f..fa7d782a8efe6eb33b869372c5b645d83a5d0524 100644 GIT binary patch delta 2811 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 delta 2454 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 delta 2676 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 diff --git a/c64/,,config_generic.s b/c64/,,config_generic.s index 09774f1b..25bca317 100644 --- a/c64/,,config_generic.s +++ b/c64/,,config_generic.s @@ -41,7 +41,7 @@ // I/O devices #define CONFIG_IEC -// #define CONFIG_IEC_JIFFYDOS // please keep disabled for now +#define CONFIG_IEC_JIFFYDOS // #define CONFIG_TAPE_NORMAL // please keep disabled for now #define CONFIG_TAPE_TURBO // #define CONFIG_RS232_UP2400 // please keep disabled for now diff --git a/c64/,,config_mega65.s b/c64/,,config_mega65.s index 6b179612..80f96095 100644 --- a/c64/,,config_mega65.s +++ b/c64/,,config_mega65.s @@ -43,7 +43,7 @@ // I/O devices #define CONFIG_IEC -// #define CONFIG_IEC_JIFFYDOS // please keep disabled for now +#define CONFIG_IEC_JIFFYDOS // #define CONFIG_TAPE_NORMAL // please keep disabled for now // #define CONFIG_TAPE_TURBO // #define CONFIG_RS232_UP2400 // please keep disabled for now diff --git a/c64/,,config_testing.s b/c64/,,config_testing.s index cdba7f9d..652a3e5d 100644 --- a/c64/,,config_testing.s +++ b/c64/,,config_testing.s @@ -42,7 +42,7 @@ // I/O devices #define CONFIG_IEC -// #define CONFIG_IEC_JIFFYDOS // please keep disabled for now +#define CONFIG_IEC_JIFFYDOS // #define CONFIG_TAPE_NORMAL // please keep disabled for now #define CONFIG_TAPE_TURBO // #define CONFIG_RS232_UP2400 // please keep disabled for now diff --git a/c64/,,config_ultimate64.s b/c64/,,config_ultimate64.s index 091f1974..7af94966 100644 --- a/c64/,,config_ultimate64.s +++ b/c64/,,config_ultimate64.s @@ -41,7 +41,7 @@ // I/O devices #define CONFIG_IEC -// #define CONFIG_IEC_JIFFYDOS // please keep disabled for now +#define CONFIG_IEC_JIFFYDOS // #define CONFIG_TAPE_NORMAL // please keep disabled for now #define CONFIG_TAPE_TURBO // #define CONFIG_RS232_UP2400 // please keep disabled for now diff --git a/c64/aliases/,aliases_config.s b/c64/aliases/,aliases_config.s index e40cbefb..132c7af0 100644 --- a/c64/aliases/,aliases_config.s +++ b/c64/aliases/,aliases_config.s @@ -317,7 +317,7 @@ #if !CONFIG_IEC_JIFFYDOS .eval features_str = ADD_FEATURE(features_str, "IEC") #else - .eval features_str = ADD_FEATURE(features_str, "IEC JIFFY-DEV") + .eval features_str = ADD_FEATURE(features_str, "IEC JIFFY") #endif #endif diff --git a/c64/kernal/iec_fast/iec_tx_byte_jiffydos.s b/c64/kernal/iec_fast/iec_tx_byte_jiffydos.s index 0cf331cc..a2b8a62e 100644 --- a/c64/kernal/iec_fast/iec_tx_byte_jiffydos.s +++ b/c64/kernal/iec_fast/iec_tx_byte_jiffydos.s @@ -48,7 +48,6 @@ iec_tx_byte_jiffydos: // Notify device that we are going to send byte by releasing everything stx CIA2_PRA // cycles: 4 - // Send high nibble; cycles: 4 + 3 + 4 + 2 + 2 + 2 + 3 + 4 = 24 pla // retrieve high nibble from stack ora C3PO // restore VIC-II and RS-232 bits @@ -80,10 +79,6 @@ iec_tx_byte_jiffydos_finalize: ora #BIT_CIA2_PRA_CLK_OUT // pull CLK sta CIA2_PRA - // Indicate that no byte waits in output buffer - lda #$00 - sta C3PO - // Restore proper IECPROTO value lda #$01 sta IECPROTO @@ -99,6 +94,7 @@ iec_tx_byte_jiffydos_finalize: iec_tx_byte_jiffydos_wait_eoi: + sta CIA2_PRA jsr iec_wait60us // XXX is it enough? lda C3PO jmp iec_tx_byte_jiffydos_finalize