From 66bb51c6463a45a2934cd1eef948f8bb75028a01 Mon Sep 17 00:00:00 2001
From: Bobbi Webber-Manners <bobbi.manners@gmail.com>
Date: Sun, 14 Nov 2021 17:28:48 -0500
Subject: [PATCH] Merge PR 147 'Startup reads prefix to CMDBUF'

---
 applecorn.po   | Bin 819200 -> 819200 bytes
 auxmem.init.s  |   2 +-
 mainmem.init.s |  68 ++++-----------
 mainmem.menu.s | 230 ++++++++++++++++++++++++-------------------------
 4 files changed, 130 insertions(+), 170 deletions(-)

diff --git a/applecorn.po b/applecorn.po
index f2569b1cd77a627ce010402aaa6fda3fc686d316..dfdc79482d8621357a79d1b8cd4e807af7f32201 100644
GIT binary patch
delta 8790
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

delta 9045
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

diff --git a/auxmem.init.s b/auxmem.init.s
index b67e1e6..d7a8089 100644
--- a/auxmem.init.s
+++ b/auxmem.init.s
@@ -204,7 +204,7 @@ BYTE00      BEQ   BYTE00A                    ; OSBYTE 0,0 - generate error
             RTS                              ; %000x1xxx host type, 'A'pple
 BYTE00A     BRK
             DB    $F7
-HELLO       ASC   'Applecorn MOS 2021-11-13'
+HELLO       ASC   'Applecorn MOS 2021-11-14'
             DB    $00                        ; Unify MOS messages
 
 
diff --git a/mainmem.init.s b/mainmem.init.s
index eb4be49..2e98faf 100644
--- a/mainmem.init.s
+++ b/mainmem.init.s
@@ -4,6 +4,9 @@
 * Initialization, interrupt handling and reset handling code
 * that resides in main memory.
 
+* 14-Nov-2021 If started from CSD, gets prefix to CMDBUF.
+
+
 * Trampoline in main memory used by aux memory IRQ handler
 * to invoke Apple II / ProDOS IRQs in main memory
 A2IRQ       >>>   IENTMAIN          ; IENTMAIN does not do CLI
@@ -37,7 +40,18 @@ SETPRFX     LDA   #GPFXCMD
             STA   DRVBUF2           ; was $0301
             DEC   :OPC7
             BNE   :L1
-RTSINST     RTS
+RTSINST     LDA   CMDPATH
+            BEQ   :GETPFX           ; CMDPATH empty
+            LDA   CMDPATH+1
+            CMP   #'/'
+            BEQ   :GETPFXDONE       ; CMDPATH already absolute path
+:GETPFX     JSR   MLI
+            DB    $C7               ; Get Prefix
+            DW    :GETADDR
+:GETPFXDONE RTS
+:GETADDR    HEX   01                ; One parameter
+            DW    CMDPATH           ; Get prefix to CMDPATH
+
 
 * Disconnect /RAM ramdrive to avoid aux corruption
 * Stolen from Beagle Bros Extra K
@@ -90,55 +104,3 @@ RESET       TSX
             >>>   XF2AUX,AUXMOS
             RTS
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/mainmem.menu.s b/mainmem.menu.s
index 3fef041..a767af9 100644
--- a/mainmem.menu.s
+++ b/mainmem.menu.s
@@ -6,17 +6,17 @@
 * 13-Nov-2021 List of selected ROMs kept locally.
 
 
-ROMMAX       EQU   $0382
-ROMTHIS      EQU   $0383
-ROMADDRS     EQU   $0384              ; List of ROM filename addresses
+ROMMAX      EQU   $0382
+ROMTHIS     EQU   $0383
+ROMADDRS    EQU   $0384       ; List of ROM filename addresses
 
-ROMMENU      JSR   HOME               ; Clear screen
-             LDX   #0
-:LP0         LDA   TITLE1,X           ; Print title
-             BEQ   :LP1
-             JSR   COUT1
-             INX
-             BNE   :LP0
+ROMMENU     JSR   HOME        ; Clear screen
+            LDX   #0
+:LP0        LDA   TITLE1,X    ; Print title
+            BEQ   :LP1
+            JSR   COUT1
+            INX
+            BNE   :LP0
 :LP1
 
 *            LDA   #<TITLE1    ; Print title
@@ -24,10 +24,10 @@ ROMMENU      JSR   HOME               ; Clear screen
 *            LDA   #>TITLE1
 *            STA   A1H
 *            JSR   PRSTRA1
-             JSR   CROUT
+            JSR   CROUT
 * TEMP
-* LDA #$00
-* JMP :KEYOK
+; LDA #$00
+; JMP :KEYOK
 * TEMP
 *            JSR   CROUT
 *            LDA   #<TITLE2
@@ -53,72 +53,72 @@ ROMMENU      JSR   HOME               ; Clear screen
 *            BEQ   :KEYIN
 *            BRA   :L1
 
-:KEYIN       LDA   $C000              ; Kdb data / strobe
-             BPL   :KEYIN             ; Wait for keystroke
-             STA   $C010              ; Clear strobe
-             AND   #$7F
-             SEC
-             SBC   #'1'               ; '1'->0, '2'->1 etc.
-             CMP   #8
-             BCC   :KEYOK
-             JSR   BELL               ; Invalid - beep
-             BRA   :KEYIN             ; Go again
-:KEYOK       STA   USERSEL            ; Record selection
+:KEYIN      LDA   $C000       ; Kdb data / strobe
+            BPL   :KEYIN      ; Wait for keystroke
+            STA   $C010       ; Clear strobe
+            AND   #$7F
+            SEC
+            SBC   #'1'        ; '1'->0, '2'->1 etc.
+            CMP   #8
+            BCC   :KEYOK
+            JSR   BELL        ; Invalid - beep
+            BRA   :KEYIN      ; Go again
+:KEYOK      STA   USERSEL     ; Record selection
 
 * Make list of ROMs
-             LDX   #63
-             LDA   #0
-:INITLP1     STA   ROMADDRS,X
-             DEX
-             BPL   :INITLP1
-             STX   ROMTHIS            ; Current ROM=none
-             LDY   USERSEL            ; Index to ROM to load
-             LDA   #0                 ; Load it to bank 0
-             CPY   #6
-             BCC   :INITROM2          ; <6, single ROM
-             LDA   #1                 ; Load to bank 1 and 0
-             CPY   #7
-             BCC   :INITROM2          ; =7, two ROMs
-             LDA   #7                 ; Load to bank 7 to 0
-             LDY   #0                 ; Starting at ROM 0
-:INITROM2    STA   ROMMAX
-             ASL   A
-             TAX                      ; X=>ROM address table
-             TYA
-             ASL   A
-             TAY                      ; Y=>ROM addresses
-:INITROM3    LDA   ROMLIST+0,Y
-             STA   ROMADDRS+0,X
-             LDA   ROMLIST+1,Y
-             STA   ROMADDRS+1,X
-             INY
-             INY
-             DEX
-             DEX
-             BPL   :INITROM3
-             RTS
+            LDX   #63
+            LDA   #0
+:INITLP1    STA   ROMADDRS,X
+            DEX
+            BPL   :INITLP1
+            STX   ROMTHIS     ; Current ROM=none
+            LDY   USERSEL     ; Index to ROM to load
+            LDA   #0          ; Load it to bank 0
+            CPY   #6
+            BCC   :INITROM2   ; <6, single ROM
+            LDA   #1          ; Load to bank 1 and 0
+            CPY   #7
+            BCC   :INITROM2   ; =7, two ROMs
+            LDA   #7          ; Load to bank 7 to 0
+            LDY   #0          ; Starting at ROM 0
+:INITROM2   STA   ROMMAX
+            ASL   A
+            TAX               ; X=>ROM address table
+            TYA
+            ASL   A
+            TAY               ; Y=>ROM addresses
+:INITROM3   LDA   ROMLIST+0,Y
+            STA   ROMADDRS+0,X
+            LDA   ROMLIST+1,Y
+            STA   ROMADDRS+1,X
+            INY
+            INY
+            DEX
+            DEX
+            BPL   :INITROM3
+            RTS
 
-SELECTROM    >>>   ENTMAIN
-             CMP   ROMTHIS
-             BEQ   :SELECTDONE        ; Already selected
-             CMP   ROMMAX
-             BCC   :GETROM
-             BNE   :SELECTDONE        ; Out of range
-:GETROM      PHA
-             ASL   A
-             TAX
-             LDA   ROMADDRS+0,X       ; ROM filename
-             STA   OPENPL+1
-             LDA   ROMADDRS+1,X
-             STA   OPENPL+2
-             LDA   #$80               ; Load address $8000
-             LDX   #$00
-             SEC                      ; Aux memory
-             JSR   LOADCODE           ; Try and fetch it
-             PLA                      ; Get bank back
-             BCS   :SELECTDONE        ; Failed
-             STA   ROMTHIS            ; It is paged in
-:SELECTDONE  >>>   XF2AUX,ROMSELDONE
+SELECTROM   >>>   ENTMAIN
+            CMP   ROMTHIS
+            BEQ   :SELECTDONE  ; Already selected
+            CMP   ROMMAX
+            BCC   :GETROM
+            BNE   :SELECTDONE  ; Out of range
+:GETROM     PHA
+            ASL   A
+            TAX
+            LDA   ROMADDRS+0,X ; ROM filename
+            STA   OPENPL+1
+            LDA   ROMADDRS+1,X
+            STA   OPENPL+2
+            LDA   #$80         ; Load address $8000
+            LDX   #$00
+            SEC                ; Aux memory
+            JSR   LOADCODE     ; Try and fetch it
+            PLA                ; Get bank back
+            BCS   :SELECTDONE  ; Failed
+            STA   ROMTHIS      ; It is paged in
+:SELECTDONE >>>   XF2AUX,ROMSELDONE
 
 
 ** Print a string pointed to by A1L/A1H
@@ -133,10 +133,10 @@ SELECTROM    >>>   ENTMAIN
 *:NULL       PLY
 *            RTS
 
-TITLE1       ASC   "** APPLECORN **"
-             DB    $8D,$8D
-TITLE2       ASC   "Choose a BBC Micro ROM:"
-             DB    $8D,$8D
+TITLE1      ASC   "** APPLECORN **"
+            DB    $8D,$8D
+TITLE2      ASC   "Choose a BBC Micro ROM:"
+            DB    $8D,$8D
 
 *MSGTBL      DW    MSG1
 *            DW    MSG2
@@ -147,46 +147,44 @@ TITLE2       ASC   "Choose a BBC Micro ROM:"
 *            DW    MSG7
 *            DW    MSG8
 
-MSG1         ASC   " 1. BBC BASIC"
-             DB    $8D,$8D
-MSG2         ASC   " 2. Acornsoft COMAL"
-             DB    $8D,$8D
-MSG3         ASC   " 3. Acornsoft Lisp"
-             DB    $8D,$8D
-MSG4         ASC   " 4. Acornsoft Forth"
-             DB    $8D,$8D
-MSG5         ASC   " 5. Acornsoft MicroProlog"
-             DB    $8D,$8D
-MSG6         ASC   " 6. Acornsoft BCPL"
-             DB    $8D,$8D
-MSG7         ASC   " 7. Acornsoft ISO Pascal (2 ROMs)"
-             DB    $8D,$8D
-MSG8         ASC   " 8. Everything! (8 ROMs)"
-             DB    $8D
-             DB    $00
+MSG1        ASC   " 1. BBC BASIC"
+            DB    $8D,$8D
+MSG2        ASC   " 2. Acornsoft COMAL"
+            DB    $8D,$8D
+MSG3        ASC   " 3. Acornsoft Lisp"
+            DB    $8D,$8D
+MSG4        ASC   " 4. Acornsoft Forth"
+            DB    $8D,$8D
+MSG5        ASC   " 5. Acornsoft MicroProlog"
+            DB    $8D,$8D
+MSG6        ASC   " 6. Acornsoft BCPL"
+            DB    $8D,$8D
+MSG7        ASC   " 7. Acornsoft ISO Pascal (2 ROMs)"
+            DB    $8D,$8D
+MSG8        ASC   " 8. Everything! (8 ROMs)"
+            DB    $8D
+            DB    $00
 
 
-ROMLIST      DW    ROM1
-             DW    ROM2
-             DW    ROM3
-             DW    ROM4
-             DW    ROM5
-             DW    ROM6
-             DW    ROM7
-             DW    ROM8
-
-ROM1         STR   "BASIC2.ROM"
-ROM2         STR   "COMAL.ROM"
-ROM3         STR   "LISP501.ROM"
-ROM4         STR   "FORTH103.ROM"
-ROM5         STR   "MPROLOG310.ROM"
-ROM6         STR   "BCPL700.ROM"
-ROM7         STR   "PASCAL110A.ROM"
-ROM8         STR   "PASCAL110B.ROM"
-
-USERSEL      DB    $00
+ROMLIST     DW    ROM1
+            DW    ROM2
+            DW    ROM3
+            DW    ROM4
+            DW    ROM5
+            DW    ROM6
+            DW    ROM7
+            DW    ROM8
 
+ROM1        STR   "BASIC2.ROM"
+ROM2        STR   "COMAL.ROM"
+ROM3        STR   "LISP501.ROM"
+ROM4        STR   "FORTH103.ROM"
+ROM5        STR   "MPROLOG310.ROM"
+ROM6        STR   "BCPL700.ROM"
+ROM7        STR   "PASCAL110A.ROM"
+ROM8        STR   "PASCAL110B.ROM"
 
+USERSEL     DB    $00