From 51f6dac0e8bba0c4d8ac1cfe689504e4c01066b9 Mon Sep 17 00:00:00 2001 From: Vince Weaver Date: Sun, 30 May 2021 21:13:26 -0400 Subject: [PATCH] pt3_lib: make apple iic support conditional --- music/pt3_lib/pt3_lib_mockingboard_detect.s | 2 ++ music/pt3_lib/pt3_lib_mockingboard_setup.s | 2 ++ music/pt3_lib/pt3_test.s | 11 +++++++++++ 3 files changed, 15 insertions(+) diff --git a/music/pt3_lib/pt3_lib_mockingboard_detect.s b/music/pt3_lib/pt3_lib_mockingboard_detect.s index 925be47f..8b0857c5 100644 --- a/music/pt3_lib/pt3_lib_mockingboard_detect.s +++ b/music/pt3_lib/pt3_lib_mockingboard_detect.s @@ -39,6 +39,7 @@ mockingboard_detect: ; I get the impression the Mockingboard 4c activates ; when you access any of the 6522 ports in Slot 4 +.ifdef PT3_ENABLE_APPLE_IIC lda APPLEII_MODEL cmp #'C' bne not_iic @@ -49,6 +50,7 @@ mockingboard_detect: sta MOCK_6522_DDRA1 sta MOCK_6522_T1CL +.endif not_iic: lda #$00 diff --git a/music/pt3_lib/pt3_lib_mockingboard_setup.s b/music/pt3_lib/pt3_lib_mockingboard_setup.s index ff563546..2f00bc4a 100644 --- a/music/pt3_lib/pt3_lib_mockingboard_setup.s +++ b/music/pt3_lib/pt3_lib_mockingboard_setup.s @@ -170,6 +170,7 @@ clear_ay_end: ;============================= mockingboard_setup_interrupt: +.ifdef PT3_ENABLE_APPLE_IIC lda APPLEII_MODEL cmp #'C' bne done_iic_hack @@ -216,6 +217,7 @@ write_rom_loop: lda #$EA ; nop out the "lda $45" in the irq handler sta interrupt_smc sta interrupt_smc+1 +.endif done_iic_hack: diff --git a/music/pt3_lib/pt3_test.s b/music/pt3_lib/pt3_test.s index 11bac7b9..a1998b04 100644 --- a/music/pt3_lib/pt3_test.s +++ b/music/pt3_lib/pt3_test.s @@ -20,6 +20,12 @@ PT3_LOC = song ; PT3_USE_ZERO_PAGE = 1 +; Comment this to disable Apple IIc support which will free a small amount +; of room + +PT3_ENABLE_APPLE_IIC = 1 + + ;============================= ; Setup ;============================= @@ -43,7 +49,9 @@ pt3_setup: ; IRQ setup is different on IIc ; You can possibly skip this if you only care about II+/IIe +.ifdef PT3_ENABLE_APPLE_IIC jsr detect_appleii_model +.endif ;======================= ; Detect mockingboard @@ -208,7 +216,10 @@ found_message: .asciiz "FOUND SLOT#4" ;routines ;========= +.ifdef PT3_ENABLE_APPLE_IIC .include "pt3_lib_detect_model.s" +.endif + .include "pt3_lib_core.s" .include "pt3_lib_init.s" .include "pt3_lib_mockingboard_setup.s"