From 4a75e2edf87f5ca0c65cbd75239a55b413c4a7e3 Mon Sep 17 00:00:00 2001 From: Michael Steil Date: Sat, 18 Oct 2008 13:06:52 +0000 Subject: [PATCH] cleanup --- defines_kbd.s | 2 +- flow1.s | 2 ++ init.s | 4 ++-- kbd_extra.s | 8 ++++++-- message.s | 2 +- 5 files changed, 12 insertions(+), 6 deletions(-) diff --git a/defines_kbd.s b/defines_kbd.s index 48bb0ab..6648f20 100644 --- a/defines_kbd.s +++ b/defines_kbd.s @@ -43,7 +43,7 @@ MONCOUT := $FDFA LC000 := $C000 LC009 := $C009 LDE24 := $DE24 -LDE42 := $DE42 ; PRIMM ? +PRIMM := $DE42 LDE48 := $DE48 LDE53 := $DE53 LDE7F := $DE7F diff --git a/flow1.s b/flow1.s index 33c60e1..6c93093 100644 --- a/flow1.s +++ b/flow1.s @@ -274,6 +274,7 @@ L271C: sty CURLIN+1 RET1: rts + .ifdef KBD PRT: jsr GETBYT @@ -293,6 +294,7 @@ LE68E: bpl LE68E rts .endif + .if .def(CONFIG_NULL) || .def(CBM1) ; CBM1 has the keyword removed, ; but the code is still here diff --git a/init.s b/init.s index e3ee80d..7382746 100644 --- a/init.s +++ b/init.s @@ -9,9 +9,9 @@ FNDLIN2: ; ---------------------------------------------------------------------------- COLD_START: .ifdef KBD - lda #$81 + lda #LFD81 sta $03A1 lda #$20 sta $0480 diff --git a/kbd_extra.s b/kbd_extra.s index 5c9624d..79619b4 100644 --- a/kbd_extra.s +++ b/kbd_extra.s @@ -9,7 +9,8 @@ sta TXTTAB+1 jsr SCRTCH sta STACK+255 - jsr LDE42 +LFD81: + jsr PRIMM .byte $1B,$06,$01,$0C .byte "INTELLIVISION BASIC" .byte $0D,$0A,$0A @@ -21,7 +22,7 @@ lda #$FF sta ($04),y jsr LDE8C - .byte $0C + .byte $0C ; NOP $xxxx jmp RESTART OUTQUESSP: jsr OUTQUES @@ -326,6 +327,9 @@ LFFED: bne LFFB6 rts .byte $FF +; NMI .addr LC000 +; RESET .addr LC000 +; IRQ .addr LC009 diff --git a/message.s b/message.s index 39565d6..5a36568 100644 --- a/message.s +++ b/message.s @@ -24,7 +24,7 @@ QT_IN: .ifdef KBD .byte $54,$D2 ; ??? OKPRT: - jsr LDE42 + jsr PRIMM .byte CR,CR,">>",CR,LF .byte 0 rts