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

---
 flow.s  | 15 +++++++++------
 init.s  |  4 ++--
 input.s |  7 ++++---
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/flow.s b/flow.s
index af84815..bc5a372 100644
--- a/flow.s
+++ b/flow.s
@@ -82,15 +82,15 @@ NEWSTT:
         jsr     ISCNTC
         lda     TXTPTR
         ldy     TXTPTR+1
-.ifdef CBM2_KBD
+.if (INPUTBUFFER >=$0100) && .def(CONFIG_2)
         cpy     #>INPUTBUFFER
-.endif
-.ifdef CBM2
+  .ifdef CBM2
         nop
-.endif
-.ifdef CBM2_KBD
+  .endif
         beq     LC6D4
 .else
+; BUG on AppleSoft I,
+; fixed differently on AppleSoft II (ldx/inx)
         beq     L2683
 .endif
         sta     OLDTEXT
@@ -274,7 +274,10 @@ END2:
         bne     RET1
         lda     TXTPTR
         ldy     TXTPTR+1
-.ifdef CBM2_KBD
+.if (INPUTBUFFER >=$0100) && .def(CONFIG_2)
+; BUG on AppleSoft I
+; exists on AppleSoft II
+; TXTPTR+1 will always be > 0
         ldx     CURLIN+1
         inx
 .endif
diff --git a/init.s b/init.s
index e7be5c7..566dfca 100644
--- a/init.s
+++ b/init.s
@@ -175,7 +175,7 @@ L4098:
         tay
         bne     L40EE
 .endif
-.ifndef CBM2_KBD
+.ifndef CBM2
         lda     #<RAMSTART2
 .endif
         ldy     #>RAMSTART2
@@ -185,7 +185,7 @@ L4098:
 .endif
         sta     LINNUM
         sty     LINNUM+1
-.ifdef CBM2_KBD
+.ifdef CBM2
 		tay
 .else
         ldy     #$00
diff --git a/input.s b/input.s
index 8e3f52e..b34d4a2 100644
--- a/input.s
+++ b/input.s
@@ -187,12 +187,13 @@ READ:
         ldx     DATPTR
         ldy     DATPTR+1
 .ifdef CBM2_KBD
-        lda     #$98 ; AppleSoft, too
+; AppleSoft II, too
+        lda     #$98	; READ
         .byte   $2C
 L2ABE:
-        lda     #$00
+        lda     #$00	; INPUT
 .else
-        .byte   $A9
+        .byte   $A9	; LDA #$98
 L2ABE:
         tya
 .endif