cleanup

defines.s

@@ -46,5 +46,23 @@ MAX_EXPON = 10
 
 STACK           := $0100
 
+.ifdef INPUTBUFFER
+  .if INPUTBUFFER >= $0100
+CONFIG_NO_INPUTBUFFER_ZP := 1
+  .endif
+  .if INPUTBUFFER = $0200
+CONFIG_INPUTBUFFER_0200 := 1
+  .endif
+.endif
+INPUTBUFFERX = INPUTBUFFER & $FF00
+
 CR=13
 LF=10
+
+.ifndef CRLF_1
+CRLF_1 := CR
+CRLF_2 := LF
+.endif
+
+
+

defines_apple.s

@@ -18,8 +18,6 @@ USR				:= $000A
 
 ; inputbuffer
 INPUTBUFFER     := $0200
-CONFIG_NO_INPUTBUFFER_ZP := 1
-CONFIG_INPUTBUFFER_0200 := 1
 
 ; constants
 STACK_TOP		:= $F8

defines_cbm.s

@@ -55,8 +55,6 @@ USR				:= GORESTART ; XXX
 
 ; inputbuffer
 INPUTBUFFER     := $0200
-CONFIG_NO_INPUTBUFFER_ZP := 1
-CONFIG_INPUTBUFFER_0200 := 1
 
 .endif
 
@@ -69,8 +67,6 @@ NULL_MAX		:= $0A
 SPACE_FOR_GOSUB := $3E
 STACK_TOP		:= $FA
 .endif
-CRLF_1 := CR
-CRLF_2 := LF
 
 RAMSTART2		:= $0400
 

defines_kbd.s

@@ -27,7 +27,6 @@ Z18             := $06FD
 
 ; inputbuffer
 INPUTBUFFER     := $0700
-CONFIG_NO_INPUTBUFFER_ZP := 1
 
 ; constants
 STACK_TOP		:= $FE

defines_kim.s

@@ -19,8 +19,6 @@ ZP_START2 = $63
 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
-CRLF_1 := CR
-CRLF_2 := LF
 
 ; magic memory locations
 L1800           := $1800

defines_microtan.s

@@ -27,8 +27,6 @@ TXPSV           := $00BA
 STACK_TOP		:= $FE
 SPACE_FOR_GOSUB := $3E
 NULL_MAX		:= $F0
-CRLF_1 := CR
-CRLF_2 := LF
 
 ; memory layout
 RAMSTART2 := $0400

defines_osi.s

@@ -18,8 +18,6 @@ USR             := $000A
 STACK_TOP		:= $FC
 SPACE_FOR_GOSUB := $33
 NULL_MAX		:= $0A
-CRLF_1 := CR
-CRLF_2 := LF
 
 ; memory layout
 RAMSTART2		:= $0300

zeropage.s

@@ -1,10 +1,4 @@
 
-; other memory locations
-INPUTBUFFERX = INPUTBUFFER & $FF00
-
-; overlay ZP variables, can be overridden
-
-
 .feature org_per_seg
 .zeropage