From 1ec5db7171198d54258155bafa617cda48154c16 Mon Sep 17 00:00:00 2001
From: Michael Steil <mist64@mac.com>
Date: Thu, 16 Oct 2008 09:11:38 +0000
Subject: [PATCH] cleanup

---
 defines_cbm.s |  2 +-
 defines_kbd.s |  2 +-
 init.s        | 12 ++++++------
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/defines_cbm.s b/defines_cbm.s
index 1078527..d710841 100644
--- a/defines_cbm.s
+++ b/defines_cbm.s
@@ -14,7 +14,7 @@ CONFIG_CBM_ALL := 1
 CONFIG_11 := 1
 CONFIG_11A := 1
 CONFIG_2 := 1
-CBM2_KBD := 1
+CBM2_KBD := 1 ; 2 weird instances
 CBM2_MICROTAN := 1
 CBM2_KIM := 1
 CBM2_APPLE := 1
diff --git a/defines_kbd.s b/defines_kbd.s
index 9f509b8..b05388f 100644
--- a/defines_kbd.s
+++ b/defines_kbd.s
@@ -1,7 +1,7 @@
 .define CONFIG_SCRTCH_ORDER 3
 CONFIG_SMALL := 1
 CONFIG_2 := 1
-CBM2_KBD := 1
+CBM2_KBD := 1 ; 2 weird instances
 KBD_MICROTAN := 1
 CONFIG_11 := 1
 CONFIG_11A := 1
diff --git a/init.s b/init.s
index 566dfca..c3339b3 100644
--- a/init.s
+++ b/init.s
@@ -95,7 +95,7 @@ COLD_START2:
     .endif
         sta     Z18
   .endif
-  .ifdef CBM2_KBD
+  .ifdef CBM2
         lda     #$28
         sta     $0F
         lda     #$1E
@@ -136,7 +136,7 @@ L4098:
   .endif
         pha
         sta     Z14
-  .ifdef CBM2_KBD
+  .ifdef CBM2
         inx
         stx     $01FD
         stx     $01FC
@@ -199,7 +199,7 @@ L40D7:
         cmp     #$80
         beq     L40FA
 .endif
-.ifdef CBM2_KBD
+.ifdef CBM2
         bmi     L40FA
 .endif
 L40DD:
@@ -322,7 +322,7 @@ L4183:
         tya
         sta     (TXTTAB),y
         inc     TXTTAB
-.ifndef CBM2_KBD
+.ifndef CBM2
         bne     L4192
         inc     TXTTAB+1
 L4192:
@@ -333,7 +333,7 @@ L4192:
         lda     TXTTAB
         ldy     TXTTAB+1
         jsr     REASON
-.ifdef CBM2_KBD
+.ifdef CBM2
         lda     #<QT_BASIC
         ldy     #>QT_BASIC
         jsr     STROUT
@@ -401,7 +401,7 @@ QT_BYTES_FREE:
 .ifndef CBM_APPLE
         .byte   $0D,$0A,$0D,$0A
 .endif
-.ifdef CBM2_KBD
+.ifdef CBM2
         .byte   $0D,$00
 .endif
 .ifdef APPLE