From f2863d173968265f6d16821f2338cd7a3a124de9 Mon Sep 17 00:00:00 2001
From: Bobbi Webber-Manners <bobbi.manners@gmail.com>
Date: Fri, 20 Aug 2021 18:57:14 -0400
Subject: [PATCH] Initialize OSBYTE variables.

---
 applecorn.po    | Bin 819200 -> 819200 bytes
 auxmem.chario.s |  20 +++++---------------
 auxmem.init.s   |  15 ++++++++++++++-
 auxmem.mosequ.s |   2 +-
 4 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/applecorn.po b/applecorn.po
index 1e4958b77cfba2340b4f14c4ea2e33b2c4946a98..78b448df84901df32fc06174e6f5b857f51b0ebd 100644
GIT binary patch
delta 2402
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

delta 2466
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
Bh*kgq

diff --git a/auxmem.chario.s b/auxmem.chario.s
index c218ba5..9a97135 100644
--- a/auxmem.chario.s
+++ b/auxmem.chario.s
@@ -1,9 +1,8 @@
-*********************************************************
-* Kernel / Character I/O
-*********************************************************
+* AUXMEM.CHARIO.S
+* (c) Bobbi 2021 GPLv3
+*
+* Applecorn kernel / Character I/O
 
-* KERNEL/CHARIO.S
-*****************
 * Character read and write
 *
 * 14-Aug-2021 Flashing cursor and INKEY sync'd to frame rate
@@ -16,7 +15,6 @@
 * *BUGS* INKEY doesn't restore cursor on timeout.
 *        KBDREAD has several paths that don't test ESCCHAR.
 
-
 * TEMP:
 FLASHER      EQU   $290
 CURSOR       EQU   $291
@@ -34,17 +32,9 @@ FX2VAR       EQU   BYTEVARBASE+$B1
 FX3VAR       EQU   BYTEVARBASE+$EC
 FX4VAR       EQU   BYTEVARBASE+$ED
 
-
-** Default keyboard OSBYTE variables
-*DEFBYTELOW  EQU  219              ; First default OSBYTE value
-*DEFBYTE     DB   $09,$1B          ; Default key codes
-*            DB   $01,$D0,$E0,$F0  ; Default key expansion
-*            DB   $01,$80,$90,$00  ; Default key expansion
-*DEFBYTEEND
-
 * TEMP as no *KEY
 * Default keyboard OSBYTE variables
-DEFBYTELOW   EQU   219              ; First default OSBYTE value
+*DEFBYTELOW EQU 219 ; First default OSBYTE value
 DEFBYTE      DB    $09,$1B          ; Default key codes
              DB    $C0,$D0,$E0,$F0  ; Default key expansion
              DB    $80,$90,$A0,$B0  ; Default key expansion
diff --git a/auxmem.init.s b/auxmem.init.s
index df8f29c..c4cce8f 100644
--- a/auxmem.init.s
+++ b/auxmem.init.s
@@ -1,3 +1,8 @@
+* AUXMEM.INIT.S
+* (c) Bobbi 2021 GPL v3
+*
+* Initialization code running in Apple //e aux memory
+
 ***********************************************************
 * BBC Micro 'virtual machine' in Apple //e aux memory
 ***********************************************************
@@ -100,11 +105,12 @@ MOSINIT     LDX   #$FF                       ; Initialize Alt SP to $1FF
             INC   A4H
 :S7         BRA   :L2
 
-:NORELOC                                     ; We should jump up into high memory here
+:NORELOC
 :S8         STA   $C00D                      ; 80 col on
             STA   $C003                      ; Alt charset off
             STA   $C055                      ; PAGE2
 
+MOSHIGH     SEI
             LDX   #$FF
             TXS                              ; Initialise stack
             INX                              ; X=$00
@@ -121,6 +127,13 @@ MOSINIT     LDX   #$FF                       ; Initialize Alt SP to $1FF
             DEX
             BPL   :INITPG2
 
+* DEFBYTELOW=129
+            LDX   #DEFBYTEEND-DEFBYTE-1
+:INITPG3    LDA   DEFBYTE,X                  ; Initialize OSBYTE vars
+            STA   BYTEVARBASE+DEFBYTELOW,X
+            DEX
+            BPL   :INITPG3
+
             JSR   VDUINIT                    ; Initialise VDU driver
 
             LDA   #<:HELLO
diff --git a/auxmem.mosequ.s b/auxmem.mosequ.s
index 3f7f3f3..65c52cf 100644
--- a/auxmem.mosequ.s
+++ b/auxmem.mosequ.s
@@ -59,5 +59,5 @@ FSCV        EQU   $21E        ; FSCV misc file ops
 
 OSFILECB    EQU   $2EE        ; OSFILE control block
 
-
+DEFBYTELOW  EQU   219         ; First default OSBYTE value