From 5385c48978e4eac8bcf28b470c3fe03918d30a18 Mon Sep 17 00:00:00 2001 From: Michael Steil Date: Thu, 16 Oct 2008 08:31:42 +0000 Subject: [PATCH] cleanup --- defines_apple.s | 2 -- defines_cbm.s | 1 - defines_kbd.s | 1 - defines_kim.s | 3 --- defines_microtan.s | 3 --- init.s | 10 +++++----- 6 files changed, 5 insertions(+), 15 deletions(-) diff --git a/defines_apple.s b/defines_apple.s index 320399b..07bf02c 100644 --- a/defines_apple.s +++ b/defines_apple.s @@ -3,10 +3,8 @@ CONFIG_11 := 1 CBM2_APPLE := 1 CONFIG_SAFE_NAMENOTFOUND := 1 -CBM2_KIM_APPLE := 1 ; OUTDO difference CBM1_APPLE := 1 CBM_APPLE := 1 -KIM_APPLE := 1 APPLE_MICROTAN := 1 .define CONFIG_SCRTCH_ORDER 3 CONFIG_PRINT_CR := 1 ; print CR when line end reached diff --git a/defines_cbm.s b/defines_cbm.s index 2118faa..1078527 100644 --- a/defines_cbm.s +++ b/defines_cbm.s @@ -18,7 +18,6 @@ CBM2_KBD := 1 CBM2_MICROTAN := 1 CBM2_KIM := 1 CBM2_APPLE := 1 -CBM2_KIM_APPLE := 1 ; OUTDO difference CBM_APPLE := 1 CONFIG_DATAFLAG := 1 CONFIG_EASTER_EGG := 1 diff --git a/defines_kbd.s b/defines_kbd.s index 7973ab1..9f509b8 100644 --- a/defines_kbd.s +++ b/defines_kbd.s @@ -2,7 +2,6 @@ CONFIG_SMALL := 1 CONFIG_2 := 1 CBM2_KBD := 1 -KIM_KBD := 1 KBD_MICROTAN := 1 CONFIG_11 := 1 CONFIG_11A := 1 diff --git a/defines_kim.s b/defines_kim.s index bc0914b..50edf9b 100644 --- a/defines_kim.s +++ b/defines_kim.s @@ -1,9 +1,6 @@ -KIM_KBD := 1 CONFIG_11 := 1 CONFIG_11A := 1 CONFIG_SAFE_NAMENOTFOUND := 1 -CBM2_KIM_APPLE := 1 ; OUTDO difference -KIM_APPLE := 1 CONFIG_NULL := 1 CONFIG_PRINT_CR := 1 ; print CR when line end reached CONFIG_ROR_WORKAROUND := 1 diff --git a/defines_microtan.s b/defines_microtan.s index 82323c5..f17ec83 100644 --- a/defines_microtan.s +++ b/defines_microtan.s @@ -1,9 +1,6 @@ -KIM_KBD := 1 CONFIG_11 := 1 CONFIG_11A := 1 CONFIG_SAFE_NAMENOTFOUND := 1 -CBM2_KIM_APPLE := 1 ; OUTDO difference -KIM_APPLE := 1 CBM2_MICROTAN := 1 KBD_MICROTAN := 1 CONFIG_ROR_WORKAROUND := 1 diff --git a/init.s b/init.s index 9f30fe0..e7be5c7 100644 --- a/init.s +++ b/init.s @@ -145,17 +145,17 @@ L4098: lda #$03 sta DSCLEN .endif - .ifndef KIM_APPLE + .ifndef CONFIG_11 lda #$2C sta LINNUM+1 - .endif + .endif jsr CRDO -.endif -.ifdef APPLE + .endif + .ifdef APPLE lda #$01 sta $01FD sta $01FC -.endif + .endif ldx #TEMPST stx TEMPPT .ifndef CONFIG_CBM_ALL