From bc6f5d038037febfbad95ec7313fda2e1bd003e1 Mon Sep 17 00:00:00 2001
From: Michael Steil <mist64@mac.com>
Date: Fri, 17 Oct 2008 07:04:05 +0000
Subject: [PATCH] cleanup

---
 defines_cbm.s  | 17 +++++++++--------
 defines_kbd.s  | 23 +++++------------------
 defines_kim.s  |  6 +++---
 kim_loadsave.s |  9 +++++----
 string.s       |  4 ++--
 5 files changed, 24 insertions(+), 35 deletions(-)

diff --git a/defines_cbm.s b/defines_cbm.s
index 8c46e61..69c159f 100644
--- a/defines_cbm.s
+++ b/defines_cbm.s
@@ -1,5 +1,12 @@
-.ifdef CBM1
+; common:
+CONFIG_CBM_ALL := 1
 
+CONFIG_FILE := 1; support PRINT#, INPUT#, GET#, CMD
+CONFIG_NO_CR := 1; terminal doesn't need explicit CRs on line ends
+CONFIG_NO_LINE_EDITING := 1; support for "@", "_", BEL etc.
+CONFIG_SCRTCH_ORDER := 2
+
+.ifdef CBM1
 CONFIG_BUG_GET_ERROR := 1; treat GET error like READ error
 CONFIG_CBM1_PATCHES := 1 ; ** don't turn off! **
 CONFIG_DATAFLAG := 1
@@ -11,6 +18,7 @@ CONFIG_11 := 1
 CONFIG_11A := 1
 CONFIG_2 := 1
 CONFIG_2A := 1
+
 CONFIG_DATAFLAG := 1
 CONFIG_EASTER_EGG := 1
 CONFIG_NO_READ_Y_IS_ZERO_HACK := 1
@@ -18,13 +26,6 @@ CONFIG_PEEK_SAVE_LINNUM := 1
 ; INPUTBUFFER > $0100
 .endif
 
-; common:
-CONFIG_CBM_ALL := 1
-
-CONFIG_FILE := 1; support PRINT#, INPUT#, GET#, CMD
-CONFIG_NO_CR := 1; terminal doesn't need explicit CRs on line ends
-CONFIG_NO_LINE_EDITING := 1; support for "@", "_", BEL etc.
-CONFIG_SCRTCH_ORDER := 2
 
 CRLF_1 := CR
 CRLF_2 := LF
diff --git a/defines_kbd.s b/defines_kbd.s
index 1a976c7..64e5714 100644
--- a/defines_kbd.s
+++ b/defines_kbd.s
@@ -1,29 +1,22 @@
-CONFIG_SCRTCH_ORDER := 3
-CONFIG_SMALL := 1
-CONFIG_NO_READ_Y_IS_ZERO_HACK := 1
 CONFIG_11 := 1
 CONFIG_11A := 1
 CONFIG_2 := 1
 CONFIG_2A := 1
 CONFIG_2B := 1
 
-CONFIG_SAFE_NAMENOTFOUND := 1
-; INPUTBUFFER > $0100
 CONFIG_NO_POKE := 1
+CONFIG_NO_READ_Y_IS_ZERO_HACK := 1
+CONFIG_SAFE_NAMENOTFOUND := 1
+CONFIG_SCRTCH_ORDER := 3
+CONFIG_SMALL := 1
+; INPUTBUFFER > $0100
 
 CRLF_1 := LF
 CRLF_2 := CR
 
 ZP_START = $15
 
-L0001           := $0001
-L0002           := $0002
-GOSTROUT        := $0003
-GOAYINT         := $0006
-GOGIVEAYF       := $0008
 
-USR             := $000A
-Z15             := $000D
 POSX            := $0010
 Z17             := $06FC;$000F
 Z18             := $06FD;$0010
@@ -48,13 +41,7 @@ Z96				:= $0096
 
 L06FE			:= $06FE
 
-L0207           := $0207
-L020A           := $020A
-MONRDKEY        := $FFEB
 MONCOUT         := $FDFA
-MONISCNTC       := $FFF1
-LOAD            := $FFF4
-SAVE            := $FFF7
 
 STACK_TOP		:= $FE
 SPACE_FOR_GOSUB := $49
diff --git a/defines_kim.s b/defines_kim.s
index de7f7e1..7a979b2 100644
--- a/defines_kim.s
+++ b/defines_kim.s
@@ -1,10 +1,11 @@
 CONFIG_11 := 1
 CONFIG_11A := 1
-CONFIG_SAFE_NAMENOTFOUND := 1
+
+CONFIG_MONCOUT_DESTROYS_Y := 1
 CONFIG_NULL := 1
 CONFIG_PRINT_CR := 1 ; print CR when line end reached
 CONFIG_ROR_WORKAROUND := 1
-CONFIG_MONCOUT_DESTROYS_Y := 1
+CONFIG_SAFE_NAMENOTFOUND := 1
 CONFIG_SCRTCH_ORDER := 2
 
 CRLF_1 := CR
@@ -17,7 +18,6 @@ LOWTRX = LOWTR
 
 GORESTART       := $0000
 L0001           := $0001
-L0002           := $0002
 GOSTROUT        := $0003
 GOAYINT         := $0006
 GOGIVEAYF       := $0008
diff --git a/kim_loadsave.s b/kim_loadsave.s
index 9e65e81..59ffdbc 100644
--- a/kim_loadsave.s
+++ b/kim_loadsave.s
@@ -35,15 +35,16 @@ LOAD:
         sty     $17F6
         lda     #$FF
         sta     $17F9
-        lda     #$A6
-        ldy     #$27 ; XXX
+        lda     #<L27A6
+        ldy     #>L27A6
         sta     L0001
         sty     L0001+1
         jmp     L1873
+L27A6:
         ldx     #$FF
         txs
-        lda     #$48
-        ldy     #$23 ; XXX
+        lda     #<RESTART
+        ldy     #>RESTART
         sta     L0001
         sty     L0001+1
         lda     #<QT_LOADED
diff --git a/string.s b/string.s
index 9e2a45f..0f6c1a7 100644
--- a/string.s
+++ b/string.s
@@ -177,7 +177,7 @@ L3311:
 ; ----------------------------------------------------------------------------
 GARBAG:
 
-.ifdef KBD
+.ifdef CONST_MEMSIZ
         ldx     #<CONST_MEMSIZ
         lda     #>CONST_MEMSIZ
 .else
@@ -266,7 +266,7 @@ L3376:
 .ifdef CBM1
         jsr     LE7F3
 .else
-  .ifndef OSI
+  .ifdef CONFIG_11
         ldy     #$00
   .endif
         asl     a