From d22cda67d6e389dbc5c51a8337e1d282f86974ed Mon Sep 17 00:00:00 2001
From: Michael Steil <mist64@mac.com>
Date: Sat, 18 Oct 2008 05:18:45 +0000
Subject: [PATCH] cleanup

---
 defines_apple.s | 4 ++++
 defines_cbm.s   | 3 +++
 defines_kbd.s   | 3 +++
 flow.s          | 4 ++--
 init.s          | 2 +-
 input.s         | 2 +-
 program.s       | 4 ++--
 string.s        | 2 +-
 8 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/defines_apple.s b/defines_apple.s
index 98051b9..c6eb0be 100644
--- a/defines_apple.s
+++ b/defines_apple.s
@@ -25,6 +25,10 @@ USR				:= $000A
 ;LINNUM          := $0053
 
 TXPSV           := $0053
+
+CONFIG_NO_INPUTBUFFER_ZP := 1
+CONFIG_INPUTBUFFER_0200 := 1
+
 INPUTBUFFER     := $0200
 INPUTBUFFERX    := $0200
 
diff --git a/defines_cbm.s b/defines_cbm.s
index 2aaec82..eb3b887 100644
--- a/defines_cbm.s
+++ b/defines_cbm.s
@@ -76,6 +76,9 @@ POSX			:= $00C6
 
 TXPSV = LASTOP
 
+CONFIG_NO_INPUTBUFFER_ZP := 1
+CONFIG_INPUTBUFFER_0200 := 1
+
 INPUTBUFFER     := $0200
 INPUTBUFFERX    := $0200
 .endif
diff --git a/defines_kbd.s b/defines_kbd.s
index d178479..c178b66 100644
--- a/defines_kbd.s
+++ b/defines_kbd.s
@@ -30,6 +30,9 @@ Z18             := $06FD
 
 
 TXPSV           := $0049
+
+CONFIG_NO_INPUTBUFFER_ZP := 1
+
 INPUTBUFFER     := $0700
 INPUTBUFFERX    := $0700
 
diff --git a/flow.s b/flow.s
index 42c2f78..de3454d 100644
--- a/flow.s
+++ b/flow.s
@@ -82,7 +82,7 @@ NEWSTT:
         jsr     ISCNTC
         lda     TXTPTR
         ldy     TXTPTR+1
-.if (INPUTBUFFER >=$0100) && .def(CONFIG_2)
+.if .def(CONFIG_NO_INPUTBUFFER_ZP) && .def(CONFIG_2)
         cpy     #>INPUTBUFFER
   .ifdef CBM2
         nop
@@ -274,7 +274,7 @@ END2:
         bne     RET1
         lda     TXTPTR
         ldy     TXTPTR+1
-.if (INPUTBUFFER >=$0100) && .def(CONFIG_2)
+.if .def(CONFIG_NO_INPUTBUFFER_ZP) && .def(CONFIG_2)
 ; BUG on AppleSoft I
 ; fix exists on AppleSoft II
 ; TXTPTR+1 will always be > 0
diff --git a/init.s b/init.s
index a20f8e1..cd3ed68 100644
--- a/init.s
+++ b/init.s
@@ -30,7 +30,7 @@ COLD_START2:
         ldx     #$FF
         stx     CURLIN+1
   .endif
-  .if INPUTBUFFER >= $0100
+  .ifdef CONFIG_NO_INPUTBUFFER_ZP
         ldx     #$FB
   .endif
         txs
diff --git a/input.s b/input.s
index ab43ce2..385921d 100644
--- a/input.s
+++ b/input.s
@@ -66,7 +66,7 @@ LCAB6:
 .endif
         ldx     #<(INPUTBUFFER+1)
         ldy     #>(INPUTBUFFER+1)
-.if INPUTBUFFER >= $0100
+.ifdef CONFIG_NO_INPUTBUFFER_ZP
         lda     #$00
         sta     INPUTBUFFER+1
 .else
diff --git a/program.s b/program.s
index 58b46d2..9964f9d 100644
--- a/program.s
+++ b/program.s
@@ -232,7 +232,7 @@ PUT_NEW_LINE:
 L23D6:
         sty     HIGHDS+1
         jsr     BLTU
-.if INPUTBUFFER = $0200
+.ifdef CONFIG_INPUTBUFFER_0200
         lda     LINNUM
         ldy     LINNUM+1
         sta     INPUTBUFFER-2
@@ -590,7 +590,7 @@ L24DB:
 ; ---END OF LINE------------------
 L24EA:
         sta     INPUTBUFFER-3,y
-.if INPUTBUFFER >= $0100
+.ifdef CONFIG_NO_INPUTBUFFER_ZP
         dec     TXTPTR+1
 .endif
         lda     #<INPUTBUFFER-1
diff --git a/string.s b/string.s
index 0f6c1a7..c3222c9 100644
--- a/string.s
+++ b/string.s
@@ -82,7 +82,7 @@ L32AA:
 L32B6:
         stx     STRNG2+1
         lda     STRNG1+1
-.if INPUTBUFFER >= $0100
+.ifdef CONFIG_NO_INPUTBUFFER_ZP
         beq     LD399
         cmp     #>INPUTBUFFER
 .endif