diff --git a/.Floppies/A2OSX.BOOT.po b/.Floppies/A2OSX.BOOT.po index e22984d6..818f2f96 100644 Binary files a/.Floppies/A2OSX.BOOT.po and b/.Floppies/A2OSX.BOOT.po differ diff --git a/.Floppies/A2OSX.BUILD.po b/.Floppies/A2OSX.BUILD.po index 84c9adbc..312e1903 100644 Binary files a/.Floppies/A2OSX.BUILD.po and b/.Floppies/A2OSX.BUILD.po differ diff --git a/.Floppies/A2OSX.SRC.po b/.Floppies/A2OSX.SRC.po index 3bdf7780..bbd7aec1 100644 Binary files a/.Floppies/A2OSX.SRC.po and b/.Floppies/A2OSX.SRC.po differ diff --git a/BIN/ARP.S.txt b/BIN/ARP.S.txt index 8f0e3914..4c1e0566 100644 --- a/BIN/ARP.S.txt +++ b/BIN/ARP.S.txt @@ -1,8 +1,6 @@ -PR#3 -PREFIX /A2OSX.BUILD NEW -INC 1 -AUTO 6 +PREFIX /A2OSX.BUILD +AUTO 4,1 .LIST OFF .OP 65C02 .OR $2000 @@ -54,7 +52,6 @@ CS.INIT >LDYA L.LIBTCPIP *-------------------------------------- CS.RUN ldy #S.PS.ARGC lda (pPs),y - cmp #1 bne .1 jmp CS.RUN.DUMP diff --git a/BIN/ATBROWSE.S.txt b/BIN/ATBROWSE.S.txt index f00dbbfa..0e14dea4 100644 --- a/BIN/ATBROWSE.S.txt +++ b/BIN/ATBROWSE.S.txt @@ -1,8 +1,6 @@ -PR#3 -PREFIX /A2OSX.BUILD NEW -INC 1 -AUTO 6 +PREFIX /A2OSX.BUILD +AUTO 4,1 .LIST OFF .OP 65C02 .OR $2000 diff --git a/BIN/ATLOGON.S.txt b/BIN/ATLOGON.S.txt index ff0df9d1..c57daf83 100644 --- a/BIN/ATLOGON.S.txt +++ b/BIN/ATLOGON.S.txt @@ -1,8 +1,6 @@ -PR#3 -PREFIX /A2OSX.BUILD NEW -INC 1 -AUTO 6 +PREFIX /A2OSX.BUILD +AUTO 4,1 .LIST OFF .OP 65C02 .OR $2000 diff --git a/BIN/CAT.S.txt b/BIN/CAT.S.txt index a11c8c0f..83f0f3ea 100644 --- a/BIN/CAT.S.txt +++ b/BIN/CAT.S.txt @@ -1,8 +1,6 @@ -PR#3 -PREFIX /A2OSX.BUILD NEW -INC 1 -AUTO 6 +PREFIX /A2OSX.BUILD +AUTO 4,1 .LIST OFF .OP 65C02 .OR $2000 diff --git a/BIN/CHTYP.S.txt b/BIN/CHTYP.S.txt index 86038689..8cc4f904 100644 --- a/BIN/CHTYP.S.txt +++ b/BIN/CHTYP.S.txt @@ -1,8 +1,6 @@ -PR#3 -PREFIX /A2OSX.BUILD NEW -INC 1 -AUTO 6 +PREFIX /A2OSX.BUILD +AUTO 4,1 .LIST OFF .OP 65C02 .OR $2000 diff --git a/BIN/CP.S.txt b/BIN/CP.S.txt index a2fdf391..7bf68ce1 100644 --- a/BIN/CP.S.txt +++ b/BIN/CP.S.txt @@ -1,8 +1,6 @@ -PR#3 -PREFIX /A2OSX.BUILD NEW -INC 1 -AUTO 6 +PREFIX /A2OSX.BUILD +AUTO 4,1 .LIST OFF .OP 65C02 .OR $2000 diff --git a/BIN/DNSINFO.S.txt b/BIN/DNSINFO.S.txt index f93d33a5..7ccf23df 100644 --- a/BIN/DNSINFO.S.txt +++ b/BIN/DNSINFO.S.txt @@ -1,8 +1,6 @@ -PR#3 -PREFIX /A2OSX.BUILD NEW -INC 1 -AUTO 6 +PREFIX /A2OSX.BUILD +AUTO 4,1 .LIST OFF .OP 65C02 .OR $2000 @@ -24,7 +22,8 @@ CS.START cld .DA 0 .DA CS.END-CS.START Code Length To Relocate .DA 0 No Data Segment to Allocate - .DA 0 + .DA #16 SS + .DA #4 ZP .DA 0 *-------------------------------------- * Relocation Table @@ -41,7 +40,7 @@ L.MSG1 .DA MSG1 .DA 0 *-------------------------------------- CS.INIT >LDYA L.LIBTCPIP - >SYSCALL LoadLibYA + >SYSCALL LoadLib.YA sta hLIBTCPIP .8 lda (pPs) @@ -50,8 +49,8 @@ CS.INIT >LDYA L.LIBTCPIP clc rts *-------------------------------------- -CS.RUN >SYSCALL GetArgC - cmp #1 +CS.RUN ldy #S.PS.ARGC + lda (pPs),y beq CS.RUN.DUMP CS.RUN.ADD cmp #3 @@ -80,7 +79,7 @@ CS.RUN.ADD cmp #3 sec .99 rts -CS.RUN.DUMP >LIBCALL hLIBTCPIP,LIBTCPIP.DNS.GetC.ACHE +CS.RUN.DUMP >LIBCALL hLIBTCPIP,LIBTCPIP.DNS.GetCache >STYA ZPPTR1 >LDYA L.MSG0 >SYSCALL PrintF.YA @@ -138,13 +137,13 @@ CS.EVENT sec rts *-------------------------------------- CS.QUIT lda hLIBTCPIP - >SYSCALL UnloadLibA + >SYSCALL UnloadLib.A clc rts *-------------------------------------- CS.END -LIBTCPIP >PSTR "libtcpip.o" -SSCANF.IP >PSTR "%d.%d.%d.%d" +LIBTCPIP >CSTR "libtcpip.o" +SSCANF.IP >CSTR "%d.%d.%d.%d" MSG0 >CSTR "STS TR.ID Hostname IP Address TTL\r\n" MSG1 >CSTR "$%h $%H %32S %03d.%03d.%03d.%03d %L\r\n" hLIBTCPIP .BS 1 diff --git a/BIN/EDIT.S.BUF.txt b/BIN/EDIT.S.BUF.txt index 3dd5d9a2..2a1bd66d 100644 --- a/BIN/EDIT.S.BUF.txt +++ b/BIN/EDIT.S.BUF.txt @@ -1,8 +1,6 @@ -PR#3 -PREFIX /A2OSX.BUILD NEW -INC 1 -AUTO 6 +PREFIX /A2OSX.BUILD +AUTO 4,1 .LIST OFF *-------------------------------------- BUF.InsertClipboard diff --git a/BIN/EDIT.S.CTRL.txt b/BIN/EDIT.S.CTRL.txt index 6980d0cd..38fd5ed2 100644 --- a/BIN/EDIT.S.CTRL.txt +++ b/BIN/EDIT.S.CTRL.txt @@ -1,8 +1,6 @@ -PR#3 -PREFIX /A2OSX.BUILD NEW -INC 1 -AUTO 6 +PREFIX /A2OSX.BUILD +AUTO 4,1 .LIST OFF *-------------------------------------- * ^A = Help diff --git a/BIN/EDIT.S.SCRN.txt b/BIN/EDIT.S.SCRN.txt index 6647040c..b97505b3 100644 --- a/BIN/EDIT.S.SCRN.txt +++ b/BIN/EDIT.S.SCRN.txt @@ -1,8 +1,6 @@ -PR#3 -PREFIX /A2OSX.BUILD NEW -INC 1 -AUTO 6 +PREFIX /A2OSX.BUILD +AUTO 4,1 .LIST OFF *-------------------------------------- SCRN.Init ldy #ScreenH diff --git a/BIN/EDIT.S.txt b/BIN/EDIT.S.txt index 92635fdc..39deb36d 100644 --- a/BIN/EDIT.S.txt +++ b/BIN/EDIT.S.txt @@ -1,8 +1,6 @@ -PR#3 -PREFIX /A2OSX.BUILD NEW -INC 1 -AUTO 6 +PREFIX /A2OSX.BUILD +AUTO 4,1 .LIST OFF .OP 65C02 .OR $2000 @@ -470,12 +468,12 @@ SEQ.SCROLLDN >CSTR "\e[%d;%dH\eM" SEQ.INV >CSTR "\e[7m" SEQ.NORM >CSTR "\e[0m" SEQ.CEOL >CSTR "\e[K" -MSG.TOPBAR >CSTR "\e[1;1HA2osX Edit:%S\e[0m" +MSG.TOPBAR >CSTR "\e[1;1HA2osX Edit:%s\e[0m" MSG.STATUSBAR >CSTR "Press Ctrl-A For Help Length:%5D,Col:%3d,Line:%5D" MSG.STATUSBAR.H >CSTR "Press any key to exit this screen:\e[0m" -MSG.STATUSBAR.F >CSTR "Find:%S\e[0m" -MSG.STATUSBAR.R >CSTR "Replace:%S\e[0m" -MSG.STATUSBAR.S >CSTR "Save:%S\e[0m" +MSG.STATUSBAR.F >CSTR "Find:%s\e[0m" +MSG.STATUSBAR.R >CSTR "Replace:%s\e[0m" +MSG.STATUSBAR.S >CSTR "Save:%s\e[0m" MSG.STATUSBAR.E >CSTR "Error:%h\e[0m" MSG.GOTOXY >CSTR "\e[%d;%dH" MSG.HELPLINE >CSTR "%S\e[K" diff --git a/BIN/FORMAT.S.txt b/BIN/FORMAT.S.txt index 923cc78a..99e44cf5 100644 --- a/BIN/FORMAT.S.txt +++ b/BIN/FORMAT.S.txt @@ -1,8 +1,6 @@ -PR#3 -PREFIX /A2OSX.BUILD NEW -INC 1 -AUTO 6 +PREFIX /A2OSX.BUILD +AUTO 4,1 .LIST OFF .OP 65C02 .OR $2000 diff --git a/BIN/IPCONFIG.S.txt b/BIN/IPCONFIG.S.txt index e21ffc84..0dcc30dc 100644 --- a/BIN/IPCONFIG.S.txt +++ b/BIN/IPCONFIG.S.txt @@ -1,8 +1,6 @@ -PR#3 -PREFIX /A2OSX.BUILD NEW -INC 1 -AUTO 6 +PREFIX /A2OSX.BUILD +AUTO 4,1 .LIST OFF .OP 65C02 .OR $2000 @@ -10,7 +8,7 @@ AUTO 6 *-------------------------------------- .INB /A2OSX.BUILD/INC/MACROS.I .INB /A2OSX.BUILD/INC/A2OSX.I - .INB /A2OSX.BUILD/INC/NET.I + .INB /A2OSX.BUILD/INC/NIC.I .INB /A2OSX.BUILD/INC/LIBTCPIP.I *-------------------------------------- ZPIPCfgPtr .EQ ZPBIN @@ -93,11 +91,11 @@ CS.RUN.DUMPDEV sta DevID >LDYA L.MSG0.L >SYSCALL PrintF.YA - ldy #S.DSTAT.NET.MAC+5 + ldy #S.DSTAT.NIC.MAC+5 .1 >PUSHB (ZPDevStatPtr),y dey - cpy #S.DSTAT.NET.MAC-1 + cpy #S.DSTAT.NIC.MAC-1 bne .1 lda #S.DEV.NAME @@ -122,27 +120,27 @@ CS.RUN.DUMPDEV sta DevID >LDYA L.MSG1.DEV >SYSCALL PrintF.YA - ldy #S.DSTAT.NET.FLAGS + ldy #S.DSTAT.NIC.FLAGS lda (ZPDevStatPtr),y - and #S.DSTAT.NET.FLAGS.ARPOFFLOAD + and #S.DSTAT.NIC.FLAGS.ARPOFFLOAD beq .2 lda #1 .2 >PUSHA >LDYA L.MSG1.DEV.ARP >SYSCALL PrintF.YA - ldy #S.DSTAT.NET.FLAGS + ldy #S.DSTAT.NIC.FLAGS lda (ZPDevStatPtr),y - and #S.DSTAT.NET.FLAGS.IPOFFLOAD + and #S.DSTAT.NIC.FLAGS.IPOFFLOAD beq .3 lda #1 .3 >PUSHA >LDYA L.MSG1.DEV.IP >SYSCALL PrintF.YA - ldy #S.DSTAT.NET.STATUS + ldy #S.DSTAT.NIC.STATUS lda (ZPDevStatPtr),y - and #S.DSTAT.NET.STATUS.OK + and #S.DSTAT.NIC.STATUS.OK bne CS.RUN.LINK >PUSHW L.MSG1.LINK.KO >LDYA L.MSG1.LINK @@ -156,7 +154,7 @@ CS.RUN.LINK >PUSHW L.MSG1.LINK.OK >LDYA L.MSG1.LINKSPEED >SYSCALL PrintF.YA - ldy #S.DSTAT.NET.STATUS + ldy #S.DSTAT.NIC.STATUS lda (ZPDevStatPtr),y and #$0F tax @@ -168,9 +166,9 @@ CS.RUN.LINK >PUSHW L.MSG1.LINK.OK dex bne .4 - ldy #S.DSTAT.NET.STATUS + ldy #S.DSTAT.NIC.STATUS lda (ZPDevStatPtr),y - and #S.DSTAT.NET.STATUS.FD + and #S.DSTAT.NIC.STATUS.FD bne .5 >LDYA L.MSG1.DPLX.HD bra .6 @@ -252,7 +250,7 @@ CS.DOEVENT sec *-------------------------------------- CS.QUIT lda hLIBTCPIP beq .8 - >SYSCALL FreeMem.A + >SYSCALL UnloadLib.A .8 clc rts diff --git a/BIN/LS.S.txt b/BIN/LS.S.txt index 167e3acb..49d09dd3 100644 --- a/BIN/LS.S.txt +++ b/BIN/LS.S.txt @@ -1,8 +1,6 @@ -PR#3 -PREFIX /A2OSX.BUILD NEW -INC 1 -AUTO 6 +PREFIX /A2OSX.BUILD +AUTO 4,1 .LIST OFF .OP 65C02 .OR $2000 diff --git a/BIN/LSDEV.S.txt b/BIN/LSDEV.S.txt index e4fb4bcd..5bae19e5 100644 --- a/BIN/LSDEV.S.txt +++ b/BIN/LSDEV.S.txt @@ -1,8 +1,6 @@ -PR#3 -PREFIX /A2OSX.BUILD NEW -INC 1 -AUTO 6 +PREFIX /A2OSX.BUILD +AUTO 4,1 .LIST OFF .OP 65C02 .OR $2000 diff --git a/BIN/MD.S.txt b/BIN/MD.S.txt index 7ba82e88..93978ad9 100644 --- a/BIN/MD.S.txt +++ b/BIN/MD.S.txt @@ -1,8 +1,6 @@ -PR#3 -PREFIX /A2OSX.BUILD NEW -INC 1 -AUTO 6 +PREFIX /A2OSX.BUILD +AUTO 4,1 .LIST OFF .OP 65C02 .OR $2000 diff --git a/BIN/MEM.S.txt b/BIN/MEM.S.txt index 2bc27ebf..97f41e0a 100644 --- a/BIN/MEM.S.txt +++ b/BIN/MEM.S.txt @@ -1,8 +1,6 @@ -PR#3 -PREFIX /A2OSX.BUILD NEW -INC 1 -AUTO 6 +PREFIX /A2OSX.BUILD +AUTO 4,1 .LIST OFF .OP 65C02 .OR $2000 diff --git a/BIN/MEMDUMP.S.txt b/BIN/MEMDUMP.S.txt index 80c7794f..4a1e3972 100644 --- a/BIN/MEMDUMP.S.txt +++ b/BIN/MEMDUMP.S.txt @@ -1,8 +1,6 @@ -PR#3 -PREFIX /A2OSX.BUILD NEW -INC 1 -AUTO 6 +PREFIX /A2OSX.BUILD +AUTO 4,1 .LIST OFF .OP 65C02 .OR $2000 diff --git a/BIN/MV.S.txt b/BIN/MV.S.txt index 6c9b2f5b..2ebf4f23 100644 --- a/BIN/MV.S.txt +++ b/BIN/MV.S.txt @@ -1,8 +1,6 @@ -PR#3 -PREFIX /A2OSX.BUILD NEW -INC 1 -AUTO 6 +PREFIX /A2OSX.BUILD +AUTO 4,1 .LIST OFF .OP 65C02 .OR $2000 diff --git a/BIN/NETSTAT.S.txt b/BIN/NETSTAT.S.txt index f1864702..dad00b84 100644 --- a/BIN/NETSTAT.S.txt +++ b/BIN/NETSTAT.S.txt @@ -1,8 +1,6 @@ -PR#3 -PREFIX /A2OSX.BUILD NEW -INC 1 -AUTO 6 +PREFIX /A2OSX.BUILD +AUTO 4,1 .LIST OFF .OP 65C02 .OR $2000 @@ -23,7 +21,8 @@ CS.START cld .DA 0 .DA CS.END-CS.START Code Length To Relocate .DA 0 Data Segment to Allocate - .DA 0 + .DA #16 SS + .DA #2 ZP .DA 0 *-------------------------------------- * Relocation Table @@ -53,7 +52,7 @@ L.MSG1.S .DA MSG1.S.0 .DA 0 *-------------------------------------- CS.INIT >LDYA L.LIBTCPIP - >SYSCALL LoadLibYA + >SYSCALL LoadLib.YA bcs .9 sta hLIBTCPIP @@ -123,8 +122,8 @@ CS.DOEVENT sec *-------------------------------------- CS.QUIT lda hLIBTCPIP beq .8 + >SYSCALL UnloadLib.A - >SYSCALL FreeMem.A .8 clc rts *-------------------------------------- diff --git a/BIN/PING.S.txt b/BIN/PING.S.txt index edd28f24..c87763bd 100644 --- a/BIN/PING.S.txt +++ b/BIN/PING.S.txt @@ -1,8 +1,6 @@ -PR#3 -PREFIX /A2OSX.BUILD NEW -INC 1 -AUTO 6 +PREFIX /A2OSX.BUILD +AUTO 4,1 .LIST OFF .OP 65C02 .OR $2000 @@ -28,7 +26,8 @@ CS.START cld .DA 0 .DA CS.END-CS.START Code Length To Relocate .DA DS.END-DS.START Data Segment to Allocate - .DA 0 + .DA #16 SS + .DA #8 ZP .DA 0 *-------------------------------------- .1 .DA CS.INIT @@ -48,7 +47,7 @@ L.MSG.UNREACH .DA MSG.UNREACH .DA 0 *-------------------------------------- CS.INIT >LDYA L.LIBTCPIP - >SYSCALL LoadLibYA + >SYSCALL LoadLib.YA bcs .9 sta hLIBTCPIP @@ -72,8 +71,9 @@ CS.RUN >LIBCALL hLIBTCPIP,LIBTCPIP.GET.IPCFG is TCPIP loaded ? sec rts -CS.RUN.IPOK >SYSCALL GetArgC - cmp #1 +CS.RUN.IPOK ldy #S.PS.ARGC + lda (pPs),y + beq .9 jsr Init.Timeout @@ -184,7 +184,7 @@ CS.RUN.SEND.ECHO CS.RUN.WAIT.REPLY >SLEEP - >SYSCALL GetC + >SYSCALL GetChar bcs .1 cmp #3 Ctrl-C beq .9 @@ -303,7 +303,7 @@ CS.QUIT ldy #hFrame >LIBCALL hLIBTCPIP,LIBTCPIP.SKT.CLOSEA lda hLIBTCPIP - >SYSCALL UnloadLibA + >SYSCALL UnloadLib.A clc rts *-------------------------------------- @@ -321,7 +321,7 @@ Wait.TimeOut sec .9 rts *-------------------------------------- CS.END -LIBTCPIP >PSTR "libtcpip.o" +LIBTCPIP >CSTR "libtcpip.o" MSG.IPKO >CSTR "TCP/IP Not Loaded/Configured.\r\n" MSG.USAGE >CSTR "Usage : PING \r\n" MSG.UNKNOWN >CSTR "%S: Unknown host\r\n" diff --git a/BIN/PS.S.txt b/BIN/PS.S.txt index 0e4daef8..a7e079fb 100644 --- a/BIN/PS.S.txt +++ b/BIN/PS.S.txt @@ -1,8 +1,6 @@ -PR#3 -PREFIX /A2OSX.BUILD NEW -INC 1 -AUTO 6 +PREFIX /A2OSX.BUILD +AUTO 4,1 .LIST OFF .OP 65C02 .OR $2000 diff --git a/BIN/RM.S.txt b/BIN/RM.S.txt index 0152c203..8c58ec4a 100644 --- a/BIN/RM.S.txt +++ b/BIN/RM.S.txt @@ -1,8 +1,6 @@ -PR#3 -PREFIX /A2OSX.BUILD NEW -INC 1 -AUTO 6 +PREFIX /A2OSX.BUILD +AUTO 4,1 .LIST OFF .OP 65C02 .OR $2000 diff --git a/BIN/RPCDUMP.S.txt b/BIN/RPCDUMP.S.txt index e96dd870..6b236232 100644 --- a/BIN/RPCDUMP.S.txt +++ b/BIN/RPCDUMP.S.txt @@ -1,8 +1,6 @@ -PR#3 -PREFIX /A2OSX.BUILD NEW -INC 1 -AUTO 6 +PREFIX /A2OSX.BUILD +AUTO 4,1 .LIST OFF .OP 65C02 .OR $2000 @@ -44,12 +42,12 @@ L.MSG.DUMP0 .DA MSG.DUMP0 L.MSG.DUMP1 .DA MSG.DUMP1 .DA 0 *-------------------------------------- -CS.INIT >SYSCALL GetArgC - cmp #1 +CS.INIT ldy #S.PS.ARGC + lda (pPs),y beq .99 >LDYA L.LIBTCPIP - >SYSCALL LoadLibYA + >SYSCALL LoadLib.YA sta hLIBTCPIP >LIBCALL hLIBTCPIP,LIBTCPIP.GET.IPCFG is TCPIP loaded ? @@ -181,7 +179,7 @@ CS.QUIT ldy #hSocket .1 lda hLIBTCPIP beq .8 - >SYSCALL UnloadLibA + >SYSCALL UnloadLib.A .8 clc rts diff --git a/BIN/X.CPMVRM.G.txt b/BIN/X.CPMVRM.G.txt index 4c6ef536..6f5af74a 100644 --- a/BIN/X.CPMVRM.G.txt +++ b/BIN/X.CPMVRM.G.txt @@ -1,8 +1,6 @@ -PR#3 -PREFIX /A2OSX.BUILD NEW -INC 1 -AUTO 6 +PREFIX /A2OSX.BUILD +AUTO 4,1 .LIST OFF *-------------------------------------- ArgCount .BS 1 @@ -32,5 +30,3 @@ hToDelete .BS 1 *-------------------------------------- MAN SAVE /A2OSX.SRC/BIN/X.CPMVRM.G -LOAD /A2OSX.SRC/BIN/CP.S -ASM diff --git a/BIN/X.CPMVRM.S.txt b/BIN/X.CPMVRM.S.txt index 55f7afbc..28a10487 100644 --- a/BIN/X.CPMVRM.S.txt +++ b/BIN/X.CPMVRM.S.txt @@ -1,8 +1,6 @@ -PR#3 -PREFIX /A2OSX.BUILD NEW -INC 1 -AUTO 6 +PREFIX /A2OSX.BUILD +AUTO 4,1 .LIST OFF *-------------------------------------- X.COPY.BUF.SIZE .EQ 4096 @@ -819,5 +817,3 @@ CS.QUIT.FREE lda (pData),y *-------------------------------------- MAN SAVE /A2OSX.SRC/BIN/X.CPMVRM.S -LOAD /A2OSX.SRC/BIN/CP.S -ASM diff --git a/BIN/X.FILEENUM.G.txt b/BIN/X.FILEENUM.G.txt index 7f3f8819..aa75dc75 100644 --- a/BIN/X.FILEENUM.G.txt +++ b/BIN/X.FILEENUM.G.txt @@ -1,8 +1,6 @@ -PR#3 -PREFIX /A2OSX.BUILD NEW -INC 1 -AUTO 6 +PREFIX /A2OSX.BUILD +AUTO 4,1 .LIST OFF *-------------------------------------- Index .BS 1 @@ -21,5 +19,3 @@ hDstBasePath .BS 1 *-------------------------------------- MAN SAVE /A2OSX.SRC/BIN/X.FILEENUM.G -LOAD /A2OSX.SRC/BIN/LS.S -ASM diff --git a/BIN/X.FILEENUM.S.txt b/BIN/X.FILEENUM.S.txt index d5344045..06d4af68 100644 --- a/BIN/X.FILEENUM.S.txt +++ b/BIN/X.FILEENUM.S.txt @@ -1,8 +1,6 @@ -PR#3 -PREFIX /A2OSX.BUILD NEW -INC 1 -AUTO 6 +PREFIX /A2OSX.BUILD +AUTO 4,1 .LIST OFF *-------------------------------------- X.MAX.RECURSE .EQ 8 @@ -565,5 +563,3 @@ BasePath..1 lda (pData),y *-------------------------------------- MAN SAVE /A2OSX.SRC/BIN/X.FILEENUM.S -LOAD /A2OSX.SRC/BIN/LS.S -ASM diff --git a/BMP2PIX.S.txt b/BMP2PIX.S.txt index d496439a..192c5c96 100644 --- a/BMP2PIX.S.txt +++ b/BMP2PIX.S.txt @@ -1,12 +1,10 @@ -PR#3 -PREFIX /A2OSX.BUILD NEW -INC 1 -AUTO 6 +PREFIX /A2OSX.BUILD +AUTO 4,1 .LIST OFF .OP 65C02 .OR $2000 - .TF /A2OSX.BUILD/BMP2PIX + .TF /A2OSX.BUILD/ROOT/BMP2PIX *-------------------------------------- .INB /A2OSX.BUILD/INC/MACROS.I .INB /A2OSX.BUILD/INC/A2OSX.I diff --git a/DRV/CONSOLE.DRV.S.txt b/DRV/CONSOLE.DRV.S.txt index 6cc25b98..a3a44234 100644 --- a/DRV/CONSOLE.DRV.S.txt +++ b/DRV/CONSOLE.DRV.S.txt @@ -1,8 +1,6 @@ -PR#3 +NEW PREFIX /A2OSX.BUILD -LOMEM $A00 -INC 1 -AUTO 6 +AUTO 4,1 .LIST OFF .OP 65C02 .OR $2000 @@ -881,7 +879,8 @@ DEVSTAT .DA #S.DSTAT.S.WRITE+S.DSTAT.S.READ >PSTR "ANSI 80c Console" .DA #S.DSTAT.T.CHAR .DA #0 - .DA $0900 + .DA #0 + .DA #91 ENQ.String >CSTR "XTERM" SB.IS.TTYPE .DA #IAC,#SB,#TELOPT.TTYPE,#SB.IS .AS 'XTERM' diff --git a/DRV/DHGR.DRV.G.txt b/DRV/DHGR.DRV.G.txt index cc7aa4ec..7401c0c6 100644 --- a/DRV/DHGR.DRV.G.txt +++ b/DRV/DHGR.DRV.G.txt @@ -1,8 +1,6 @@ -PR#3 -PREFIX /A2OSX.BUILD NEW -INC 1 -AUTO 6 +PREFIX /A2OSX.BUILD +AUTO 4,1 .LIST OFF *-------------------------------------- Mask7BitsH .DA #%01111111 Useless diff --git a/DRV/DHGR.DRV.S.BLT.txt b/DRV/DHGR.DRV.S.BLT.txt index 790d28fa..0a8f9462 100644 --- a/DRV/DHGR.DRV.S.BLT.txt +++ b/DRV/DHGR.DRV.S.BLT.txt @@ -1,8 +1,6 @@ -PR#3 +NEW PREFIX /A2OSX.BUILD -LOMEM $A00 -INC 1 -AUTO 6 +AUTO 4,1 .LIST OFF *-------------------------------------- * BitBlt diff --git a/DRV/DHGR.DRV.S.LBUF.txt b/DRV/DHGR.DRV.S.LBUF.txt index 0d1f2645..56641496 100644 --- a/DRV/DHGR.DRV.S.LBUF.txt +++ b/DRV/DHGR.DRV.S.LBUF.txt @@ -1,8 +1,6 @@ -PR#3 +NEW PREFIX /A2OSX.BUILD -LOMEM $A00 -INC 1 -AUTO 6 +AUTO 4,1 .LIST OFF *-------------------------------------- LBUF.SetBounds1YA @@ -140,6 +138,7 @@ LBUF.DrawAtY.AND.XOR .8 rts *-------------------------------------- LBUF.DrawAtY.SET +LBUF.DrawAtY.AND.SET ldx LBUF.C1 x C1->C2 ldy COL.BANK,x @@ -211,9 +210,6 @@ LBUF.DrawAtY.SET .8 rts *-------------------------------------- -LBUF.DrawAtY.AND.SET - rts -*-------------------------------------- LBUF.DrawAtY.ORA ldx LBUF.C1 x C1->C2 @@ -266,7 +262,7 @@ LBUF.DrawAtY.ORA *-------------------------------------- LBUF.DrawAtY.AND.ORA ldx LBUF.C1 x C1->C2 - + ldy COL.BANK,x sta $C000,y ldy COL.OFS,x diff --git a/DRV/DHGR.DRV.S.LINE.txt b/DRV/DHGR.DRV.S.LINE.txt index e124f080..2f85483b 100644 --- a/DRV/DHGR.DRV.S.LINE.txt +++ b/DRV/DHGR.DRV.S.LINE.txt @@ -1,15 +1,13 @@ -PR#3 +NEW PREFIX /A2OSX.BUILD -LOMEM $A00 -INC 1 -AUTO 6 +AUTO 4,1 .LIST OFF *-------------------------------------- * HLINE X1,X2 at Y1 (XOR,SET,ORA) *-------------------------------------- -HLINE lda CB.Cache+S.CB.MODE +HLINE lda CB.Cache+S.CB.M - cmp #S.CB.MODE.MONO + cmp #S.CB.M.MONO bne HLINE.C16 HLINE.MONO >LDYA CB.Cache+S.CB.X1 @@ -76,8 +74,8 @@ HLINE.C16 lda CB.Cache+S.CB.X1 *-------------------------------------- * VLINE Y1,Y2 at X1 (XOR,SET,ORA) *-------------------------------------- -VLINE lda CB.Cache+S.CB.MODE - cmp #S.CB.MODE.MONO +VLINE lda CB.Cache+S.CB.M + cmp #S.CB.M.MONO bne VLINE.C16 VLINE.MONO >LDYA CB.Cache+S.CB.X1 diff --git a/DRV/DHGR.DRV.S.PIX.txt b/DRV/DHGR.DRV.S.PIX.txt index 45c07923..596a65e9 100644 --- a/DRV/DHGR.DRV.S.PIX.txt +++ b/DRV/DHGR.DRV.S.PIX.txt @@ -1,8 +1,6 @@ -PR#3 +NEW PREFIX /A2OSX.BUILD -LOMEM $A00 -INC 1 -AUTO 6 +AUTO 4,1 .LIST OFF *-------------------------------------- * SETPIXEL @@ -12,8 +10,8 @@ AUTO 6 * 4 : SrcX1 * 6 : SrcY1 *-------------------------------------- -SETPIXEL lda CB.Cache+S.CB.MODE - bit #S.CB.MODE.C16 +SETPIXEL lda CB.Cache+S.CB.M + bit #S.CB.M.C16 bne SETPIXEL.C16 SETPIXEL.MONO >LDYA CB.Cache+S.CB.X1 diff --git a/DRV/DHGR.DRV.S.RECT.txt b/DRV/DHGR.DRV.S.RECT.txt index f0a5876e..f5431d60 100644 --- a/DRV/DHGR.DRV.S.RECT.txt +++ b/DRV/DHGR.DRV.S.RECT.txt @@ -1,8 +1,6 @@ -PR#3 +NEW PREFIX /A2OSX.BUILD -LOMEM $A00 -INC 1 -AUTO 6 +AUTO 4,1 .LIST OFF *-------------------------------------- * FILLRECT diff --git a/DRV/DHGR.DRV.S.txt b/DRV/DHGR.DRV.S.txt index ac66bd7a..f676cc9f 100644 --- a/DRV/DHGR.DRV.S.txt +++ b/DRV/DHGR.DRV.S.txt @@ -1,8 +1,6 @@ -PR#3 +NEW PREFIX /A2OSX.BUILD -LOMEM $A00 -INC 1 -AUTO 6 +AUTO 4,1 .LIST OFF .OP 65C02 .OR $2000 @@ -14,6 +12,7 @@ AUTO 6 .INB /A2OSX.BUILD/INC/IO.I .INB /A2OSX.BUILD/INC/GFX.I .INB /A2OSX.BUILD/INC/GFX.EVE.I + .INB /A2OSX.BUILD/INC/GUI.I .INB /A2OSX.BUILD/INC/LIBGUI.I *-------------------------------------- ZPCmdPtr .EQ ZPDRV @@ -219,7 +218,7 @@ CLOSE clc *-------------------------------------- WRITE >STYA ZPCmdPtr - sta SETHIRES Make sure SET80STORE active a $2000 + sta SETHIRES Make sure SET80STORE active at $2000 sta SET80STORE lda (ZPCmdPtr) Get Cmd @@ -234,6 +233,7 @@ WRITE >STYA ZPCmdPtr .3 jsr .10 + sta CLRPAGE2 sta CLR80STORE clc @@ -425,7 +425,7 @@ DSTAT .DA #0 .DA #0 .DA #91 *-------------------------------------- - .DA #S.CB.MODE.MONO+S.CB.MODE.C16 + .DA #S.CB.M.MONO+S.CB.M.C16 .DA #0 S .DA 560 W .DA 192 H diff --git a/DRV/LANCEGS.DRV.S.txt b/DRV/LANCEGS.DRV.S.txt index e9866841..7244bfff 100644 --- a/DRV/LANCEGS.DRV.S.txt +++ b/DRV/LANCEGS.DRV.S.txt @@ -1,8 +1,6 @@ -PR#3 +NEW PREFIX /A2OSX.BUILD -LOMEM $A00 -INC 1 -AUTO 6 +AUTO 4,1 .LIST OFF .OP 65C02 .OR $2000 @@ -11,8 +9,8 @@ AUTO 6 .INB /A2OSX.BUILD/INC/MACROS.I .INB /A2OSX.BUILD/INC/A2OSX.I .INB /A2OSX.BUILD/INC/MLI.ERR.I - .INB /A2OSX.BUILD/INC/NET.I - .INB /A2OSX.BUILD/INC/NET.91C96.I + .INB /A2OSX.BUILD/INC/NIC.I + .INB /A2OSX.BUILD/INC/NIC.91C96.I .INB /A2OSX.BUILD/INC/LIBTCPIP.I *-------------------------------------- ZPTmpPTR .EQ ZPDRV @@ -107,7 +105,7 @@ DEV.HEADER cld jmp (DRV.CS.START,x) .DA #0 .BS 6 -DEV.HEADER.NAME >PSTR "ETH7" +DEV.HEADER.NAME >CSTR "ETH7" *-------------------------------------- * Driver Code *-------------------------------------- @@ -124,7 +122,7 @@ DRV.CS.START .DA STATUS L.DEVSTAT .DA DEVSTAT .DA 0 end or relocation *-------------------------------------- -STATUS lda #S.DSTAT.NET.STATUS.10 +STATUS lda #S.DSTAT.NIC.STATUS.10 sta LINK.STATUS ldx DEVSLOTx0 @@ -135,7 +133,7 @@ STATUS lda #S.DSTAT.NET.STATUS.10 and /L91C96.0.EPHSR.LINK beq .1 lda LINK.STATUS - ora #S.DSTAT.NET.STATUS.OK + ora #S.DSTAT.NIC.STATUS.OK sta LINK.STATUS .1 lda L91C96.0.TCR,x @@ -143,7 +141,7 @@ STATUS lda #S.DSTAT.NET.STATUS.10 and /L91C96.0.TCR.FDSE bne .2 lda LINK.STATUS - ora #S.DSTAT.NET.STATUS.FD + ora #S.DSTAT.NIC.STATUS.FD sta LINK.STATUS .2 >LDYA L.DEVSTAT diff --git a/DRV/MOUSE.DRV.S.txt b/DRV/MOUSE.DRV.S.txt index 42103a9a..6a98a497 100644 --- a/DRV/MOUSE.DRV.S.txt +++ b/DRV/MOUSE.DRV.S.txt @@ -1,8 +1,6 @@ -PR#3 -PREFIX /A2OSX.BUILD NEW -INC 1 -AUTO 6 +PREFIX /A2OSX.BUILD +AUTO 4,1 .LIST OFF .OP 65C02 .OR $2000 diff --git a/DRV/SSC.DRV.S.txt b/DRV/SSC.DRV.S.txt index 91b6a938..aed3f427 100644 --- a/DRV/SSC.DRV.S.txt +++ b/DRV/SSC.DRV.S.txt @@ -1,8 +1,6 @@ -PR#3 +NEW PREFIX /A2OSX.BUILD -LOMEM $A00 -INC 1 -AUTO 6 +AUTO 4,1 .LIST OFF .OP 65C02 .OR $2000 diff --git a/DRV/SSC.I.DRV.S.txt b/DRV/SSC.I.DRV.S.txt index 761eaac9..4009e894 100644 --- a/DRV/SSC.I.DRV.S.txt +++ b/DRV/SSC.I.DRV.S.txt @@ -1,8 +1,6 @@ -PR#3 +NEW PREFIX /A2OSX.BUILD -LOMEM $A00 -INC 1 -AUTO 6 +AUTO 4,1 .LIST OFF .OP 65C02 .OR $2000 diff --git a/DRV/UTHER2.AI.DRV.S.txt b/DRV/UTHER2.AI.DRV.S.txt index 78def4a2..0399e5a3 100644 --- a/DRV/UTHER2.AI.DRV.S.txt +++ b/DRV/UTHER2.AI.DRV.S.txt @@ -1,8 +1,6 @@ -PR#3 +NEW PREFIX /A2OSX.BUILD -LOMEM $A00 -INC 1 -AUTO 6 +AUTO 4,1 .LIST OFF .OP 65C02 .OR $2000 @@ -11,8 +9,8 @@ AUTO 6 .INB /A2OSX.BUILD/INC/MACROS.I .INB /A2OSX.BUILD/INC/A2OSX.I .INB /A2OSX.BUILD/INC/MLI.ERR.I - .INB /A2OSX.BUILD/INC/NET.I - .INB /A2OSX.BUILD/INC/NET.W5100.I + .INB /A2OSX.BUILD/INC/NIC.I + .INB /A2OSX.BUILD/INC/NIC.W5100.I .INB /A2OSX.BUILD/INC/LIBTCPIP.I *-------------------------------------- ZPTmpPTR .EQ ZPDRV @@ -507,8 +505,8 @@ DEVSTAT .DA #0 .BS 1 Subtype .BS 2 Version *-------------------------------------- -FLAGS .DA #S.DSTAT.NET.FLAGS.ARPOFFLOAD+S.DSTAT.NET.FLAGS.IPOFFLOAD -LINK.STATUS .DA #S.DSTAT.NET.STATUS.OK+S.DSTAT.NET.STATUS.FD+S.DSTAT.NET.STATUS.100 +FLAGS .DA #S.DSTAT.NIC.FLAGS.ARPOFFLOAD+S.DSTAT.NIC.FLAGS.IPOFFLOAD +LINK.STATUS .DA #S.DSTAT.NIC.STATUS.OK+S.DSTAT.NIC.STATUS.FD+S.DSTAT.NIC.STATUS.100 MAC .BS 6 MAN SAVE /A2OSX.SRC/DRV/UTHER2.AI.DRV.S diff --git a/DRV/UTHERNET.DRV.S.txt b/DRV/UTHERNET.DRV.S.txt index 247d34d7..55ced03c 100644 --- a/DRV/UTHERNET.DRV.S.txt +++ b/DRV/UTHERNET.DRV.S.txt @@ -1,8 +1,6 @@ -PR#3 +NEW PREFIX /A2OSX.BUILD -LOMEM $A00 -INC 1 -AUTO 6 +AUTO 4,1 .LIST OFF .OP 65C02 .OR $2000 @@ -11,8 +9,8 @@ AUTO 6 .INB /A2OSX.BUILD/INC/MACROS.I .INB /A2OSX.BUILD/INC/A2OSX.I .INB /A2OSX.BUILD/INC/MLI.ERR.I - .INB /A2OSX.BUILD/INC/NET.I - .INB /A2OSX.BUILD/INC/NET.8900A.I + .INB /A2OSX.BUILD/INC/NIC.I + .INB /A2OSX.BUILD/INC/NIC.8900A.I .INB /A2OSX.BUILD/INC/LIBTCPIP.I *-------------------------------------- ZPTmpPTR .EQ ZPDRV @@ -154,7 +152,7 @@ DRV.CS.START .DA STATUS L.DEVSTAT .DA DEVSTAT .DA 0 end or relocation *-------------------------------------- -STATUS lda #S.DSTAT.NET.STATUS.10 +STATUS lda #S.DSTAT.NIC.STATUS.10 sta LINK.STATUS ldx DEVSLOTx0 @@ -170,7 +168,7 @@ STATUS lda #S.DSTAT.NET.STATUS.10 beq .1 lda LINK.STATUS - ora #S.DSTAT.NET.STATUS.OK + ora #S.DSTAT.NIC.STATUS.OK sta LINK.STATUS .1 lda /PP.TestCTL @@ -184,7 +182,7 @@ STATUS lda #S.DSTAT.NET.STATUS.10 beq .2 lda LINK.STATUS - ora #S.DSTAT.NET.STATUS.FD + ora #S.DSTAT.NIC.STATUS.FD sta LINK.STATUS .2 >LDYA L.DEVSTAT diff --git a/DRV/UTHERNET2.DRV.S.txt b/DRV/UTHERNET2.DRV.S.txt index 4cab8999..e2a7cda4 100644 --- a/DRV/UTHERNET2.DRV.S.txt +++ b/DRV/UTHERNET2.DRV.S.txt @@ -1,8 +1,6 @@ -PR#3 +NEW PREFIX /A2OSX.BUILD -LOMEM $A00 -INC 1 -AUTO 6 +AUTO 4,1 .LIST OFF .OP 65C02 .OR $2000 @@ -11,8 +9,8 @@ AUTO 6 .INB /A2OSX.BUILD/INC/MACROS.I .INB /A2OSX.BUILD/INC/A2OSX.I .INB /A2OSX.BUILD/INC/MLI.ERR.I - .INB /A2OSX.BUILD/INC/NET.I - .INB /A2OSX.BUILD/INC/NET.W5100.I + .INB /A2OSX.BUILD/INC/NIC.I + .INB /A2OSX.BUILD/INC/NIC.W5100.I .INB /A2OSX.BUILD/INC/LIBTCPIP.I *-------------------------------------- ZPTmpPTR .EQ ZPDRV @@ -394,7 +392,7 @@ DEVSTAT .DA #0 .BS 2 Version *-------------------------------------- FLAGS .DA #0 -LINK.STATUS .DA #S.DSTAT.NET.STATUS.OK+S.DSTAT.NET.STATUS.FD+S.DSTAT.NET.STATUS.100 +LINK.STATUS .DA #S.DSTAT.NIC.STATUS.OK+S.DSTAT.NIC.STATUS.FD+S.DSTAT.NIC.STATUS.100 MAC .BS 6 MAN SAVE /A2OSX.SRC/DRV/UTHERNET2.DRV.S diff --git a/DRV/X.NET.DRV.S.txt b/DRV/X.NET.DRV.S.txt index d8fcf745..b69da5f3 100644 --- a/DRV/X.NET.DRV.S.txt +++ b/DRV/X.NET.DRV.S.txt @@ -1,8 +1,6 @@ -PR#3 -PREFIX /A2OSX.BUILD NEW -INC 1 -AUTO 6 +PREFIX /A2OSX.BUILD +AUTO 4,1 .LIST OFF *-------------------------------------- DecodeMac lda (ZPTmpPTR) diff --git a/ETC/TCPIP.CONF b/ETC/TCPIP.CONF index 5bb92962..ed35536b 100644 --- a/ETC/TCPIP.CONF +++ b/ETC/TCPIP.CONF @@ -1,8 +1,6 @@ -PR#3 -PREFIX /A2OSX.BOOT NEW -INC 1 -AUTO 6 +PREFIX /A2OSX.BUILD +AUTO 4,1 IP=192.168.1.150 MASK=255.255.255.0 GW=192.168.1.1 diff --git a/FNT2FON.S.txt b/FNT2FON.S.txt index c68e7d6d..eb27a6d1 100644 --- a/FNT2FON.S.txt +++ b/FNT2FON.S.txt @@ -1,12 +1,10 @@ -PR#3 +NEW PREFIX /A2OSX.BUILD -LOMEM $900 -INC 1 -AUTO 6 +AUTO 4,1 .LIST OFF .OP 65C02 .OR $2000 - .TF /A2OSX.BUILD/FNT2FON + .TF /A2OSX.BUILD/ROOT/FNT2FON *-------------------------------------- .INB /A2OSX.BUILD/INC/MACROS.I .INB /A2OSX.BUILD/INC/A2OSX.I diff --git a/INC/COM.6551.I.txt b/INC/COM.6551.I.txt index 46576a93..3c92515d 100644 --- a/INC/COM.6551.I.txt +++ b/INC/COM.6551.I.txt @@ -39,7 +39,6 @@ SSC.CTL.8D .EQ %00000000 SSC.CTL.7D .EQ %00100000 SSC.CTL.6D .EQ %01000000 SSC.CTL.5D .EQ %01100000 -SSC.CTL.CLKEXT .EQ %00000000 SSC.CTL.CLKINT .EQ %00010000 SSC.CTL.B16EXT .EQ %00000000 SSC.CTL.B50 .EQ %00000001 diff --git a/INC/IO.I.txt b/INC/IO.I.txt index a6c27540..61851862 100644 --- a/INC/IO.I.txt +++ b/INC/IO.I.txt @@ -44,7 +44,7 @@ RD80DISP .EQ $C01F R SPEAKER .EQ $C030 W, toggle speaker diaphragm *STROBE .EQ $C040 R, generate .5 uS low pulse @ Game pin 5 -EMUBYTE .EQ $C04F WRR, Write once then Read EMUL, Read Version +*EMUBYTE .EQ $C04F WRR, Write once then Read EMUL, Read Version CLRTEXT .EQ $C050 W SETTEXT .EQ $C051 W @@ -84,12 +84,12 @@ SETIOUDIS .EQ $C07E W, enable DHIRES & disable $C058-5F RDIOUDIS .EQ $C07E R, bit 7 = IOUDIS status CLRIOUDIS .EQ $C07F W, disable DHIRES & enable $C058-5F *-------------------------------------- -RRAMBNK2 .EQ $C080 R -RROMWRAMBNK2 .EQ $C081 RR +*RRAMBNK2 .EQ $C080 R +*RROMWRAMBNK2 .EQ $C081 RR RROMBNK2 .EQ $C082 R RRAMWRAMBNK2 .EQ $C083 RR -RRAMBNK1 .EQ $C088 R -RROMWRAMBNK1 .EQ $C089 RR +*RRAMBNK1 .EQ $C088 R +*RROMWRAMBNK1 .EQ $C089 RR RROMBNK1 .EQ $C08A R RRAMWRAMBNK1 .EQ $C08B RR *-------------------------------------- diff --git a/INC/KERNEL.I.txt b/INC/KERNEL.I.txt index b4ca5773..fbea6afa 100644 --- a/INC/KERNEL.I.txt +++ b/INC/KERNEL.I.txt @@ -1,8 +1,6 @@ -PR#3 +NEW PREFIX /A2OSX.BUILD -LOMEM $A00 -INC 1 -AUTO 6 +AUTO 4,1 .LIST OFF *-------------------------------------- * KERNEL CONSTANTS DEFINITON diff --git a/INC/LIBGUI.I.txt b/INC/LIBGUI.I.txt index 095084ef..14df103b 100644 --- a/INC/LIBGUI.I.txt +++ b/INC/LIBGUI.I.txt @@ -28,50 +28,6 @@ S.GC.Y2 .EQ 10 * S.GC .EQ 12 *-------------------------------------- -S.CB.CMD .EQ 0 -S.CB.CMD.SETPIXEL .EQ 0 -S.CB.CMD.GETPIXEL .EQ 2 -S.CB.CMD.HLINE .EQ 4 -S.CB.CMD.VLINE .EQ 6 -S.CB.CMD.FILLRECT .EQ 8 -S.CB.CMD.BITBLT .EQ 10 -S.CB.CMD.GETRECTBUFSIZE .EQ 12 -S.CB.CMD.DRAWLINE .EQ 14 -S.CB.CMD.DRAWTEXT .EQ 16 -S.CB.OP .EQ 1 -S.CB.OP.XOR .EQ 0 screen EOR bitmap -> Screen -S.CB.OP.SET .EQ 2 replace screen with bitmap -S.CB.OP.ORA .EQ 4 combine screen & bitmap -> Screen -S.CB.OP.MASK .EQ %00001000 Apply BitMap mask before painting -S.CB.OP.SAVE .EQ %00010000 Save Screen to DstPtr before painting -S.CB.OP.RESTORE .EQ %00100000 Restore Screen From DstPtr -S.CB.OP.COLOR .EQ %01000000 Assume BitMap is COLOR - -S.CB.OP.F.BOLD .EQ %00010000 -S.CB.OP.F.ITALIC .EQ %00100000 -S.CB.OP.F.UNDERLINE .EQ %01000000 -S.CB.OP.F.GRAYED .EQ %10000000 -S.CB.MODE .EQ 2 -S.CB.MODE.MONO .EQ %00000001 b/w (1 bit/pixel) -*S.CB.MODE.C4 .EQ %00000010 -*S.CB.MODE.C8 .EQ %00000100 -S.CB.MODE.C16 .EQ %00001000 16 colors (4 bits/pixel) -*S.CB.MODE.C256 .EQ %00010000 256 colors (8 bits/pixel) -S.CB.COLOR .EQ 3 xPIXEL,xLINE,FILLRECT,BITBLT -S.CB.hFONT .EQ 3 DRAWTEXT -S.CB.X1 .EQ 4 xPIXEL,xLINE,FILLRECT,BITBLT,GETRECTBUFSIZE,DRAWLINE -S.CB.Y1 .EQ 6 xPIXEL,xLINE,FILLRECT,BITBLT,GETRECTBUFSIZE,DRAWLINE -S.CB.X2 .EQ 8 VLINE,FILLRECT,DRAWLINE -S.CB.Y2 .EQ 10 HLINE,FILLRECT,DRAWLINE -S.CB.SrcW .EQ 8 BITBLT,GETRECTBUFSIZE -S.CB.SrcH .EQ 10 BITBLT,GETRECTBUFSIZE -S.CB.DstX .EQ 12 BITBLT,DRAWTEXT -S.CB.DstY .EQ 14 BITBLT,DRAWTEXT -S.CB.SrcPtr .EQ 16 BITBLT,DRAWTEXT -S.CB.DstPtr .EQ 18 BITBLT -* -S.CB .EQ 20 -*-------------------------------------- CUR.T.ARROW .EQ 0 CUR.T.RESIZEX .EQ 2 CUR.T.RESIZEY .EQ 4 @@ -81,29 +37,6 @@ CUR.T.CROSS .EQ 10 CUT.T.TEXT .EQ 12 CUR.T.WAIT .EQ 14 *-------------------------------------- -S.BM.F .EQ 0 -S.BM.F.BBP1 .EQ %00000001 -S.BM.F.BBP2 .EQ %00000010 -S.BM.F.BBP4 .EQ %00000100 -S.BM.F.BBP8 .EQ %00001000 -S.BM.RowBytes .EQ 1 -S.BM.W .EQ 2 -S.BM.H .EQ 4 -S.BM.MASK.OFS .EQ 6 -* -S.BM .EQ 8 -*-------------------------------------- -S.FON.F .EQ 0 -S.FON.Ascent .EQ 1 -S.FON.PixW .EQ 2 if 0, variable W -S.FON.PixH .EQ 3 -S.FON.First .EQ 4 -S.FON.Last .EQ 5 -S.FON.Default .EQ 6 -S.FON.Break .EQ 7 -* -S.FON .EQ 8 -*-------------------------------------- S.MOUSE.X1 .EQ 0 S.MOUSE.Y1 .EQ 2 S.MOUSE.X2 .EQ 4 diff --git a/LIB/LIBBLKDEV.S.txt b/LIB/LIBBLKDEV.S.txt index fc96cf32..945da36b 100644 --- a/LIB/LIBBLKDEV.S.txt +++ b/LIB/LIBBLKDEV.S.txt @@ -1,8 +1,6 @@ -PR#3 -PREFIX /A2OSX.BUILD NEW -INC 1 -AUTO 6 +PREFIX /A2OSX.BUILD +AUTO 4,1 .LIST OFF .OP 65C02 .OR $2000 diff --git a/LIB/LIBCRYPT.S.txt b/LIB/LIBCRYPT.S.txt index b6d2aa8d..e84f0845 100644 --- a/LIB/LIBCRYPT.S.txt +++ b/LIB/LIBCRYPT.S.txt @@ -1,8 +1,6 @@ -PR#3 -PREFIX /A2OSX.BUILD NEW -INC 1 -AUTO 6 +PREFIX /A2OSX.BUILD +AUTO 4,1 .LIST OFF .OP 65C02 .OR $2000 diff --git a/LIB/LIBGUI.G.CUR.txt b/LIB/LIBGUI.G.CUR.txt index 7d7b74c4..4987d7b9 100644 --- a/LIB/LIBGUI.G.CUR.txt +++ b/LIB/LIBGUI.G.CUR.txt @@ -1,8 +1,6 @@ -PR#3 -PREFIX /A2OSX.BUILD NEW -INC 1 -AUTO 6 +PREFIX /A2OSX.BUILD +AUTO 4,1 .LIST OFF *-------------------------------------- CUR.T .BS 1 @@ -25,7 +23,7 @@ CUR.HotPoints .DA #0,#0 CUR.T.ARROW *-------------------------------------- CUR.CB .DA #S.CB.CMD.BITBLT .BS 1 - .DA #S.CB.MODE.MONO + .DA #S.CB.M.MONO .DA #0 .BS S.CB-4 *-------------------------------------- diff --git a/LIB/LIBGUI.S.txt b/LIB/LIBGUI.S.txt index f2772606..e81b5752 100644 --- a/LIB/LIBGUI.S.txt +++ b/LIB/LIBGUI.S.txt @@ -1,8 +1,6 @@ -PR#3 -PREFIX /A2OSX.BUILD NEW -INC 1 -AUTO 6 +PREFIX /A2OSX.BUILD +AUTO 4,1 .LIST OFF .OP 65C02 .OR $2000 @@ -10,6 +8,7 @@ AUTO 6 *-------------------------------------- .INB /A2OSX.BUILD/INC/MACROS.I .INB /A2OSX.BUILD/INC/A2OSX.I + .INB /A2OSX.BUILD/INC/GUI.I .INB /A2OSX.BUILD/INC/LIBGUI.I .INB /A2OSX.BUILD/INC/GFX.I *-------------------------------------- diff --git a/LIB/LIBPAK.S.txt b/LIB/LIBPAK.S.txt index e5fee811..a2248db9 100644 --- a/LIB/LIBPAK.S.txt +++ b/LIB/LIBPAK.S.txt @@ -1,8 +1,6 @@ -PR#3 -PREFIX /A2OSX.BUILD NEW -INC 1 -AUTO 6 +PREFIX /A2OSX.BUILD +AUTO 4,1 .LIST OFF .OP 65C02 .OR $2000 diff --git a/LIB/LIBTCPIP.S.ARP.txt b/LIB/LIBTCPIP.S.ARP.txt index 7d6514b1..199d40ec 100644 --- a/LIB/LIBTCPIP.S.ARP.txt +++ b/LIB/LIBTCPIP.S.ARP.txt @@ -1,8 +1,6 @@ -PR#3 +NEW PREFIX /A2OSX.BUILD -LOMEM $A00 -INC 1 -AUTO 6 +AUTO 4,1 .LIST OFF */-------------------------------------- * # ARP.Clear diff --git a/LIB/LIBTCPIP.S.CFG.txt b/LIB/LIBTCPIP.S.CFG.txt index c166080c..4ca1eebc 100644 --- a/LIB/LIBTCPIP.S.CFG.txt +++ b/LIB/LIBTCPIP.S.CFG.txt @@ -1,8 +1,6 @@ -PR#3 +NEW PREFIX /A2OSX.BUILD -LOMEM $A00 -INC 1 -AUTO 6 +AUTO 4,1 .LIST OFF *-------------------------------------- * PULLW = PTR to S.IPCFG @@ -44,10 +42,10 @@ SET.IPCFG >PULLW ZPTmpPtr1 jsr NetDevJmp >STYA ZPTmpPtr2 - ldy #S.DSTAT.NET.FLAGS + ldy #S.DSTAT.NIC.FLAGS lda (ZPTmpPtr2),y sta DevFlags - and #S.DSTAT.NET.FLAGS.ARPOFFLOAD + and #S.DSTAT.NIC.FLAGS.ARPOFFLOAD beq .4 >LDYA ZPTmpPtr1 diff --git a/LIB/LIBTCPIP.S.DNS.txt b/LIB/LIBTCPIP.S.DNS.txt index 8df14232..fcc611af 100644 --- a/LIB/LIBTCPIP.S.DNS.txt +++ b/LIB/LIBTCPIP.S.DNS.txt @@ -1,8 +1,6 @@ -PR#3 +NEW PREFIX /A2OSX.BUILD -LOMEM $900 -INC 1 -AUTO 6 +AUTO 4,1 .LIST OFF */-------------------------------------- * # DNS.Clear diff --git a/LIB/LIBTCPIP.S.FRM.txt b/LIB/LIBTCPIP.S.FRM.txt index 3dd690d7..98bfc130 100644 --- a/LIB/LIBTCPIP.S.FRM.txt +++ b/LIB/LIBTCPIP.S.FRM.txt @@ -1,8 +1,6 @@ -PR#3 +NEW PREFIX /A2OSX.BUILD -LOMEM $A00 -INC 1 -AUTO 6 +AUTO 4,1 .LIST OFF *-------------------------------------- * FRM.New @@ -78,7 +76,7 @@ FRM.NewIP stx .8+1 sta ZPDataOutPtr+1 lda DevFlags - and #S.DSTAT.NET.FLAGS.IPOFFLOAD + and #S.DSTAT.NIC.FLAGS.IPOFFLOAD bne .7 ldy #S.ETH.ETHERTYPE @@ -138,7 +136,7 @@ FRM.SendIP ldx #3 Copy SRC.IP even if IP offload bpl .1 lda DevFlags - and #S.DSTAT.NET.FLAGS.IPOFFLOAD + and #S.DSTAT.NIC.FLAGS.IPOFFLOAD bne .21 ldy #S.IP.TOTAL.LENGTH+1 @@ -219,7 +217,7 @@ FRM.SendIP ldx #3 Copy SRC.IP even if IP offload jsr ICMP.ComputeChecksum .5 lda DevFlags - and #S.DSTAT.NET.FLAGS.ARPOFFLOAD + and #S.DSTAT.NIC.FLAGS.ARPOFFLOAD bne .6 jsr IP.SetDestMAC diff --git a/LIB/LIBTCPIP.S.HST.txt b/LIB/LIBTCPIP.S.HST.txt index 5b5c027f..bf3a97fb 100644 --- a/LIB/LIBTCPIP.S.HST.txt +++ b/LIB/LIBTCPIP.S.HST.txt @@ -1,8 +1,6 @@ -PR#3 +NEW PREFIX /A2OSX.BUILD -LOMEM $A00 -INC 1 -AUTO 6 +AUTO 4,1 .LIST OFF *-------------------------------------- HST.GetByName >PULLW ZPPtrDNS diff --git a/LIB/LIBTCPIP.S.ICMP.txt b/LIB/LIBTCPIP.S.ICMP.txt index 7cc6ea40..9ee9ad06 100644 --- a/LIB/LIBTCPIP.S.ICMP.txt +++ b/LIB/LIBTCPIP.S.ICMP.txt @@ -1,8 +1,6 @@ -PR#3 +NEW PREFIX /A2OSX.BUILD -LOMEM $A00 -INC 1 -AUTO 6 +AUTO 4,1 .LIST OFF *-------------------------------------- ICMP.IN ldy #S.ICMP.TYPE diff --git a/LIB/LIBTCPIP.S.IP.txt b/LIB/LIBTCPIP.S.IP.txt index ae280bbd..1abf6009 100644 --- a/LIB/LIBTCPIP.S.IP.txt +++ b/LIB/LIBTCPIP.S.IP.txt @@ -1,8 +1,6 @@ -PR#3 +NEW PREFIX /A2OSX.BUILD -LOMEM $A00 -INC 1 -AUTO 6 +AUTO 4,1 .LIST OFF *-------------------------------------- IP.IN ldy #S.IP.PROTOCOL diff --git a/LIB/LIBTCPIP.S.SKT.txt b/LIB/LIBTCPIP.S.SKT.txt index cdd91af5..1c21b65d 100644 --- a/LIB/LIBTCPIP.S.SKT.txt +++ b/LIB/LIBTCPIP.S.SKT.txt @@ -1,8 +1,6 @@ -PR#3 +NEW PREFIX /A2OSX.BUILD -LOMEM $900 -INC 1 -AUTO 6 +AUTO 4,1 .LIST OFF */-------------------------------------- * # SKT.New diff --git a/LIB/LIBTCPIP.S.TCP.txt b/LIB/LIBTCPIP.S.TCP.txt index 8993f1bc..e05e023e 100644 --- a/LIB/LIBTCPIP.S.TCP.txt +++ b/LIB/LIBTCPIP.S.TCP.txt @@ -1,8 +1,6 @@ -PR#3 +NEW PREFIX /A2OSX.BUILD -LOMEM $900 -INC 1 -AUTO 6 +AUTO 4,1 .LIST OFF *-------------------------------------- TCP.IN jsr IP.FillSKT.TemplateSrcDst diff --git a/LIB/LIBTCPIP.S.UDP.txt b/LIB/LIBTCPIP.S.UDP.txt index 66769a51..cb14331e 100644 --- a/LIB/LIBTCPIP.S.UDP.txt +++ b/LIB/LIBTCPIP.S.UDP.txt @@ -1,8 +1,6 @@ -PR#3 +NEW PREFIX /A2OSX.BUILD -LOMEM $A00 -INC 1 -AUTO 6 +AUTO 4,1 .LIST OFF *-------------------------------------- UDP.IN jsr IP.FillSKT.TemplateSrcDst diff --git a/LIB/LIBTCPIP.S.txt b/LIB/LIBTCPIP.S.txt index 1abd9cb8..d657d3da 100644 --- a/LIB/LIBTCPIP.S.txt +++ b/LIB/LIBTCPIP.S.txt @@ -1,8 +1,6 @@ -PR#3 +NEW PREFIX /A2OSX.BUILD -LOMEM $A00 -INC 1 -AUTO 6 +AUTO 4,1 .LIST OFF .OP 65C02 .OR $2000 @@ -10,9 +8,8 @@ AUTO 6 *-------------------------------------- .INB /A2OSX.BUILD/INC/MACROS.I .INB /A2OSX.BUILD/INC/A2OSX.I -* .INB /A2OSX.BUILD/INC/MLI.ERR.I -MLI.ERR.IO .EQ $27 - .INB /A2OSX.BUILD/INC/NET.I + .INB /A2OSX.BUILD/INC/MLI.ERR.I + .INB /A2OSX.BUILD/INC/NIC.I .INB /A2OSX.BUILD/INC/LIBTCPIP.I *-------------------------------------- ZPFrameInPtr .EQ ZPLIB diff --git a/README.md b/README.md index ed890a1b..78b2a776 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,7 @@ Kernel 0.9.1 stable enough to resume building. | -------------------------| ---------- | ----------- | ------- | | //c,//c+,IIgs Mouse port | 50/50 Hz | Working | Supported at Kernel level, no conflict with GUI's Mouse.DRV (not required to be loaded), requires setting "Machine Timing" properly in KConfig Utility | | IIe Mouse Card | 50/50 Hz | Working | (same as above) | -| ThunderClock Plus | 64 Hz | In Progress | ...Need to fix this faulty H/W first! | +| ThunderClock Plus | 64 Hz | Working | gave up fixing this faulty H/W, thanx to JACE emulator! | | ... Any suggestion ? | | | | ## !!!HELP NEEDED!!! diff --git a/SBIN/DHCPCLNT.S.txt b/SBIN/DHCPCLNT.S.txt index 68ee3563..951ed028 100644 --- a/SBIN/DHCPCLNT.S.txt +++ b/SBIN/DHCPCLNT.S.txt @@ -1,8 +1,6 @@ -PR#3 +NEW PREFIX /A2OSX.BUILD -LOMEM $A00 -INC 1 -AUTO 6 +AUTO 4,1 .LIST OFF .OP 65C02 .OR $2000 diff --git a/SBIN/GETTY.S.txt b/SBIN/GETTY.S.txt index f9a3607e..1117824f 100644 --- a/SBIN/GETTY.S.txt +++ b/SBIN/GETTY.S.txt @@ -1,8 +1,6 @@ -PR#3 -PREFIX /A2OSX.BUILD NEW -INC 1 -AUTO 6 +PREFIX /A2OSX.BUILD +AUTO 4,1 .LIST OFF .OP 65C02 .OR $2000 diff --git a/SBIN/GUI.S.txt b/SBIN/GUI.S.txt index eff179ae..dfb32213 100644 --- a/SBIN/GUI.S.txt +++ b/SBIN/GUI.S.txt @@ -1,8 +1,6 @@ -PR#3 -PREFIX /A2OSX.BUILD NEW -INC 1 -AUTO 6 +PREFIX /A2OSX.BUILD +AUTO 4,1 .LIST OFF .OP 65C02 .OR $2000 @@ -11,6 +9,7 @@ AUTO 6 .INB /A2OSX.BUILD/INC/IO.I .INB /A2OSX.BUILD/INC/MACROS.I .INB /A2OSX.BUILD/INC/A2OSX.I + .INB /A2OSX.BUILD/INC/GUI.I .INB /A2OSX.BUILD/INC/LIBGUI.I *-------------------------------------- ZPPtr1 .EQ ZPBIN @@ -41,7 +40,7 @@ L.Filename .DA Filename L.MouseData .DA MouseData L.CB.Rect .DA CB.Rect L.BM.Apple .DA BM.Apple -L.CB.BitBlt .DA CB.BitBlt +L.CB.Marylin .DA CB.Marylin L.CB.DrawLine .DA CB.DrawLine L.GC.Clip .DA GC.Clip .DA 0 @@ -72,7 +71,7 @@ CS.INIT >LDYA L.MSG.INIT >SYSCALL LoadStkObj .99 bcs .9 - sta CB.BitBlt+S.CB.SrcPtr + sta CB.Marylin+S.CB.SrcPtr jsr Destop.Paint @@ -121,14 +120,14 @@ CS.RUN lda A2osX.ASCREEN GUI screen active ? >LIBCALL hLIBGUI,LIBGUI.SetCursor.A lda MouseData+S.MOUSE.X1 - sta CB.BitBlt+S.CB.DstX + sta CB.Marylin+S.CB.DstX lda MouseData+S.MOUSE.X1+1 - sta CB.BitBlt+S.CB.DstX+1 + sta CB.Marylin+S.CB.DstX+1 lda MouseData+S.MOUSE.Y1 - sta CB.BitBlt+S.CB.DstY + sta CB.Marylin+S.CB.DstY lda MouseData+S.MOUSE.Y1+1 - sta CB.BitBlt+S.CB.DstY+1 + sta CB.Marylin+S.CB.DstY+1 jsr Destop.Paint @@ -165,7 +164,7 @@ Destop.Paint >LIBCALL hLIBGUI,LIBGUI.HideCursor >PUSHW L.GC.Clip - >PUSHW L.CB.BitBlt + >PUSHW L.CB.Marylin >LIBCALL hLIBGUI,LIBGUI.Draw >LIBCALL hLIBGUI,LIBGUI.ShowCursor @@ -177,7 +176,7 @@ MSG.INIT >CSTR "GUI:Init...\r\n" hLIBGUI .BS 1 hSYSFONT .BS 1 *-------------------------------------- -Filename >CSTR "/A2OSX.BUILD/MARILYN" +Filename >CSTR "/A2OSX.BUILD/ROOT/MARILYN" *-------------------------------------- SYSFONT >CSTR "/A2OSX.BUILD/SBIN/GUI/SYSTEM" *-------------------------------------- @@ -185,7 +184,7 @@ MouseData .BS S.MOUSE *-------------------------------------- CB.Rect .DA #S.CB.CMD.FILLRECT .DA #S.CB.OP.SET - .DA #S.CB.MODE.C16 + .DA #S.CB.M.MONO .DA #1 .DA 0 X1 .DA 0 Y1 @@ -194,24 +193,24 @@ CB.Rect .DA #S.CB.CMD.FILLRECT .DA #S.CB.CMD.FILLRECT .DA #S.CB.OP.SET - .DA #S.CB.MODE.C16 + .DA #S.CB.M.C16 .DA #4 .DA 40 X1 - .DA 40 Y1 + .DA 20 Y1 .DA 519 X2 - .DA 151 Y2 + .DA 171 Y2 *-------------------------------------- CB.Apple .DA #S.CB.CMD.BITBLT .DA #S.CB.OP.SET - .DA #S.CB.MODE.C16 + .DA #S.CB.M.C16 .DA #0 .DA 0 X1 .DA 0 Y1 .DA 16 W .DA 9 H .DA 28 DestX - .DA 170 DestY + .DA 180 DestY .BS 2 SrcPtr .DA 0 @@ -233,16 +232,16 @@ BM.Apple .DA #S.BM.F.BBP4 .HS 1111 Dark blue (4) .HS 1FF1 Dark blue (4) *-------------------------------------- -CB.BitBlt .DA #S.CB.CMD.BITBLT +CB.Marylin .DA #S.CB.CMD.BITBLT .DA #S.CB.OP.SET - .DA #S.CB.MODE.MONO + .DA #S.CB.M.MONO .DA #0 .DA 0 X1 .DA 0 Y1 .DA 141 W .DA 150 H .DA 200 DestX - .DA 60 DestY + .DA 35 DestY .BS 2 SrcPtr .DA 0 @@ -251,7 +250,7 @@ CB.BitBlt .DA #S.CB.CMD.BITBLT CB.DrawLine .DA #0 .DA #S.CB.CMD.DRAWLINE .DA #S.CB.OP.XOR - .DA #S.CB.MODE.MONO + .DA #S.CB.M.MONO .DA #1 .BS 2 X1 .BS 2 Y1 @@ -266,9 +265,9 @@ GC.Clip .DA #0 .DA #0 .DA 40 X1 - .DA 40 Y1 + .DA 20 Y1 .DA 519 X2 - .DA 151 Y2 + .DA 171 Y2 *-------------------------------------- .DUMMY .OR 0 diff --git a/SBIN/GUIOSD.S.txt b/SBIN/GUIOSD.S.txt index bf284eb8..62301c4d 100644 --- a/SBIN/GUIOSD.S.txt +++ b/SBIN/GUIOSD.S.txt @@ -57,416 +57,6 @@ CS.QUIT clc CS.END *-------------------------------------- .PH $0C00 -*-------------------------------------- -ZPCmdPtr .EQ ZPDRV -ZPDstBMPtr .EQ ZPDRV+2 -ZPFontPtr .EQ ZPDRV+4 -ZPCharPtr .EQ ZPDRV+6 -ZPSrcBMPtr .EQ ZPDRV+8 -ZPTmpPtr .EQ ZPDRV+10 -*-------------------------------------- -* YA =Ptr to S.CB in MAIN -* X = DestBM hMem -*-------------------------------------- -GUIOSD >STYA A1L Src Start Address (MAIN) - pha - - tya - clc - adc #S.CB - sta A2L Src End Address (MAIN) - pla - adc /S.CB - sta A2L+1 - - >LDYA CB.Cache - >STYA A4L Dst Address (AUX) - - sec Main To Aux - jsr MoveAux - - txa - beq .1 - - jsr GO.GetMemPtr.A - - >STYA ZPDstBMPtr - - ldx #0 - -.1 lda (ZPDstBMPtr) - sta DstBM.Cache,x - inc ZPDstBMPtr - bne .2 - inc ZPDstBMPtr+1 -.2 inx - cpx #S.BM - bne .1 - - ldx CB.Cache+S.CB.CMD - - jmp (J.Cmds,x) -*-------------------------------------- -J.Cmds .DA SETPIXEL - .DA GETPIXEL - .DA HLINE - .DA VLINE - .DA FILLRECT - .DA BITBLT - .DA GETRECTBUFSIZE -*-------------------------------------- -SETPIXEL >LDYA CB.Cache+S.CB.Y1 - ldx DstBM.Cache+S.BM.RowBytes - jsr YAMultX - - pha - tya - - clc - adc ZPDstBMPtr - sta ZPDstBMPtr - pla - adc ZPDstBMPtr+1 - sta ZPDstBMPtr+1 - - lda CB.Cache+S.CB.MODE - bit #S.CB.MODE.C16 - bne SETPIXEL.C16 - -SETPIXEL.MONO lda CB.Cache+S.CB.X1 - pha - and #$7 MOD 7 - tax - pla - lsr CB.Cache+S.CB.X1 - ror - lsr CB.Cache+S.CB.X1 - ror - lsr CB.Cache+S.CB.X1 - ror - clc - adc ZPDstBMPtr - sta ZPDstBMPtr - - lda CB.Cache+S.CB.X1 - adc ZPDstBMPtr+1 - sta ZPDstBMPtr+1 - - lda CB.Cache+S.CB.OP -* cmp #S.CB.OP.XOR - beq SETPIXEL.MONO.XOR - - lda CB.Cache+S.CB.COLOR - bne SETPIXEL.MONO.WHITE - -SETPIXEL.MONO.BLACK - lda (ZPDstBMPtr) - and Mono.NMasks,x - sta (ZPDstBMPtr) - - rts - -SETPIXEL.MONO.WHITE - lda (ZPDstBMPtr) - ora Mono.Masks,x - sta (ZPDstBMPtr) - - rts - -SETPIXEL.MONO.XOR - lda (ZPDstBMPtr) - eor Mono.Masks,x - sta (ZPDstBMPtr) - - rts -SETPIXEL.C16 -*-------------------------------------- -GETPIXEL -*-------------------------------------- -HLINE -*-------------------------------------- -VLINE -*-------------------------------------- -FILLRECT -*-------------------------------------- -* BitBlt -* S.CB.X1 : SrcX1 in bitmap/mask -* S.CB.Y1 : SrcY1 -* S.CB.SrcW : width -* S.CB.SrcH : height - -* S.CB.DstX : Destination X (screen) -* S.CB.DstY : Destination Y (screen) - -* S.CB.SrcPtr : pointer to S.BM -* S.CB.SrcPtr+1 = 0, hMem in S.CB.SrcPtr -* S.CB.DstPtr : pointer to Save Buffer -*-------------------------------------- -BITBLT >LDYA CB.CACHE+S.CB.SrcPtr - bne BITBLT.1 - - tya - jsr GO.GetMemPtr.A - -BITBLT.1 >STYA ZPSrcBMPtr -*-------------------------------------- -* In: -* S.CB.SrcW -* S.CB.SrcH -* Out: -* S.CB.DstPtr : Buffer Size (in bytes) -*-------------------------------------- -GETRECTBUFSIZE -*-------------------------------------- -* In: -* S.CB.S.CB.FONT : hFont -* S.CB.SrcPtr : Ptr to Text -* S.CB.DstPtr : Buffer Size (in bytes) -* Out: -* A=hBM -*-------------------------------------- -DRAWTEXT lda CB.Cache+S.CB.hFONT - jsr GO.GetMemPtr.A - >STYA ZPFontPtr - - ldy #S.FON-1 - -.1 lda (ZPFontPtr),y - sta FON.Cache,y - dey - bpl .1 - - lda ZPFontPtr - clc - adc #S.FON - sta ZPFontPtr - bcc .2 - inc ZPFontPtr+1 - -.2 >LDYA CB.Cache+S.CB.SrcPtr - >STYA TXTPTR - - lda S.BM.F.BBP1 - sta DstBM.Cache+S.BM.F - - stz DstBM.Cache+S.BM.W - stz DstBM.Cache+S.BM.W+1 - - lda FON.Cache+S.FON.PixH - sta DstBM.Cache+S.BM.H - stz DstBM.Cache+S.BM.H+1 - -.3 jsr TXTPTR.GetNext - beq .4 - - jsr FON.GetChar - lda (ZPCharPtr) Get Char PixelW - sec - adc DstBM.Cache+S.BM.W - sta DstBM.Cache+S.BM.W - bcc .3 - - inc DstBM.Cache+S.BM.W+1 - bra .3 - -.4 jsr BM.Create - bcs .9 - sta .8+1 save hBM, ZPDstBMPtr=BMData - - >LDYA CB.Cache+S.CB.SrcPtr - >STYA TXTPTR - - stz GWORD reset Col index in BM - stz GWORD+1 reset Bit index in Col - -.5 jsr TXTPTR.GetNext - beq .8 - - jsr FON.GetChar - - lda (ZPCharPtr) Char PixW - sta GBYTE - - ldy #1 Char ByteW - lda (ZPCharPtr),y - sta GBYTE2 - - >LDYA ZPDstBMPtr - >STYA ZPTmpPtr - - lda FON.Cache+S.FON.PixH - -.6 pha - - ldx GWORD+1 Get Bit Index for shifting - - ldy #2 - lda (ZPCharPtr),y - - - pla - dec - bne .6 - - - bra .5 - -.8 lda #$ff SELF MODIFIED - clc -.9 rts -*-------------------------------------- -FON.GetChar cmp FON.Cache+S.FON.Last - bcc .1 - bne .2 - -.1 sec - sbc FON.Cache+S.FON.First - bcs .3 - -.2 lda FON.Cache+S.FON.Default - -.3 asl - php - clc - adc ZPFontPtr - sta ZPCharPtr - - adc ZPFontPtr+1 - sta ZPCharPtr+1 - plp - bcc .8 - inc ZPCharPtr+1 -.8 rts -*-------------------------------------- -BM.Create lda DstBM.Cache+S.BM.W - ldx DstBM.Cache+S.BM.W+1 - bit #7 - beq .1 - and #7 - clc - adc #8 - bcc .1 - inx - -.1 sta DstBM.Cache+S.BM.RowBytes - txa - - lsr - ror DstBM.Cache+S.BM.RowBytes - lsr - ror DstBM.Cache+S.BM.RowBytes - lsr - ror DstBM.Cache+S.BM.RowBytes - - >LDYA DstBM.Cache+S.BM.H - ldx DstBM.Cache+S.BM.RowBytes - - jsr YAMultX - - pha - tya - clc - adc #S.BM - tay - pla - adc /S.BM - jsr GO.GetMem.YA - bcs .9 - - >STYA ZPDstBMPtr - - ldy #S.BM-1 - -.2 lda DstBM.Cache,y - sta (ZPDstBMPtr),y - dey - bpl .2 - - lda ZPDstBMPtr -* clc - adc #S.BM - sta ZPDstBMPtr - bcc .8 - - inc ZPDstBMPtr+1 - -.8 txa hBM - - clc -.9 rts -*-------------------------------------- -* to move in LC or ZP/STK -*-------------------------------------- -TXTPTR.GetNext sta CLRREADAUX - lda (TXTPTR) - sta SETREADAUX - beq .9 - inc TXTPTR - bne .9 - inc TXTPTR+1 -.9 rts -*-------------------------------------- -* IN: -* Y,A = num1 (16) -* X = num2 (8) -* OUT: -* Y,A = (Y,A) * X -*-------------------------------------- -YAMultX stx GBYTE - - sty GWORD - sta GWORD+1 - - ldy #0 Result LO - tya Result HI - - bra .3 - -.1 pha - tya - clc - adc GWORD - tay - pla - adc GWORD+1 - -.2 asl GWORD - rol GWORD+1 - -.3 lsr GBYTE - bcs .1 - bne .2 - rts -*-------------------------------------- -GO.GetMem.YA ldx #SYS.GetMem.YA - .HS 2C BIT ABS -GO.GetMemPtr.A ldx #SYS.GetMemPtr.A -GO.Kernel jmp ($E000,x) -*-------------------------------------- -Mono.NMasks .DA #%11111110 - .DA #%11111101 - .DA #%11111011 - .DA #%11110111 - .DA #%11101111 - .DA #%11011111 - .DA #%10111111 - .DA #%01111111 -*-------------------------------------- -Mono.Masks .DA #%00000001 - .DA #%00000010 - .DA #%00000100 - .DA #%00001000 - .DA #%00010000 - .DA #%00100000 - .DA #%01000000 - .DA #%10000000 -*-------------------------------------- -CB.Cache .BS S.CB -FON.Cache .BS S.FON -DstBM.Cache .BS S.BM -GBYTE .BS 1 -GBYTE2 .BS 1 -GWORD .BS 2 *-------------------------------------- .EP GUIOSD.END .EQ * @@ -478,5 +68,5 @@ DS.END .ED *-------------------------------------- MAN -SAVE /A2OSX.SRC/SBIN/GUI/GUIOSD +SAVE /A2OSX.SRC/SBIN/GUIOSD ASM diff --git a/SBIN/SHELL.S.txt b/SBIN/SHELL.S.txt index 9a253bf3..fb2c5a8c 100644 --- a/SBIN/SHELL.S.txt +++ b/SBIN/SHELL.S.txt @@ -1,8 +1,6 @@ -PR#3 +NEW PREFIX /A2OSX.BUILD -LOMEM $A00 -INC 1 -AUTO 6 +AUTO 4,1 .LIST OFF .OP 65C02 .OR $2000 diff --git a/SYS/KERNEL.S.ARG.txt b/SYS/KERNEL.S.ARG.txt index dd17af2f..9f39c73a 100644 --- a/SYS/KERNEL.S.ARG.txt +++ b/SYS/KERNEL.S.ARG.txt @@ -1,8 +1,6 @@ -PR#3 +NEW PREFIX /A2OSX.BUILD -LOMEM $A00 -INC 1 -AUTO 6 +AUTO 4,1 */-------------------------------------- * # GetArg.A * ## In: diff --git a/SYS/KERNEL.S.CORE.txt b/SYS/KERNEL.S.CORE.txt index 75fb198d..b6e5a340 100644 --- a/SYS/KERNEL.S.CORE.txt +++ b/SYS/KERNEL.S.CORE.txt @@ -1,8 +1,6 @@ -PR#3 +NEW PREFIX /A2OSX.BUILD -LOMEM $A00 -INC 1 -AUTO 6 +AUTO 4,1 *-------------------------------------- CORE.Run lda CORE.PSCount sta CORE.Counter @@ -86,7 +84,8 @@ CORE.Run lda CORE.PSCount .7 jsr CORE.PSLeave Save ZP & Ptrs .8 dec CORE.Counter - bne .1 + beq CORE.Events + jmp .1 *-------------------------------------- CORE.Events jsr CORE.GetEvents diff --git a/SYS/KERNEL.S.CTRL.txt b/SYS/KERNEL.S.CTRL.txt index 1320beb4..448cc868 100644 --- a/SYS/KERNEL.S.CTRL.txt +++ b/SYS/KERNEL.S.CTRL.txt @@ -1,19 +1,22 @@ -PR#3 +NEW PREFIX /A2OSX.BUILD -LOMEM $A00 -INC 1 -AUTO 6 +AUTO 4,1 +*-------------------------------------- * CONTROL SECTION : .LIST ON *-------------------------------------- -A2osX.CORE.S .EQ A2osX.GP-A2osX.CORE +A2osX.MAIN.S .EQ A2osX.AUX-A2osX.MAIN +A2osX.AUX.S .EQ A2osX.GP-A2osX.AUX A2osX.GP.S .EQ A2osX.D1-A2osX.GP A2osX.D1.S .EQ A2osX.D2-A2osX.D1 A2osX.D2.S .EQ A2osX.E0-A2osX.D2 A2osX.E0.S .EQ A2osX.E0.E-A2osX.E0 *-------------------------------------- - .DO A2osX.CORE.S>$700 -* ERROR:CORE too big + .DO A2osX.MAIN.S>$700 +* ERROR:MAIN too big + .FIN + .DO A2osX.AUX.S>$C00 +* ERROR:AUX too big .FIN .DO A2osX.D1.S>$1000 * ERROR:BNK1 too big diff --git a/SYS/KERNEL.S.D01.txt b/SYS/KERNEL.S.D01.txt index e58ae789..54bcec5c 100644 --- a/SYS/KERNEL.S.D01.txt +++ b/SYS/KERNEL.S.D01.txt @@ -1,8 +1,6 @@ -PR#3 +NEW PREFIX /A2OSX.BUILD -LOMEM $A00 -INC 1 -AUTO 6 +AUTO 4,1 *-------------------------------------- * A2osX.DIIDrv * X = DEVMGR.cmd diff --git a/SYS/KERNEL.S.DEV.txt b/SYS/KERNEL.S.DEV.txt index 7f73f282..401728e6 100644 --- a/SYS/KERNEL.S.DEV.txt +++ b/SYS/KERNEL.S.DEV.txt @@ -1,8 +1,6 @@ -PR#3 +NEW PREFIX /A2OSX.BUILD -LOMEM $A00 -INC 1 -AUTO 6 +AUTO 4,1 */-------------------------------------- * # GetDevByID.A * ## IN: diff --git a/SYS/KERNEL.S.DIRENT.txt b/SYS/KERNEL.S.DIRENT.txt index d1925102..31ecc230 100644 --- a/SYS/KERNEL.S.DIRENT.txt +++ b/SYS/KERNEL.S.DIRENT.txt @@ -1,8 +1,6 @@ -PR#3 +NEW PREFIX /A2OSX.BUILD -LOMEM $A00 -INC 1 -AUTO 6 +AUTO 4,1 */-------------------------------------- * # OpenDir.YA * ## In: diff --git a/SYS/KERNEL.S.ENV.txt b/SYS/KERNEL.S.ENV.txt index 514fb301..f29235f5 100644 --- a/SYS/KERNEL.S.ENV.txt +++ b/SYS/KERNEL.S.ENV.txt @@ -1,8 +1,6 @@ -PR#3 +NEW PREFIX /A2OSX.BUILD -LOMEM $A00 -INC 1 -AUTO 6 +AUTO 4,1 */-------------------------------------- * # ExpandStr.YA * ## In: diff --git a/SYS/KERNEL.S.FIO.txt b/SYS/KERNEL.S.FIO.txt index b6e2ed9c..6c7a2e69 100644 --- a/SYS/KERNEL.S.FIO.txt +++ b/SYS/KERNEL.S.FIO.txt @@ -1,8 +1,6 @@ -PR#3 +NEW PREFIX /A2OSX.BUILD -LOMEM $A00 -INC 1 -AUTO 6 +AUTO 4,1 */-------------------------------------- * # LoadTxtFile.YA * Load TXT a file in memory (with ending 0) diff --git a/SYS/KERNEL.S.GP.txt b/SYS/KERNEL.S.GP.txt index 56a3d573..ae7bfc1e 100644 --- a/SYS/KERNEL.S.GP.txt +++ b/SYS/KERNEL.S.GP.txt @@ -1,8 +1,6 @@ -PR#3 +NEW PREFIX /A2OSX.BUILD -LOMEM $A00 -INC 1 -AUTO 6 +AUTO 4,1 *-------------------------------------- * SYSCALL (AUXLC to AUXLC) * Used by user & kernel for inter bank Calls diff --git a/SYS/KERNEL.S.INIT.txt b/SYS/KERNEL.S.INIT.txt index d30aa788..26e8c1e8 100644 --- a/SYS/KERNEL.S.INIT.txt +++ b/SYS/KERNEL.S.INIT.txt @@ -1,10 +1,6 @@ -PR#3 +NEW PREFIX /A2OSX.BUILD -LOMEM $A00 -INC 1 -AUTO 6 -*-------------------------------------- -* Kernel ZP Aux +AUTO 4,1 *-------------------------------------- ZPPtr1 .EQ ZPKERNEL ZPPtr2 .EQ ZPKERNEL+2 @@ -26,17 +22,31 @@ Kernel.Init sei Kernel.Init2 >LDAXI MSG.Init2 jsr PrintFAX - >LDAXI MSG.CORE + >LDAXI MSG.MAIN jsr PrintFAX - >LDYAI A2osX.CORE + >LDYAI A2osX.MAIN >STYA ZPPtr1 >LDYAI CORE.Run >STYA ZPPtr2 - >LDYAI A2osX.CORE.S^$FFFF + >LDYAI A2osX.MAIN.S^$FFFF >STYA ZPPtr3 jsr Kernel.Move + >LDAXI MSG.AUX + jsr PrintFAX + + >LDYAI A2osX.AUX + >STYA A1L Src Start Address (MAIN) + >LDYAI A2osX.GP + >STYA A2L Src End Address (MAIN) + + >LDYAI X.GUIOSD + >STYA A4L Dst Address (AUX) + + sec Main To Aux + jsr AuxMove + >LDAXI MSG.GP jsr PrintFAX @@ -1033,7 +1043,8 @@ TskMgrInit >LDYAI MSG.TSK .9 rts *-------------------------------------- MSG.Init2 >CSTR "A2osX[Stage2]:Init\nInstalling KERNEL...\n" -MSG.CORE >CSTR " - $1100 Core...\n" +MSG.MAIN >CSTR " - $1100 Main...\n" +MSG.AUX >CSTR " - $0C00 Aux...\n" MSG.GP >CSTR " - $BD00 Global Page...\n" MSG.D1 >CSTR " - $D000 Bank1...\n" MSG.D2 >CSTR " - $D000 Bank2...\n" diff --git a/SYS/KERNEL.S.IRQ.txt b/SYS/KERNEL.S.IRQ.txt index ee166092..e7b88742 100644 --- a/SYS/KERNEL.S.IRQ.txt +++ b/SYS/KERNEL.S.IRQ.txt @@ -1,8 +1,6 @@ -PR#3 +NEW PREFIX /A2OSX.BUILD -LOMEM $A00 -INC 1 -AUTO 6 +AUTO 4,1 *-------------------------------------- * called directly by IRQ Vector $FFFE in AuxLC * Must keep: diff --git a/SYS/KERNEL.S.JMP.txt b/SYS/KERNEL.S.JMP.txt index 60e5e965..18af6e2e 100644 --- a/SYS/KERNEL.S.JMP.txt +++ b/SYS/KERNEL.S.JMP.txt @@ -1,8 +1,6 @@ -PR#3 +NEW PREFIX /A2OSX.BUILD -LOMEM $A00 -INC 1 -AUTO 6 +AUTO 4,1 *-------------------------------------- * $E000-E0FF K.SYSCALL.JMP Jmp Table *-------------------------------------- diff --git a/SYS/KERNEL.S.MATH.txt b/SYS/KERNEL.S.MATH.txt index f1bc2694..e259f001 100644 --- a/SYS/KERNEL.S.MATH.txt +++ b/SYS/KERNEL.S.MATH.txt @@ -1,8 +1,6 @@ -PR#3 +NEW PREFIX /A2OSX.BUILD -LOMEM $A00 -INC 1 -AUTO 6 +AUTO 4,1 */-------------------------------------- * # FAdd,FSub,FMult,FDiv,FPwr * Return X+Y, X-Y, X*Y, X/Y, X^Y diff --git a/SYS/KERNEL.S.MEM.txt b/SYS/KERNEL.S.MEM.txt index c0aa2cb4..1047df16 100644 --- a/SYS/KERNEL.S.MEM.txt +++ b/SYS/KERNEL.S.MEM.txt @@ -1,10 +1,6 @@ -PR#3 +NEW PREFIX /A2OSX.BUILD -LOMEM $A00 -INC 1 -AUTO 6 -*-------------------------------------- -* !!!!!! DO NOT USE ZPPtrs !!!!! +AUTO 4,1 *-------------------------------------- ZPMemMgrSPtr .EQ ZPMEMMGR Pointer To Slot selected ZPMemMgrTmp1 .EQ ZPMEMMGR+2 diff --git a/SYS/KERNEL.S.PFT.txt b/SYS/KERNEL.S.PFT.txt index 8c33dc84..87c8b1e8 100644 --- a/SYS/KERNEL.S.PFT.txt +++ b/SYS/KERNEL.S.PFT.txt @@ -1,8 +1,6 @@ -PR#3 +NEW PREFIX /A2OSX.BUILD -LOMEM $A00 -INC 1 -AUTO 6 +AUTO 4,1 *-------------------------------------- * K.PFTAdd * In : diff --git a/SYS/KERNEL.S.PS.txt b/SYS/KERNEL.S.PS.txt index 5242025d..29f94376 100644 --- a/SYS/KERNEL.S.PS.txt +++ b/SYS/KERNEL.S.PS.txt @@ -1,8 +1,6 @@ -PR#3 +NEW PREFIX /A2OSX.BUILD -LOMEM $A00 -INC 1 -AUTO 6 +AUTO 4,1 */-------------------------------------- * # ExecPSNewEnv.YA * # ExecPS.YA (Blocking Parent PID) diff --git a/SYS/KERNEL.S.STAT.txt b/SYS/KERNEL.S.STAT.txt index 9e7b10ae..97b90293 100644 --- a/SYS/KERNEL.S.STAT.txt +++ b/SYS/KERNEL.S.STAT.txt @@ -1,8 +1,6 @@ -PR#3 +NEW PREFIX /A2OSX.BUILD -LOMEM $A00 -INC 1 -AUTO 6 +AUTO 4,1 *-------------------------------------- * # FStat * Return information about a hfile diff --git a/SYS/KERNEL.S.STDIO.txt b/SYS/KERNEL.S.STDIO.txt index 10040da2..b8feac2b 100644 --- a/SYS/KERNEL.S.STDIO.txt +++ b/SYS/KERNEL.S.STDIO.txt @@ -1,8 +1,6 @@ -PR#3 +NEW PREFIX /A2OSX.BUILD -LOMEM $A00 -INC 1 -AUTO 6 +AUTO 4,1 */-------------------------------------- * # FPutC.AY * Print A (char) to Node diff --git a/SYS/KERNEL.S.STDLIB.txt b/SYS/KERNEL.S.STDLIB.txt index fd16320b..e6650280 100644 --- a/SYS/KERNEL.S.STDLIB.txt +++ b/SYS/KERNEL.S.STDLIB.txt @@ -1,8 +1,6 @@ -PR#3 +NEW PREFIX /A2OSX.BUILD -LOMEM $A00 -INC 1 -AUTO 6 +AUTO 4,1 */-------------------------------------- * # StrToF * Convert String to 40 bits Float diff --git a/SYS/KERNEL.S.STRING.txt b/SYS/KERNEL.S.STRING.txt index 011c8315..7a2c4186 100644 --- a/SYS/KERNEL.S.STRING.txt +++ b/SYS/KERNEL.S.STRING.txt @@ -1,8 +1,6 @@ -PR#3 +NEW PREFIX /A2OSX.BUILD -LOMEM $A00 -INC 1 -AUTO 6 +AUTO 4,1 */-------------------------------------- * # StrLen.YA * Returns Length of C-String diff --git a/SYS/KERNEL.S.TIME.txt b/SYS/KERNEL.S.TIME.txt index c5057f3b..88d8147f 100644 --- a/SYS/KERNEL.S.TIME.txt +++ b/SYS/KERNEL.S.TIME.txt @@ -1,8 +1,6 @@ -PR#3 +NEW PREFIX /A2OSX.BUILD -LOMEM $A00 -INC 1 -AUTO 6 +AUTO 4,1 *-------------------------------------- * https://www.cise.ufl.edu/~cop4600/cgi-bin/lxr/http/source.cgi/lib/ansi/gmtime.c *-------------------------------------- diff --git a/SYS/KERNEL.S.txt b/SYS/KERNEL.S.txt index 3fdde415..c3d1a2e0 100644 --- a/SYS/KERNEL.S.txt +++ b/SYS/KERNEL.S.txt @@ -1,8 +1,6 @@ -PR#3 +NEW PREFIX /A2OSX.BUILD -LOMEM $A00 -INC 1 -AUTO 6 +AUTO 4,1 .LIST OFF .OP 65C02 .OR $2000 @@ -14,13 +12,17 @@ AUTO 6 .INB INC/IO.I .INB INC/PRODOS.I .INB INC/MLI.ERR.I - + .INB INC/GUI.I + .INB /A2OSX.SRC/SYS/KERNEL.S.INIT .INB /A2OSX.SRC/X.PRINTF.S -A2osX.CORE .PH $1100 +A2osX.MAIN .PH $1100 .INB /A2OSX.SRC/SYS/KERNEL.S.CORE .INB /A2OSX.SRC/SYS/KERNEL.S.D01 .EP +A2osX.AUX .PH $0C00 + .INB /A2OSX.SRC/SYS/KERNEL.S.OSD + .EP A2osX.GP .PH $BD00 .INB /A2OSX.SRC/SYS/KERNEL.S.GP .EP @@ -48,9 +50,7 @@ A2osX.E0 .PH $E000 .INB /A2OSX.SRC/SYS/KERNEL.S.JMP .INB /A2OSX.SRC/SYS/KERNEL.S.IRQ .INB /A2OSX.SRC/SYS/KERNEL.S.MEM - .LIST ON DevMgr.FreeMem .EQ * - .LIST OFF .EP A2osX.E0.E .EQ * .INB /A2OSX.SRC/SYS/KERNEL.S.CTRL diff --git a/SYS/KM.VSDRIVE.S.txt b/SYS/KM.VSDRIVE.S.txt index 01cb6f86..6d59e931 100644 --- a/SYS/KM.VSDRIVE.S.txt +++ b/SYS/KM.VSDRIVE.S.txt @@ -121,7 +121,7 @@ SSC.Detect stz TmpPtr1 jsr VSDRIVE.Wait - lda #SSC.CTL.CLKEXT+SSC.CTL.B115200+SSC.CTL.8D+SSC.CTL.1S+SSC.CMD.NOP + lda #SSC.CTL.CLKINT+SSC.CTL.B115200+SSC.CTL.8D+SSC.CTL.1S+SSC.CMD.NOP sta SSC.CTL,x jsr VSDRIVE.Wait diff --git a/X.FNT.I.txt b/X.FNT.I.txt index de74603e..de474893 100644 --- a/X.FNT.I.txt +++ b/X.FNT.I.txt @@ -46,4 +46,4 @@ S.FNT.dfReserved13 .EQ 132 S.FNT.dfCharTable3 .EQ 148 *-------------------------------------- MAN -SAVE /A2OSX.BUILD/X.FNT.I +SAVE /A2OSX.BUILD/ROOT/X.FNT.I diff --git a/X.TWIST.G..txt b/X.TWIST.G..txt index 53f3180a..d9c9fca4 100644 --- a/X.TWIST.G..txt +++ b/X.TWIST.G..txt @@ -1,8 +1,6 @@ -PR#3 -PREFIX /A2OSX.BUILD NEW -INC 1 -AUTO 6 +PREFIX /A2OSX.BUILD +AUTO 4,1 .LIST OFF *-------------------------------------- TWIST .DA #%00000000,#%10000000,#%01000000,#%11000000,#%00100000,#%10100000,#%01100000,#%11100000 @@ -39,4 +37,4 @@ TWIST .DA #%00000000,#%10000000,#%01000000,#%11000000,#%00100000,#%10100000,#% .DA #%00011111,#%10011111,#%01011111,#%11011111,#%00111111,#%10111111,#%01111111,#%11111111 *-------------------------------------- MAN -SAVE /A2OSX.BUILD/X.TWIST.G +SAVE /A2OSX.BUILD/ROOT/X.TWIST.G