From 2566a2625306a6074aad3ea27db0a87c321ab1fc Mon Sep 17 00:00:00 2001
From: Oliver Schmidt
Date: Sun, 7 May 2017 20:53:04 +0200
Subject: [PATCH] Some minor changes.
---
drivers/a2input.s | 23 +++++++++++------------
drivers/a2kernal.s | 3 +--
drivers/c64kernal.s | 3 +--
drivers/vic20kernal.s | 3 +--
4 files changed, 14 insertions(+), 18 deletions(-)
diff --git a/drivers/a2input.s b/drivers/a2input.s
index 7e4315a..8ff2a6f 100644
--- a/drivers/a2input.s
+++ b/drivers/a2input.s
@@ -1,7 +1,7 @@
.export get_key
.export check_for_abort_key
-.export get_key_ip65
.export get_key_if_available
+.export get_key_ip65
.import ip65_process
@@ -11,17 +11,23 @@
; use Apple 2 monitor ROM function to read from keyboard
; inputs: none
; outputs: A contains ASCII code of key pressed
-get_key:
- jmp $fd0c
+get_key = $fd0c
; inputs: none
; outputs: A contains ASCII value of key just pressed (0 if no key pressed)
get_key_if_available:
lda $c000 ; current key pressed
- bmi :+
+ bmi got_key
lda #0
rts
-: bit $c010 ; clear the keyboard strobe
+
+; process inbound ip packets while waiting for a keypress
+get_key_ip65:
+ jsr ip65_process
+ lda $c000 ; key down?
+ bpl get_key_ip65
+got_key:
+ bit $c010 ; clear the keyboard strobe
and #$7f
rts
@@ -38,13 +44,6 @@ check_for_abort_key:
: clc
rts
-; process inbound ip packets while waiting for a keypress
-get_key_ip65:
- jsr ip65_process
- bit $c000 ; key down?
- bpl get_key_ip65
- jmp get_key
-
; -- LICENSE FOR a2input.s --
diff --git a/drivers/a2kernal.s b/drivers/a2kernal.s
index 775c00c..907d42e 100644
--- a/drivers/a2kernal.s
+++ b/drivers/a2kernal.s
@@ -3,8 +3,7 @@
.code
-exit_to_basic:
- jmp $3d0
+exit_to_basic = $3d0
diff --git a/drivers/c64kernal.s b/drivers/c64kernal.s
index e39a454..4b0cea7 100644
--- a/drivers/c64kernal.s
+++ b/drivers/c64kernal.s
@@ -4,8 +4,7 @@
.code
; jump to BASIC interpreter loop
-exit_to_basic:
- jmp $a7ae
+exit_to_basic = $a7ae
diff --git a/drivers/vic20kernal.s b/drivers/vic20kernal.s
index 6c6d4d1..6c68547 100644
--- a/drivers/vic20kernal.s
+++ b/drivers/vic20kernal.s
@@ -4,8 +4,7 @@
.code
; jump to BASIC interpreter loop
-exit_to_basic:
- jmp $c7ae
+exit_to_basic = $c7ae