Builds on Merlin-16 again.

2021-09-16 23:16:05 -04:00 · 2021-09-16 23:16:05 -04:00 · d3d4017daf
parent 4429418750
commit d3d4017daf
19 changed files with 61 additions and 35 deletions
--- a/applecorn.po
+++ b/applecorn.po
--- a/applecorn.s
+++ b/applecorn.s
@ -200,3 +200,5 @@ MAINZP      MAC



+
+
--- a/auxmem.bytwrd.s
+++ b/auxmem.bytwrd.s
@ -470,3 +470,5 @@ OSBM2        ASC   ').'



+
+
--- a/auxmem.chario.s
+++ b/auxmem.chario.s
@ -27,7 +27,10 @@


 OLDCHAR      EQU   OSKBD1                    ; *TEMP*  ; character under cursor
-COPYCHAR     EQU   OSKBD2                    ; *TEMP*  ; character under copy cursor
+
+** Moved to AUXMEM.MOSEQU.S for Merlin-8/-16
+*COPYCHAR EQU OSKBD2 ; *TEMP*  ; character under copy cursor
+
 FLASHER      EQU   BYTEVARBASE+193           ; flash counter for cursor

 FXEXEC       EQU   BYTEVARBASE+198
@ -441,12 +444,3 @@ BYTE7DOK     RTS
 BYTE76       LDX   #$00                      ; Update LEDs and return X=SHIFT
             RTS                             ; Not possible with Apple

-
-
-
-
-
-
-
-
-
--- a/auxmem.hostfs.s
+++ b/auxmem.hostfs.s
@ -946,4 +946,6 @@ ERROR2E     DW    $C800



+
+

--- a/auxmem.init.s
+++ b/auxmem.init.s
@ -182,3 +182,5 @@ HELLO       ASC   'Applecorn MOS 2021-09-16 snapshot'



+
+
--- a/auxmem.misc.s
+++ b/auxmem.misc.s
@ -497,4 +497,6 @@ AUXBLK      ASC   '**ENDOFCODE**'



+
+

--- a/auxmem.mosequ.s
+++ b/auxmem.mosequ.s
@ -63,8 +63,8 @@ FSCV         EQU   $21E        ; FSCV misc file ops
 BYTEVARBASE  EQU   $190        ; Base of OSBYTE variables
 OSFILECB     EQU   $2EE        ; OSFILE control block

+COPYCHAR     EQU   OSKBD2      ; ** TEMP **

 * $0300-$03DF
 * $03E0-$03FF Used for interfacing with ProDOS XFER

-
--- a/auxmem.oscli.s
+++ b/auxmem.oscli.s
@ -529,3 +529,5 @@ ECHOLP1     JSR   GSREAD
 *             JMP   OSNEWL


+
+
--- a/auxmem.vdu.s
+++ b/auxmem.vdu.s
@ -621,3 +621,5 @@ BYTEA0       LDY   #79              ; Read VDU variable $09,$0A
 * TEST


+
+
--- a/mainmem.fsequ.s
+++ b/mainmem.fsequ.s
@ -60,3 +60,5 @@ GEOFCMD     EQU   $D1



+
+
--- a/mainmem.init.s
+++ b/mainmem.init.s
@ -106,3 +106,5 @@ RESET       TSX



+
+
--- a/mainmem.ldr.s
+++ b/mainmem.ldr.s
@ -132,6 +132,8 @@ CANTOPEN    ASC   "Unable to open ROM file"



+
+



--- a/mainmem.lists.s
+++ b/mainmem.lists.s
@ -124,3 +124,5 @@ QUITPL      HEX   04          ; Number of parameters



+
+
--- a/mainmem.menu.s
+++ b/mainmem.menu.s
@ -138,6 +138,8 @@ ROM8        STR   "USERROM2.ROM"



+
+



--- a/mainmem.misc.s
+++ b/mainmem.misc.s
@ -41,29 +41,29 @@ FINDBUF     LDX   #$00
 * On entry: buffer number in X
 * On exit: buffer address in AY
 *          Carry set if no bufs, clear otherwise
-BUFADDR      CPX   #$00
-             BNE   :S1
-             LDA   #<IOBUF1
-             LDY   #>IOBUF1
-             BRA   :EXIT
-:S1          CPX   #$01
-             BNE   :S2
-             LDA   #<IOBUF2
-             LDY   #>IOBUF2
-             BRA   :EXIT
-:S2          CPX   #$02
-             BNE   :S3
-             LDA   #<IOBUF3
-             LDY   #>IOBUF3
-             BRA   :EXIT
-:S3          CPX   #$03
-             BNE   :NOBUFS
-             LDA   #<IOBUF4
-             LDY   #>IOBUF4
-:EXIT        CLC
-             RTS
-:NOBUFS      SEC
-             RTS
+BUFADDR     CPX   #$00
+            BNE   :S1
+            LDA   #<IOBUF1
+            LDY   #>IOBUF1
+            BRA   :EXIT
+:S1         CPX   #$01
+            BNE   :S2
+            LDA   #<IOBUF2
+            LDY   #>IOBUF2
+            BRA   :EXIT
+:S2         CPX   #$02
+            BNE   :S3
+            LDA   #<IOBUF3
+            LDY   #>IOBUF3
+            BRA   :EXIT
+:S3         CPX   #$03
+            BNE   :NOBUFS
+            LDA   #<IOBUF4
+            LDY   #>IOBUF4
+:EXIT       CLC
+            RTS
+:NOBUFS     SEC
+            RTS

 * Check if file exists
 * Return A=0 if doesn't exist, A=1 file, A=2 dir
@ -188,3 +188,5 @@ FILEREFS    DB    $00,$00,$00,$00



+
+
--- a/mainmem.path.s
+++ b/mainmem.path.s
@ -303,3 +303,5 @@ PREFIX      DS    65           ; Buffer for ProDOS prefix



+
+
--- a/mainmem.svc.s
+++ b/mainmem.svc.s
@ -111,7 +111,7 @@ COPYFILE     >>>   ENTMAIN
             CMP   #$02               ; Existing directory?
             BNE   :BADDEST           ; If not, error
             BRA   :MAINLOOP          ; Source: wildcard, dest: dir
-:NOWILD      
+:NOWILD
 :MAINLOOP
             LDA   MOSFILE2           ; Length
             STA   :OLDLEN
@ -1058,3 +1058,5 @@ MAINRDEXIT   >>>   XF2AUX,NULLRTS     ; Back to an RTS



+
+
--- a/mainmem.wild.s
+++ b/mainmem.wild.s
@ -382,3 +382,5 @@ MATCHBUF    DS    65            ; For storing match results (Pascal str)



+
+
				`@ -182,3 +182,5 @@ HELLO ASC 'Applecorn MOS 2021-09-16 snapshot'`
				`@ -621,3 +621,5 @@ BYTEA0 LDY #79 ; Read VDU variable $09,$0A`
				`* TEST`
				`@ -303,3 +303,5 @@ PREFIX DS 65 ; Buffer for ProDOS prefix`
				`@ -382,3 +382,5 @@ MATCHBUF DS 65 ; For storing match results (Pascal str)`