From 2afc3bff3bfadd0e174d00a13a863cca60985853 Mon Sep 17 00:00:00 2001 From: Bobbi Webber-Manners Date: Wed, 22 Sep 2021 18:36:05 -0400 Subject: [PATCH] Builds on Merlin-16 again. --- applecorn.po | Bin 819200 -> 819200 bytes applecorn.s | 2 ++ auxmem.bytwrd.s | 2 ++ auxmem.chario.s | 2 ++ auxmem.gfx.s | 2 ++ auxmem.hostfs.s | 2 ++ auxmem.init.s | 4 +-- auxmem.misc.s | 2 ++ auxmem.mosequ.s | 2 ++ auxmem.oscli.s | 2 ++ auxmem.vdu.s | 86 ++++++++++++++++++++++++------------------------ mainmem.fsequ.s | 2 ++ mainmem.init.s | 2 ++ mainmem.ldr.s | 2 ++ mainmem.lists.s | 2 ++ mainmem.menu.s | 2 ++ mainmem.misc.s | 2 ++ mainmem.path.s | 2 ++ mainmem.svc.s | 2 ++ mainmem.wild.s | 2 ++ 20 files changed, 78 insertions(+), 46 deletions(-) diff --git a/applecorn.po b/applecorn.po index cb4ed9e737ba25b93065a7510482fda4e2b10a41..0d078a492330b5309462aba17c948e66a651fa69 100644 GIT binary patch delta 7657 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 E59|(t`2YX_ delta 9803 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 diff --git a/applecorn.s b/applecorn.s index 35e629c..b4d35a8 100644 --- a/applecorn.s +++ b/applecorn.s @@ -210,4 +210,6 @@ MAINZP MAC + + diff --git a/auxmem.bytwrd.s b/auxmem.bytwrd.s index ebdd022..16b5251 100644 --- a/auxmem.bytwrd.s +++ b/auxmem.bytwrd.s @@ -476,3 +476,5 @@ OSBM2 ASC ').' + + diff --git a/auxmem.chario.s b/auxmem.chario.s index ed5d717..20ecc9c 100644 --- a/auxmem.chario.s +++ b/auxmem.chario.s @@ -451,3 +451,5 @@ BYTE76 LDX #$00 ; Update LEDs and return X=SHIFT + + diff --git a/auxmem.gfx.s b/auxmem.gfx.s index 4fc7c16..7729e53 100644 --- a/auxmem.gfx.s +++ b/auxmem.gfx.s @@ -94,3 +94,5 @@ RELCOORD CLC + + diff --git a/auxmem.hostfs.s b/auxmem.hostfs.s index 8cfb175..b1b7ec9 100644 --- a/auxmem.hostfs.s +++ b/auxmem.hostfs.s @@ -981,3 +981,5 @@ ERROR2E DW $C800 DB $00 + + diff --git a/auxmem.init.s b/auxmem.init.s index 14744ae..b0166ea 100644 --- a/auxmem.init.s +++ b/auxmem.init.s @@ -177,8 +177,6 @@ BYTE00XX BEQ BYTE00A ; OSBYTE 0,0 - generate error RTS ; %000x1xxx host type, 'A'pple BYTE00A BRK DB $F7 -HELLO ASC 'Applecorn MOS 2021-09-21' +HELLO ASC 'Applecorn MOS 2021-09-22' DB $00 ; Unify MOS messages - - diff --git a/auxmem.misc.s b/auxmem.misc.s index 732054c..0d65087 100644 --- a/auxmem.misc.s +++ b/auxmem.misc.s @@ -534,3 +534,5 @@ AUXBLK ASC '**ENDOFCODE**' + + diff --git a/auxmem.mosequ.s b/auxmem.mosequ.s index 3176175..b72a46f 100644 --- a/auxmem.mosequ.s +++ b/auxmem.mosequ.s @@ -73,3 +73,5 @@ OSFILECB EQU $2EE ; OSFILE control block + + diff --git a/auxmem.oscli.s b/auxmem.oscli.s index f282cf3..0d1f044 100644 --- a/auxmem.oscli.s +++ b/auxmem.oscli.s @@ -501,3 +501,5 @@ ECHOLP1 JSR GSREAD + + diff --git a/auxmem.vdu.s b/auxmem.vdu.s index 40b0069..5e96b3d 100644 --- a/auxmem.vdu.s +++ b/auxmem.vdu.s @@ -22,7 +22,7 @@ * VDU DRIVER ZERO PAGE ********************** * $00D0-$00DF VDU driver zero page workspace -VDUSTATUS EQU $D0 ; $D0 # VDU status +VDUSTATUS EQU $D0 ; $D0 # VDU status * bit 7 = VDU 21 VDU disabled * bit 6 = COPY cursor active * bit 5 = VDU 5 Text at graphics cursor @@ -32,10 +32,10 @@ VDUSTATUS EQU $D0 ; $D0 # VDU status * bit 1 = Don't scroll (COPY cursor or VDU 5 mode) * bit 0 = VDU 2 printer echo active * -VDUCHAR EQU VDUSTATUS+1 ; $D1 -VDUADDR EQU VDUSTATUS+4 ; $D4 address of current char cell -OLDCHAR EQU OSKBD1 ; *TEMP* character under cursor -COPYCHAR EQU OSKBD2 ; *TEMP* character under copy cursor +VDUCHAR EQU VDUSTATUS+1 ; $D1 +VDUADDR EQU VDUSTATUS+4 ; $D4 address of current char cell +OLDCHAR EQU OSKBD1 ; *TEMP* character under cursor +COPYCHAR EQU OSKBD2 ; *TEMP* character under copy cursor * VDU DRIVER MAIN WORKSPACE @@ -45,45 +45,45 @@ FXVDUQLEN EQU BYTEVARBASE+218 ; Length of pending VDU queue VDUVARS EQU $290 VDUVAREND EQU $2DF -GFXWINLFT EQU VDUVARS+$00 ; # graphics window left -GFXWINBOT EQU VDUVARS+$02 ; # graphics window bottom \ window -GFXWINRGT EQU VDUVARS+$04 ; # graphics window right / size -GFXWINTOP EQU VDUVARS+$06 ; # graphics window top -TXTWINLFT EQU VDUVARS+$08 ; # text window left -TXTWINBOT EQU VDUVARS+$09 ; # text window bottom \ window -TXTWINRGT EQU VDUVARS+$0A ; # text window right / size -TXTWINTOP EQU VDUVARS+$0B ; # text window top -GFXORIGX EQU VDUVARS+$0C ; graphics X origin -GFXORIGY EQU VDUVARS+$0E ; graphics Y origin +GFXWINLFT EQU VDUVARS+$00 ; # graphics window left +GFXWINBOT EQU VDUVARS+$02 ; # graphics window bottom \ window +GFXWINRGT EQU VDUVARS+$04 ; # graphics window right / size +GFXWINTOP EQU VDUVARS+$06 ; # graphics window top +TXTWINLFT EQU VDUVARS+$08 ; # text window left +TXTWINBOT EQU VDUVARS+$09 ; # text window bottom \ window +TXTWINRGT EQU VDUVARS+$0A ; # text window right / size +TXTWINTOP EQU VDUVARS+$0B ; # text window top +GFXORIGX EQU VDUVARS+$0C ; graphics X origin +GFXORIGY EQU VDUVARS+$0E ; graphics Y origin * -GFXPOSNX EQU VDUVARS+$10 ; current graphics X posn -GFXPOSNY EQU VDUVARS+$12 ; current graphics Y posn -GFXLASTX EQU VDUVARS+$14 ; last graphics X posn -GFXLASTY EQU VDUVARS+$16 ; last graphics Y posn -VDUTEXTX EQU VDUVARS+$18 ; absolute text X posn = POS+WINLFT -VDUTEXTY EQU VDUVARS+$19 ; absolute text Y posn = VPOS+WINTOP -VDUCOPYX EQU VDUVARS+$1A ; absolute COPY text X posn -VDUCOPYY EQU VDUVARS+$1B ; absolute COPY text Y posn +GFXPOSNX EQU VDUVARS+$10 ; current graphics X posn +GFXPOSNY EQU VDUVARS+$12 ; current graphics Y posn +GFXLASTX EQU VDUVARS+$14 ; last graphics X posn +GFXLASTY EQU VDUVARS+$16 ; last graphics Y posn +VDUTEXTX EQU VDUVARS+$18 ; absolute text X posn = POS+WINLFT +VDUTEXTY EQU VDUVARS+$19 ; absolute text Y posn = VPOS+WINTOP +VDUCOPYX EQU VDUVARS+$1A ; absolute COPY text X posn +VDUCOPYY EQU VDUVARS+$1B ; absolute COPY text Y posn * -VDUQ EQU VDUVARS+$27 ; *TEMP* $27.$2F -CURSOR EQU VDUVARS+$30 ; *TEMP* character used for cursor -CURSORED EQU VDUVARS+$31 ; *TEMP* character used for edit cursor -CURSORCP EQU VDUVARS+$32 ; *TEMP* character used for copy cursor +VDUQ EQU VDUVARS+$27 ; *TEMP* $27.$2F +CURSOR EQU VDUVARS+$30 ; *TEMP* character used for cursor +CURSORED EQU VDUVARS+$31 ; *TEMP* character used for edit cursor +CURSORCP EQU VDUVARS+$32 ; *TEMP* character used for copy cursor * -VDUPIXELS EQU VDUVARS+$33 ; *TEMP* pixels per byte -VDUBYTES EQU VDUVARS+$34 ; *TEMP* bytes per char, 1=text only -VDUMODE EQU VDUVARS+$35 ; *TEMP* current MODE -VDUSCREEN EQU VDUVARS+$36 ; *TEMP* MODE type -VDUCOLOURS EQU VDUVARS+$37 ; *TEMP* colours-1 +VDUPIXELS EQU VDUVARS+$33 ; *TEMP* pixels per byte +VDUBYTES EQU VDUVARS+$34 ; *TEMP* bytes per char, 1=text only +VDUMODE EQU VDUVARS+$35 ; *TEMP* current MODE +VDUSCREEN EQU VDUVARS+$36 ; *TEMP* MODE type +VDUCOLOURS EQU VDUVARS+$37 ; *TEMP* colours-1 * * Screen definitions -* 3 6 7 -SCNTXTMAXX DB 79,39,19,79,39,19,39,39 ; Max text column -SCNTXTMAXY DB 23,23,23,23,23,23,23,23 ; Max text row -SCNBYTES DB 1, 1, 1, 1, 1, 1, 1, 1 ; Bytes per character -SCNCOLOURS DB 1, 1, 1, 1, 1, 1, 1, 1 ; Colours-1 -SCNTYPE DB 1, 0,128,1, 0, 0, 0,64 ; Screen type +* 3 6 7 +SCNTXTMAXX DB 79,39,19,79,39,19,39,39 ; Max text column +SCNTXTMAXY DB 23,23,23,23,23,23,23,23 ; Max text row +SCNBYTES DB 1,1 +SCNCOLOURS DB 1,1 +SCNTYPE DB 1,0,128,1 * b7=FastDraw * b6=Teletext * b0=40COL/80COL @@ -496,7 +496,7 @@ VDU22 LDA VDUQ+8 BMI VDU22G ; b7=1, graphics mode * TEMP CPX #2 - BEQ VDU22G ; Jump out for MODE 2 + BEQ VDU22G ; Jump out for MODE 2 * TEMP * AND #$01 ; 40col/80col bit @@ -508,7 +508,7 @@ VDU22 LDA VDUQ+8 STA $C00F ; Enable alt charset BRA VDU22CLR - + VDU22G STA $C050 ; Enable Graphics STA $C057 ; Hi-Res STA $C054 ; PAGE1 @@ -539,7 +539,7 @@ CLEAR STZ VDUTEXTY ; ROW :S3 STZ VDUTEXTY ; ROW STZ VDUTEXTX ; COL RTS -VDU12SOFT JMP VDU16 ; *TEMP* +VDU12SOFT JMP VDU16 ; *TEMP* * Clear to EOL @@ -735,8 +735,8 @@ VDU29 RTS * OSBYTE &A0 - Read VDU variable ******************************** -BYTEA0 LDY VDUVARS+1,X - LDA VDUVARS+0,X +BYTEA0 LDY VDUVARS+1,X + LDA VDUVARS+0,X TAX RTS diff --git a/mainmem.fsequ.s b/mainmem.fsequ.s index 6aaa364..6fc81ba 100644 --- a/mainmem.fsequ.s +++ b/mainmem.fsequ.s @@ -63,6 +63,8 @@ GEOFCMD EQU $D1 + + diff --git a/mainmem.init.s b/mainmem.init.s index dedcbdf..3c21804 100644 --- a/mainmem.init.s +++ b/mainmem.init.s @@ -109,6 +109,8 @@ RESET TSX + + diff --git a/mainmem.ldr.s b/mainmem.ldr.s index 0edea07..ae51e36 100644 --- a/mainmem.ldr.s +++ b/mainmem.ldr.s @@ -150,3 +150,5 @@ LOADCODE PHP ; Save carry flag + + diff --git a/mainmem.lists.s b/mainmem.lists.s index aa1f91d..143f2a6 100644 --- a/mainmem.lists.s +++ b/mainmem.lists.s @@ -127,6 +127,8 @@ QUITPL HEX 04 ; Number of parameters + + diff --git a/mainmem.menu.s b/mainmem.menu.s index 7187806..9bc2f26 100644 --- a/mainmem.menu.s +++ b/mainmem.menu.s @@ -144,6 +144,8 @@ ROM8 STR "USERROM2.ROM" + + diff --git a/mainmem.misc.s b/mainmem.misc.s index e9e235e..2934856 100644 --- a/mainmem.misc.s +++ b/mainmem.misc.s @@ -213,6 +213,8 @@ FILEREFS DB $00,$00,$00,$00 + + diff --git a/mainmem.path.s b/mainmem.path.s index 5197ca3..16b7350 100644 --- a/mainmem.path.s +++ b/mainmem.path.s @@ -308,6 +308,8 @@ PREFIX DS 65 ; Buffer for ProDOS prefix + + diff --git a/mainmem.svc.s b/mainmem.svc.s index 2e583e1..581fc30 100644 --- a/mainmem.svc.s +++ b/mainmem.svc.s @@ -1138,3 +1138,5 @@ PLOTMODE DB $00 ; K value for PLOT K,X,Y + + diff --git a/mainmem.wild.s b/mainmem.wild.s index 2c52624..6ff72c6 100644 --- a/mainmem.wild.s +++ b/mainmem.wild.s @@ -388,3 +388,5 @@ MATCHBUF DS 65 ; For storing match results (Pascal str) + +