From e3e412b446785d65081c9c40f95de97e008d74f7 Mon Sep 17 00:00:00 2001 From: Michael Steil Date: Sat, 18 Oct 2008 05:47:58 +0000 Subject: [PATCH] cleanup --- defines.s | 18 ++++++++++++++++++ defines_apple.s | 2 -- defines_cbm.s | 4 ---- defines_kbd.s | 1 - defines_kim.s | 2 -- defines_microtan.s | 2 -- defines_osi.s | 2 -- zeropage.s | 6 ------ 8 files changed, 18 insertions(+), 19 deletions(-) diff --git a/defines.s b/defines.s index a63c62d..6987505 100644 --- a/defines.s +++ b/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 + + + diff --git a/defines_apple.s b/defines_apple.s index 38bfc0b..f8a469f 100644 --- a/defines_apple.s +++ b/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 diff --git a/defines_cbm.s b/defines_cbm.s index e2e8512..d996b9c 100644 --- a/defines_cbm.s +++ b/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 diff --git a/defines_kbd.s b/defines_kbd.s index a98e4ff..07ad39b 100644 --- a/defines_kbd.s +++ b/defines_kbd.s @@ -27,7 +27,6 @@ Z18 := $06FD ; inputbuffer INPUTBUFFER := $0700 -CONFIG_NO_INPUTBUFFER_ZP := 1 ; constants STACK_TOP := $FE diff --git a/defines_kim.s b/defines_kim.s index 3db05a5..f9c7dd7 100644 --- a/defines_kim.s +++ b/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 diff --git a/defines_microtan.s b/defines_microtan.s index c85c1ee..3024748 100644 --- a/defines_microtan.s +++ b/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 diff --git a/defines_osi.s b/defines_osi.s index 3923e44..0b6f3e7 100644 --- a/defines_osi.s +++ b/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 diff --git a/zeropage.s b/zeropage.s index ed59629..1793cc7 100644 --- a/zeropage.s +++ b/zeropage.s @@ -1,10 +1,4 @@ -; other memory locations -INPUTBUFFERX = INPUTBUFFER & $FF00 - -; overlay ZP variables, can be overridden - - .feature org_per_seg .zeropage