From 8e642aa97afa91fbc1ce61e60070b75b6b666f4c Mon Sep 17 00:00:00 2001
From: Michael Steil <mist64@mac.com>
Date: Sat, 18 Oct 2008 12:49:03 +0000
Subject: [PATCH] cleanup

---
 defines_apple.s    |  1 +
 defines_cbm.s      |  2 ++
 defines_kim.s      |  1 +
 defines_microtan.s |  1 +
 defines_osi.s      |  1 +
 eval.s             |  2 +-
 init.s             | 14 ++------------
 7 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/defines_apple.s b/defines_apple.s
index 8e9c718..23aafc0 100644
--- a/defines_apple.s
+++ b/defines_apple.s
@@ -28,6 +28,7 @@ SPACE_FOR_GOSUB := $36
 CRLF_1 := CR
 CRLF_2 := $80
 WIDTH			:= 40
+WIDTH2			:= 14
 
 ; memory layout
 RAMSTART2	:= $2A00
diff --git a/defines_cbm.s b/defines_cbm.s
index 34949db..d8f74ec 100644
--- a/defines_cbm.s
+++ b/defines_cbm.s
@@ -63,6 +63,8 @@ MAX_EXPON		:= 12 ; XXX override
 .else
 SPACE_FOR_GOSUB := $3E
 STACK_TOP		:= $FA
+WIDTH			:= 40
+WIDTH2			:= 30
 .endif
 
 RAMSTART2		:= $0400
diff --git a/defines_kim.s b/defines_kim.s
index 4954a61..0230fe3 100644
--- a/defines_kim.s
+++ b/defines_kim.s
@@ -20,6 +20,7 @@ STACK_TOP		:= $FC
 SPACE_FOR_GOSUB := $36
 NULL_MAX		:= $F2 ; probably different in original version; the image I have seems to be modified; see PDF
 WIDTH			:= 72
+WIDTH2			:= 56
 
 ; magic memory locations
 L1800           := $1800
diff --git a/defines_microtan.s b/defines_microtan.s
index 09fffa1..023218a 100644
--- a/defines_microtan.s
+++ b/defines_microtan.s
@@ -24,6 +24,7 @@ STACK_TOP		:= $FE
 SPACE_FOR_GOSUB := $3E
 NULL_MAX		:= $F0
 WIDTH			:= 80
+WIDTH2			:= 56
 ; memory layout
 RAMSTART2 := $0400
 
diff --git a/defines_osi.s b/defines_osi.s
index ac23e1c..cb61652 100644
--- a/defines_osi.s
+++ b/defines_osi.s
@@ -21,6 +21,7 @@ STACK_TOP		:= $FC
 SPACE_FOR_GOSUB := $33
 NULL_MAX		:= $0A
 WIDTH			:= 72
+WIDTH2			:= 56
 
 ; memory layout
 RAMSTART2		:= $0300
diff --git a/eval.s b/eval.s
index c251e6c..9f11e74 100644
--- a/eval.s
+++ b/eval.s
@@ -502,7 +502,7 @@ L2DC2:
         .byte   $19
 .endif
 .ifdef CBM2
-        bit     $62
+        bit     FAC+4
         bpl     LCE90
         cmp     #$54
         bne     LCE82
diff --git a/init.s b/init.s
index dc52ca2..e3ee80d 100644
--- a/init.s
+++ b/init.s
@@ -74,22 +74,12 @@ COLD_START2:
           sta     USR+1
           sty     USR+2
   .endif
-  .ifndef CONFIG_CBM_ALL
+  .ifndef CBM1
         lda     #WIDTH
         sta     Z17
-    .ifdef APPLE
-        lda     #14
-    .else
-        lda     #56
-    .endif
+        lda     #WIDTH2
         sta     Z18
   .endif
-  .ifdef CBM2
-        lda     #$28
-        sta     $0F
-        lda     #$1E
-        sta     $10
-  .endif
 .endif /* KBD */
 
 ; All non-CONFIG_SMALL versions of BASIC have