cleanup

defines.s

@@ -45,3 +45,6 @@ MAX_EXPON = 10
 .endif
 
 STACK           := $0100
+
+CR=13
+LF=10

defines_apple.s

@@ -4,14 +4,13 @@ CONFIG_11 := 1
 CBM2_APPLE := 1
 CONFIG_SAFE_NAMENOTFOUND := 1
 CBM1_APPLE := 1
-CBM_APPLE := 1
 APPLE_MICROTAN := 1
 .define CONFIG_SCRTCH_ORDER 3
 CONFIG_PRINT_CR := 1 ; print CR when line end reached
 CONFIG_IO_MSB := 1 ; all I/O has bit #7 set
 ; INPUTBUFFER > $0100
 
-CRLF_1 := $0D
+CRLF_1 := CR
 CRLF_2 := $80
 
 ZP_START = $55

defines_cbm.s

@@ -2,7 +2,6 @@
 CONFIG_CBM_ALL := 1
 CONFIG_CBM1_PATCHES := 1 ; ** don't turn off! **
 CBM1_APPLE := 1
-CBM_APPLE := 1
 CONFIG_DATAFLAG := 1
 CONFIG_BUG_GET_ERROR := 1; treat GET error like READ error
 CONFIG_PRINTNULLS := 1; whether PRINTNULLS does anything
@@ -19,7 +18,6 @@ CBM2_KBD := 1 ; 2 weird instances
 CBM2_MICROTAN := 1
 CBM2_KIM := 1
 CBM2_APPLE := 1
-CBM_APPLE := 1
 CONFIG_DATAFLAG := 1
 CONFIG_EASTER_EGG := 1
 ; CONFIG_SMALL := 1 ; test :-) 
@@ -32,8 +30,8 @@ CONFIG_NO_CR := 1; terminal doesn't need explicit CRs on line ends
 CONFIG_NO_LINE_EDITING := 1; support for "@", "_", BEL etc.
 .define CONFIG_SCRTCH_ORDER 2
 
-CRLF_1 := $0D
+CRLF_1 := CR
-CRLF_2 := $0A
+CRLF_2 := LF
 
 .ifdef CBM1
 ZP_START = $65

defines_kbd.s

@@ -10,8 +10,8 @@ CONFIG_SAFE_NAMENOTFOUND := 1
 ; INPUTBUFFER > $0100
 CONFIG_NO_POKE := 1
 
-CRLF_1 := $0A
+CRLF_1 := LF
-CRLF_2 := $0D
+CRLF_2 := CR
 
 ZP_START = $15
 

defines_kim.s

@@ -7,8 +7,8 @@ CONFIG_ROR_WORKAROUND := 1
 CONFIG_MONCOUT_DESTROYS_Y := 1
 .define CONFIG_SCRTCH_ORDER 2
 
-CRLF_1 := $0D
+CRLF_1 := CR
-CRLF_2 := $0A
+CRLF_2 := LF
 
 ZP_START = $63
 

defines_microtan.s

@@ -14,8 +14,8 @@ CONFIG_NULL := 1
 CONFIG_PRINT_CR := 1 ; print CR when line end reached
 .define CONFIG_SCRTCH_ORDER 1
 
-CRLF_1 := $0D
+CRLF_1 := CR
-CRLF_2 := $0A
+CRLF_2 := LF
 
 ZP_START = $85
 

defines_osi.s

@@ -5,8 +5,8 @@ CONFIG_DATAFLAG := 1
 
 .define CONFIG_SCRTCH_ORDER 3
 
-CRLF_1 := $0D
+CRLF_1 := CR
-CRLF_2 := $0A
+CRLF_2 := LF
 
 ZP_START = $65
 

float.s

@@ -1581,7 +1581,7 @@ L3D3E:
         cpy     #DECTBL_END-DECTBL
 .ifdef CONFIG_CBM_ALL
         beq     LDD96
-        cpy     #$3C
+        cpy     #$3C ; XXX
 .endif
         bne     L3CF6
 ; ----------------------------------------------------------------------------

init.s

@@ -398,14 +398,13 @@ QT_TERMINAL_WIDTH:
 .endif
 QT_BYTES_FREE:
         .byte   " BYTES FREE"
-.ifndef CBM_APPLE
+.ifdef CBM1
-        .byte   $0D,$0A,$0D,$0A
+.elseif .def(CBM2)
-.endif
-.ifdef CBM2
         .byte   $0D,$00
-.endif
+.elseif .def(APPLE)
-.ifdef APPLE
         .byte   $00
+.else
+        .byte   $0D,$0A,$0D,$0A
 .endif
 QT_BASIC:
 .ifdef OSI

message.s

@@ -2,9 +2,6 @@
 
 .segment "CODE"
 
-CR=13
-LF=10
-
 QT_ERROR:
 .ifdef KBD
         .byte   " err"