cleanup

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

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

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

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
 

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

eval.s

@@ -502,7 +502,7 @@ L2DC2:
         .byte   $19
 .endif
 .ifdef CBM2
-        bit     $62
+        bit     FAC+4
         bpl     LCE90
         cmp     #$54
         bne     LCE82

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