diff --git a/.Floppies/A2OSX.BUILD.po b/.Floppies/A2OSX.BUILD.po index 22f69fa6..4ef92598 100644 Binary files a/.Floppies/A2OSX.BUILD.po and b/.Floppies/A2OSX.BUILD.po differ diff --git a/BIN/ATLOGON.S.txt b/BIN/ATLOGON.S.txt index c24e4f27..5f276c5f 100644 --- a/BIN/ATLOGON.S.txt +++ b/BIN/ATLOGON.S.txt @@ -118,7 +118,7 @@ CS.RUN.ATCHECK lda #AT.GetInfo pha >LDYA L.MSG.NOATK - >SYSCALL puts + >SYSCALL PutS pla sec .9 rts @@ -139,7 +139,7 @@ CS.RUN.GOATLK >STYA ZPAtlkParams >PUSHA >PUSHBI 2 - >SYSCALL printf + >SYSCALL PrintF pla sec diff --git a/BIN/ATTR.S.txt b/BIN/ATTR.S.txt index 4ed2a4d0..fbf64ca7 100644 --- a/BIN/ATTR.S.txt +++ b/BIN/ATTR.S.txt @@ -405,7 +405,7 @@ CS.QUIT jsr LeaveSubDir .8 clc rts *-------------------------------------- - .INB usr/src/bin/x.fileenum.s + .INB usr/src/shared/x.fileenum.s *-------------------------------------- CS.END *-------------------------------------- @@ -445,10 +445,9 @@ hSrcFullPath .BS 1 ATTR .BS 17 - .INB usr/src/bin/x.fileenum.g + .INB usr/src/shared/x.fileenum.g -DS.END - .ED +DS.END .ED *-------------------------------------- MAN SAVE usr/src/bin/attr.s diff --git a/BIN/CHGRP.S.txt b/BIN/CHGRP.S.txt index c0f973f3..83258bc8 100644 --- a/BIN/CHGRP.S.txt +++ b/BIN/CHGRP.S.txt @@ -209,7 +209,7 @@ CS.RUN.DIR lda (ZPFileName) >PUSHW ZPFullPath >PUSHBI 255 >PUSHB.G GID - >SYSCALL chown + >SYSCALL ChOwn jsr CS.RUN.CheckErr bcs .9 @@ -279,7 +279,7 @@ CS.QUIT jsr LeaveSubDir .8 clc rts *-------------------------------------- - .INB usr/src/bin/x.fileenum.s + .INB usr/src/shared/x.fileenum.s *-------------------------------------- CS.END *-------------------------------------- @@ -306,10 +306,9 @@ GID .BS 1 STATBUF .BS S.STAT hSrcFullPath .BS 1 - .INB usr/src/bin/x.fileenum.g + .INB usr/src/shared/x.fileenum.g -DS.END - .ED +DS.END .ED *-------------------------------------- MAN SAVE usr/src/bin/chgrp.s diff --git a/BIN/CHMOD.S.txt b/BIN/CHMOD.S.txt index 68e52f22..a64316fb 100644 --- a/BIN/CHMOD.S.txt +++ b/BIN/CHMOD.S.txt @@ -320,7 +320,7 @@ CS.QUIT jsr LeaveSubDir .8 clc rts *-------------------------------------- - .INB usr/src/bin/x.fileenum.s + .INB usr/src/shared/x.fileenum.s *-------------------------------------- CS.END *-------------------------------------- @@ -344,10 +344,9 @@ bRecurse .BS 1 bPause .BS 1 hSrcFullPath .BS 1 - .INB usr/src/bin/x.fileenum.g + .INB usr/src/shared/x.fileenum.g -DS.END - .ED +DS.END .ED *-------------------------------------- MAN SAVE usr/src/bin/chmod.s diff --git a/BIN/CHOWN.S.txt b/BIN/CHOWN.S.txt index 04775254..24e67ae5 100644 --- a/BIN/CHOWN.S.txt +++ b/BIN/CHOWN.S.txt @@ -281,7 +281,7 @@ CS.QUIT jsr LeaveSubDir .8 clc rts *-------------------------------------- - .INB usr/src/bin/x.fileenum.s + .INB usr/src/shared/x.fileenum.s *-------------------------------------- CS.END *-------------------------------------- @@ -308,7 +308,7 @@ UID .BS 1 STATBUF .BS S.STAT hSrcFullPath .BS 1 - .INB usr/src/bin/x.fileenum.g + .INB usr/src/shared/x.fileenum.g DS.END .ED diff --git a/BIN/CHTYP.S.txt b/BIN/CHTYP.S.txt index e81112e3..246d45c8 100644 --- a/BIN/CHTYP.S.txt +++ b/BIN/CHTYP.S.txt @@ -346,7 +346,7 @@ IsDigit16 cmp #'0' .9 sec rts *-------------------------------------- - .INB usr/src/bin/x.fileenum.s + .INB usr/src/shared/x.fileenum.s *-------------------------------------- CS.END *-------------------------------------- @@ -381,8 +381,7 @@ bContinue .BS 1 bRecurse .BS 1 HexFileType .BS 1 - .INB usr/src/bin/x.fileenum.g - + .INB usr/src/shared/x.fileenum.g DS.END .ED *-------------------------------------- MAN diff --git a/BIN/CP.S.txt b/BIN/CP.S.txt index 5321094d..dc528ece 100644 --- a/BIN/CP.S.txt +++ b/BIN/CP.S.txt @@ -14,8 +14,8 @@ X.ENTER.SUBDIR .EQ 0 X.COPY.TO.DEST .EQ 1 X.DELETE.SOURCE .EQ 0 *-------------------------------------- - .INB usr/src/bin/x.cpmvrm.s - .INB usr/src/bin/x.fileenum.s + .INB usr/src/shared/x.cpmvrm.s + .INB usr/src/shared/x.fileenum.s *-------------------------------------- CS.END *-------------------------------------- @@ -42,10 +42,9 @@ bContinue .BS 1 bRecurse .BS 1 bNoConfirm .BS 1 bQuiet .BS 1 - .INB usr/src/bin/x.cpmvrm.g - .INB usr/src/bin/x.fileenum.g -DS.END - .ED + .INB usr/src/shared/x.cpmvrm.g + .INB usr/src/shared/x.fileenum.g +DS.END .ED *-------------------------------------- MAN SAVE usr/src/bin/cp.s diff --git a/BIN/ETCONFIG.S.txt b/BIN/ETCONFIG.S.txt index a0a9b356..c3b3bd6a 100644 --- a/BIN/ETCONFIG.S.txt +++ b/BIN/ETCONFIG.S.txt @@ -25,7 +25,6 @@ pETKCFG .BS 2 ZPFrameBase .BS 2 ZPFramePtr .BS 2 BufPtr .BS 2 - ZS.END .ED *-------------------------------------- * File Header (16 Bytes) @@ -363,7 +362,7 @@ CFG.EtcFiles >LDYAI 256 >PUSHW L.CFG.DefaultHost >PUSHW A2osX.TIMER16 >PUSHBI 2 - >SYSCALL sprintf + >SYSCALL SPrintF lda #10 sta ETKCFG+S.ETKCFG.OBJECT @@ -452,7 +451,7 @@ CFG.Read.Close2 lda CFG.hCfgFile CFG.Read.GetS >PUSHWI 255 >PUSHW BufPtr lda CFG.hCfgFile - >SYSCALL fgets + >SYSCALL FGetS rts *-------------------------------------- CS.DOEVENT lda (pEvent) diff --git a/BIN/LC.S.txt b/BIN/LC.S.txt index ced80080..267b5288 100644 --- a/BIN/LC.S.txt +++ b/BIN/LC.S.txt @@ -314,7 +314,7 @@ CS.RUN.CheckOpt ldy #1 clc rts *-------------------------------------- - .INB usr/src/bin/x.fileenum.s + .INB usr/src/shared/x.fileenum.s *-------------------------------------- CS.END *-------------------------------------- @@ -340,7 +340,7 @@ hSrcNewPath .BS 1 hFile .BS 1 hMem .BS 1 - .INB usr/src/bin/x.fileenum.g + .INB usr/src/shared/x.fileenum.g DS.END .ED *-------------------------------------- MAN diff --git a/BIN/LS.S.txt b/BIN/LS.S.txt index e3318fb3..06a4ceae 100644 --- a/BIN/LS.S.txt +++ b/BIN/LS.S.txt @@ -747,7 +747,7 @@ Mod2CSTR ldy #S.STAT.MODE+1 >PUSHEA.G MOD rts *-------------------------------------- - .INB usr/src/bin/x.fileenum.s + .INB usr/src/shared/x.fileenum.s *-------------------------------------- CS.END *-------------------------------------- @@ -805,7 +805,7 @@ bRecurse .BS 1 ColCount .BS 1 hPW .BS 1 - .INB usr/src/bin/x.fileenum.g + .INB usr/src/shared/x.fileenum.g DS.END .ED *-------------------------------------- MAN diff --git a/BIN/MV.S.txt b/BIN/MV.S.txt index adcb2697..b4292f73 100644 --- a/BIN/MV.S.txt +++ b/BIN/MV.S.txt @@ -14,8 +14,8 @@ X.ENTER.SUBDIR .EQ 0 X.COPY.TO.DEST .EQ 1 X.DELETE.SOURCE .EQ 1 *-------------------------------------- - .INB usr/src/bin/x.cpmvrm.s - .INB usr/src/bin/x.fileenum.s + .INB usr/src/shared/x.cpmvrm.s + .INB usr/src/shared/x.fileenum.s *-------------------------------------- CS.END *-------------------------------------- @@ -42,10 +42,9 @@ bContinue .BS 1 bRecurse .BS 1 bNoConfirm .BS 1 bQuiet .BS 1 - .INB usr/src/bin/x.cpmvrm.g - .INB usr/src/bin/x.fileenum.g -DS.END - .ED + .INB usr/src/shared/x.cpmvrm.g + .INB usr/src/shared/x.fileenum.g +DS.END .ED *-------------------------------------- MAN SAVE usr/src/bin/mv.s diff --git a/BIN/PAK.S.txt b/BIN/PAK.S.txt index cd61f0cb..0220512a 100644 --- a/BIN/PAK.S.txt +++ b/BIN/PAK.S.txt @@ -639,7 +639,7 @@ CS.RUN.CheckOpt ldy #1 .8 clc rts *-------------------------------------- - .INB usr/src/bin/x.fileenum.s + .INB usr/src/shared/x.fileenum.s *-------------------------------------- CS.END *-------------------------------------- @@ -678,7 +678,7 @@ Shunk.DstSize .BS 2 PAKSTAT .BS S.PAKSTAT - .INB usr/src/bin/x.fileenum.g + .INB usr/src/shared/x.fileenum.g DS.END .ED *-------------------------------------- diff --git a/BIN/RM.S.txt b/BIN/RM.S.txt index 2cf8018f..9de57620 100644 --- a/BIN/RM.S.txt +++ b/BIN/RM.S.txt @@ -14,8 +14,8 @@ X.ENTER.SUBDIR .EQ 0 X.COPY.TO.DEST .EQ 0 X.DELETE.SOURCE .EQ 1 *-------------------------------------- - .INB usr/src/bin/x.cpmvrm.s - .INB usr/src/bin/x.fileenum.s + .INB usr/src/shared/x.cpmvrm.s + .INB usr/src/shared/x.fileenum.s *-------------------------------------- CS.END *-------------------------------------- @@ -39,8 +39,8 @@ DS.START bContinue .BS 1 bRecurse .BS 1 bQuiet .BS 1 - .INB usr/src/bin/x.cpmvrm.g - .INB usr/src/bin/x.fileenum.g + .INB usr/src/shared/x.cpmvrm.g + .INB usr/src/shared/x.fileenum.g DS.END .ED *-------------------------------------- diff --git a/BIN/SHUTDOWN.S.txt b/BIN/SHUTDOWN.S.txt index 7aab914a..c15912b6 100644 --- a/BIN/SHUTDOWN.S.txt +++ b/BIN/SHUTDOWN.S.txt @@ -15,8 +15,7 @@ ZS.START ZPPtr1 .BS 2 Count .BS 1 Index .BS 1 -ZS.END - .ED +ZS.END .ED *-------------------------------------- * File Header (16 Bytes) *-------------------------------------- @@ -52,7 +51,7 @@ CS.RUN jsr CS.RUN.PS >PUSHBI 2 >PUSHBI 1 INITD - >SYSCALL kill + >SYSCALL Kill lda #0 sec @@ -98,13 +97,13 @@ CS.RUN.PS >PUSHYA >PUSHBI 3 - >SYSCALL printf + >SYSCALL PrintF >PUSHBI 2 ldy #S.PS.PID lda (ZPPtr1),y - >SYSCALL kill + >SYSCALL Kill .6 inc Count @@ -145,7 +144,7 @@ CS.RUN.DEV ldx #1 .7 inc Index - inc index + inc Index ldx Index cpx #K.DEV.MAX*2+1 @@ -166,8 +165,7 @@ MSGDEV .AZ "SHUTDOWN:Closing device %3d, %s\r\n" .DUMMY .OR 0 DS.START -DS.END - .ED +DS.END .ED *-------------------------------------- MAN SAVE usr/src/bin/shutdown.s diff --git a/BIN/UC.S.txt b/BIN/UC.S.txt index 250e4be2..7992a292 100644 --- a/BIN/UC.S.txt +++ b/BIN/UC.S.txt @@ -314,7 +314,7 @@ CS.RUN.CheckOpt ldy #1 clc rts *-------------------------------------- - .INB usr/src/bin/x.fileenum.s + .INB usr/src/shared/x.fileenum.s *-------------------------------------- CS.END *-------------------------------------- @@ -340,7 +340,7 @@ hSrcNewPath .BS 1 hFile .BS 1 hMem .BS 1 - .INB usr/src/bin/x.fileenum.g + .INB usr/src/shared/x.fileenum.g DS.END .ED *-------------------------------------- MAN diff --git a/BIN/USERMOD.S.txt b/BIN/USERMOD.S.txt index 5cc853b6..c5880185 100644 --- a/BIN/USERMOD.S.txt +++ b/BIN/USERMOD.S.txt @@ -69,7 +69,7 @@ CS.RUN ldy #S.PS.ARGC bcs .99 >PUSHW pData - >SYSCALL putpw + >SYSCALL PutPW bcs .99 lda #0 diff --git a/BIN/WC.S.txt b/BIN/WC.S.txt index eb3825bd..12a7a1d2 100644 --- a/BIN/WC.S.txt +++ b/BIN/WC.S.txt @@ -567,7 +567,7 @@ CS.RUN.CheckOpt ldy #1 clc rts *-------------------------------------- - .INB usr/src/bin/x.fileenum.s + .INB usr/src/shared/x.fileenum.s *-------------------------------------- CS.END *-------------------------------------- @@ -597,10 +597,9 @@ tCharCount .BS 4 tLineCount .BS 4 tWordCount .BS 4 - .INB usr/src/bin/x.fileenum.g + .INB usr/src/shared/x.fileenum.g -DS.END - .ED +DS.END .ED *-------------------------------------- MAN SAVE usr/src/bin/wc.s diff --git a/BIN/X.FILEENUM.G.txt b/BIN/X.FILEENUM.G.txt index 69dc6d7b..42b19de5 100644 --- a/BIN/X.FILEENUM.G.txt +++ b/BIN/X.FILEENUM.G.txt @@ -1,6 +1,5 @@ NEW AUTO 3,1 - .LIST OFF *-------------------------------------- index .BS 1 hDIRs .BS X.MAX.RECURSE+1 @@ -16,6 +15,6 @@ hDstBasePath .BS 1 .FIN *-------------------------------------- MAN -SAVE USR/SRC/BIN/X.FILEENUM.G -LOAD USR/SRC/BIN/LS.S +SAVE usr/src/shared/x.fileenum.g +LOAD usr/src/bin/ls.s ASM diff --git a/BIN/X.FILEENUM.S.txt b/BIN/X.FILEENUM.S.txt index 180a76cc..1e4edfdb 100644 --- a/BIN/X.FILEENUM.S.txt +++ b/BIN/X.FILEENUM.S.txt @@ -605,6 +605,6 @@ GetoDIRENT ldy #index rts *-------------------------------------- MAN -SAVE USR/SRC/BIN/X.FILEENUM.S -LOAD USR/SRC/BIN/LS.S +SAVE usr/src/shared/x.fileenum.s +LOAD usr/src/bin/ls.s ASM diff --git a/DRV/DHGR.DRV.G.txt b/DRV/DHGR.DRV.G.txt index 89f8b63c..2195f9af 100644 --- a/DRV/DHGR.DRV.G.txt +++ b/DRV/DHGR.DRV.G.txt @@ -1,6 +1,5 @@ NEW AUTO 3,1 - .LIST OFF *-------------------------------------- Mask7BitsH .DA #%01111111 Useless C2.MASK .DA #%01111110 diff --git a/DRV/DHGR.DRV.S.BLT.txt b/DRV/DHGR.DRV.S.BLT.txt index 64bfedeb..0d606dc4 100644 --- a/DRV/DHGR.DRV.S.BLT.txt +++ b/DRV/DHGR.DRV.S.BLT.txt @@ -1,6 +1,5 @@ NEW AUTO 3,1 - .LIST OFF *-------------------------------------- * BitBlt * S.CB.X1 : SrcX1 in bitmap/mask @@ -122,7 +121,7 @@ BITBLT.1 ldy #S.BM-1 .4 >LDYA CB.Cache+S.CB.DstX jsr LBUF.SetBounds1YA - stx BLT.SCRBitOfs + stx BLT.ScrBitOfs lda CB.Cache+S.CB.DstX clc adc CB.Cache+S.CB.SrcW @@ -136,7 +135,7 @@ BITBLT.1 ldy #S.BM-1 pla sbc #0 jsr LBUF.SetBounds2YA - ldx BLT.SCRBitOfs + ldx BLT.ScrBitOfs beq BITBLT.LOOP0 ldy Shift.L.LO-1,x X = 1->6 @@ -213,7 +212,7 @@ BITBLT.LOOP0 lda CB.Cache+S.CB.OP rts *------------ Shift 1->6 Comment : SCRBitOfs=X=3 -BITBLT.LOOPx lda CB.Cache+S.CB.OP X = BLT.SCRBitOfs +BITBLT.LOOPx lda CB.Cache+S.CB.OP X = BLT.ScrBitOfs bit #S.CB.OP.MASK beq BITBLT.LOOPx.4 >LDYA BLT.BMMaskPtr @@ -352,6 +351,6 @@ BLT.Get7BMBits1 lda (ZPBMDataPtr) .8 rts *-------------------------------------- MAN -SAVE usr/src/drv/dhgr.drv.s.rect +SAVE usr/src/drv/dhgr.drv.s.blt LOAD usr/src/drv/dhgr.drv.s ASM diff --git a/DRV/DHGR.DRV.S.LBUF.txt b/DRV/DHGR.DRV.S.LBUF.txt index aa5f9ff1..f020ffb1 100644 --- a/DRV/DHGR.DRV.S.LBUF.txt +++ b/DRV/DHGR.DRV.S.LBUF.txt @@ -1,6 +1,5 @@ NEW AUTO 3,1 - .LIST OFF *-------------------------------------- LBUF.SetBounds1YA jsr DIVMOD7YA A=DIV, X=MOD diff --git a/DRV/DHGR.DRV.S.LINE.txt b/DRV/DHGR.DRV.S.LINE.txt index a13c5dc8..624796f8 100644 --- a/DRV/DHGR.DRV.S.LINE.txt +++ b/DRV/DHGR.DRV.S.LINE.txt @@ -1,6 +1,5 @@ NEW AUTO 3,1 - .LIST OFF *-------------------------------------- * HLINE X1,X2 at Y1 (XOR,SET,ORA) *-------------------------------------- diff --git a/DRV/DHGR.DRV.S.OSD.txt b/DRV/DHGR.DRV.S.OSD.txt index fb595b57..c4529311 100644 --- a/DRV/DHGR.DRV.S.OSD.txt +++ b/DRV/DHGR.DRV.S.OSD.txt @@ -172,7 +172,7 @@ OSD.DRAWTEXT sec *-------------------------------------- OSD.GETTEXTSIZE clc php - lda CBX.Cache+S.CB.hFONT + lda CBX.Cache+S.CB.hFont >SYSCALL2 GetMemPtr >STYA ZPFontPtr diff --git a/DRV/DHGR.DRV.S.PIX.txt b/DRV/DHGR.DRV.S.PIX.txt index 5a8e6cd5..0f189051 100644 --- a/DRV/DHGR.DRV.S.PIX.txt +++ b/DRV/DHGR.DRV.S.PIX.txt @@ -1,6 +1,5 @@ NEW AUTO 3,1 - .LIST OFF *-------------------------------------- * SETPIXEL * 1 : OP (XOR,SET,ORA) diff --git a/DRV/DHGR.DRV.S.RECT.txt b/DRV/DHGR.DRV.S.RECT.txt index 4965ed37..af234caa 100644 --- a/DRV/DHGR.DRV.S.RECT.txt +++ b/DRV/DHGR.DRV.S.RECT.txt @@ -1,6 +1,5 @@ NEW AUTO 3,1 - .LIST OFF *-------------------------------------- * FILLRECT * 1 : OP (XOR,SET,ORA) @@ -45,6 +44,6 @@ GETRECTBUFSIZE >LDYA CB.Cache+S.CB.X1 jmp YAMultX *-------------------------------------- MAN -SAVE usr/src/drv/dhgr.drv.s.blt +SAVE usr/src/drv/dhgr.drv.s.rect LOAD usr/src/drv/dhgr.drv.s ASM diff --git a/DRV/DHGR.DRV.S.txt b/DRV/DHGR.DRV.S.txt index f17e9bab..2b34a4c4 100644 --- a/DRV/DHGR.DRV.S.txt +++ b/DRV/DHGR.DRV.S.txt @@ -98,7 +98,7 @@ Dev.Detect >LDYA L.MSG.DETECT >PUSHW L.FD.DEV >PUSHW L.FD.DEV.NAME - >SYSCALL MKDEV + >SYSCALL MKDev bcs .9 php diff --git a/DRV/LANCEGS.DRV.S.txt b/DRV/LANCEGS.DRV.S.txt index fddeb4ad..4e4c0c6e 100644 --- a/DRV/LANCEGS.DRV.S.txt +++ b/DRV/LANCEGS.DRV.S.txt @@ -5,12 +5,12 @@ NEW .OR $2000 .TF drv/lancegs.drv *-------------------------------------- - .INB INC/MACROS.I - .INB INC/A2OSX.I - .INB INC/MLI.E.I - .INB INC/NIC.I - .INB INC/NIC.91C96.I - .INB INC/ETH.I + .INB inc/macros.i + .INB inc/a2osx.i + .INB inc/mli.e.i + .INB inc/nic.i + .INB inc/nic.91c96.i + .INB inc/eth.i *-------------------------------------- ZPArgPtr .EQ ZPBIN DEVSLOT0x .EQ ZPBIN+2 @@ -95,7 +95,7 @@ Dev.Detect >STYA ARGS >PUSHW L.FD.DEV >PUSHW L.FD.DEV.NAME - >SYSCALL MKDEV + >SYSCALL MKDev bcs .9 ldx DEVSLOT0x @@ -105,8 +105,8 @@ Dev.Detect >STYA ARGS .9 rts *-------------------------------------- Dev.ParseArgs >LDYA ARGS - >STYA ZPArgPTR - lda (ZPArgPTR) + >STYA ZPArgPtr + lda (ZPArgPtr) bne .1 lda A2osX.RANDOM16 @@ -131,7 +131,7 @@ Dev.ParseArgs >LDYA ARGS bne .2 >PUSHBI 12 6 x byte PTRs - >SYSCALL sscanf + >SYSCALL SScanF bcc .8 lda #E.SYN @@ -361,7 +361,7 @@ READ php ply Y,A = Size - >SYSCALL2 getmem + >SYSCALL2 GetMem bcs READWRITE.99 >STYA ZPBufPtr @@ -556,5 +556,5 @@ DCB .DA #S.DCB.T.NIC *-------------------------------------- DRV.END MAN -SAVE USR/SRC/DRV/LANCEGS.DRV.S +SAVE usr/src/drv/lancegs.drv.s ASM diff --git a/DRV/MKBOARD.DRV.S.txt b/DRV/MKBOARD.DRV.S.txt index c2f32666..ffcbb46d 100644 --- a/DRV/MKBOARD.DRV.S.txt +++ b/DRV/MKBOARD.DRV.S.txt @@ -99,7 +99,7 @@ Dev.Detect >STYA ARGS >PUSHW L.FD.DEV >PUSHW L.FD.DEV.NAME - >SYSCALL MKDEV + >SYSCALL MKDev .9 rts *-------------------------------------- diff --git a/DRV/MOUSE.DRV.S.txt b/DRV/MOUSE.DRV.S.txt index 79942801..c8a7b797 100644 --- a/DRV/MOUSE.DRV.S.txt +++ b/DRV/MOUSE.DRV.S.txt @@ -96,7 +96,7 @@ Dev.Detect >LDYA L.MSG.DETECT >PUSHW L.FD.DEV >PUSHW L.FD.DEV.NAME - >SYSCALL MKDEV + >SYSCALL MKDev .99 rts *-------------------------------------- diff --git a/DRV/PIC.DRV.S.txt b/DRV/PIC.DRV.S.txt index a8aabff2..f99bf2dc 100644 --- a/DRV/PIC.DRV.S.txt +++ b/DRV/PIC.DRV.S.txt @@ -1,14 +1,13 @@ NEW -PREFIX -AUTO 4,1 + AUTO 3,1 .LIST OFF .OP 65C02 .OR $2000 - .TF DRV/PIC.DRV + .TF drv/pic.drv *-------------------------------------- - .INB INC/MACROS.I - .INB INC/A2OSX.I - .INB INC/MLI.E.I + .INB inc/macros.i + .INB inc/a2osx.i + .INB inc/mli.e.i *-------------------------------------- ZPTmpPtr1 .EQ ZPDRV *-------------------------------------- @@ -20,24 +19,30 @@ CS.START cld .DA #1 DRV Layout Version 1 .DA 0 .DA CS.END-CS.START Code Length - .DA DEV.HEADER-CS.START Device Header Offset - .DA DRV.CS.START-CS.START Driver Code Offset - .DA DRV.CS.END-DRV.CS.START Drv Code Length + .DA 0 + .DA #32 SS + .DA #2 ZP + .DA 0 *-------------------------------------- * Relocation Table *-------------------------------------- L.MSG.DETECT .DA MSG.DETECT L.MSG.DETECT.OK .DA MSG.DETECT.OK L.MSG.DETECT.KO .DA MSG.DETECT.KO -L.DEV.HEADER.NAME .DA DEV.HEADER.NAME +L.DRV.CS.START .DA DRV.CS.START +L.FD.DEV .DA FD.DEV +L.FD.DEV.NAME .DA FD.DEV.NAME .DA 0 End Of Reloc Table *-------------------------------------- Dev.Detect >STYA ARGS + >LDYA L.MSG.DETECT - >SYSCALL PrintF + >SYSCALL PutS + stz ZPTmpPtr1 lda #$C1 sta ZPTmpPtr1+1 + .1 and #$0f tay lda A2osX.S,y @@ -49,15 +54,20 @@ Dev.Detect >STYA ARGS lda (ZPTmpPtr1),y cmp DEVSIG.Value,x bne .3 + dex bpl .2 + bra .4 -.3 inc ZPTmpPtr1+1 no match, try next slot.... + +.3 inc FD.DEV.NAME+3 + inc ZPTmpPtr1+1 no match, try next slot.... lda ZPTmpPtr1+1 cmp #$C8 bne .1 + >LDYA L.MSG.DETECT.KO - >SYSCALL PrintF + >SYSCALL PutS lda #MLI.E.NODEV Not Found in any slot, exiting sec @@ -70,19 +80,31 @@ Dev.Detect >STYA ARGS lda #A2osX.S.COM sta A2osX.S,y pla - ora #$30 - sta DEV.HEADER.NAME+4 asl asl asl asl sta DEVSLOTn0 - >PUSHW L.DEV.HEADER.NAME - >LDYA L.MSG.DETECT.OK +.8 >PUSHW L.MSG.DETECT.OK + >PUSHW L.FD.DEV.NAME + >PUSHBI 2 >SYSCALL PrintF - clc - rts + + >PUSHWI DRV.END + >PUSHWI DRV.CS.END-DRV.CS.START + >PUSHWI DRV.CS.START + >LDYA L.DRV.CS.START + >SYSCALL InsDrv + bcs .9 + + >STYA FD.DEV+S.FD.DEV.DRVPTR + + >PUSHW L.FD.DEV + >PUSHW L.FD.DEV.NAME + >SYSCALL MKDev + +.9 rts *-------------------------------------- CS.END DEVSIG.Offset .HS 0507 @@ -93,17 +115,21 @@ MSG.DETECT.OK .AZ "PIC Installed As Device : %S\r\n" MSG.DETECT.KO .AZ "No PIC Found.\r\n" ARGS .BS 2 *-------------------------------------- -* Device Header (16 Bytes) -*-------------------------------------- -DEV.HEADER cld - jmp (DRV.CS.START,x) - .DA #S.DEV.S.WRITE - .BS 6 -DEV.HEADER.NAME >PSTR "LPT1" +FD.DEV .DA #S.FD.T.CDEV + .DA #0 HANDLER + .DA #0 BUSID + .DA #0 DEVID + .DA 0 BUSPTR + .BS 2 DRVPTR + .DA 0 DCBPTR + .DA 0 BUFPTR +FD.DEV.NAME .AZ "lpt1" *-------------------------------------- * Driver Code *-------------------------------------- -DRV.CS.START .DA STATUS +DRV.CS.START cld + jmp (.1,x) +.1 .DA STATUS .DA A2osX.BADCALL .DA A2osX.BADCALL .DA A2osX.BADCALL @@ -149,6 +175,22 @@ STAT .DA #S.DIB.S.WRITE .DA #0 .DA $0900 *-------------------------------------- +DIB .DA #S.DIB.S.WRITE + .DA #0,#0,#0 + >PSTR "Serial Card/Port" + .DA #S.DIB.T.CHAR + .DA #0 + .DA K.VER +*-------------------------------------- +DCB .DA #S.DCB.T.COM + .DA #0 FLAGS + .DA 0 + .DA #0 + .DA #0 + .DA #0 + .DA #0 +*-------------------------------------- +DRV.END MAN -SAVE /A2OSX/SRC/DRV/PIC.DRV.S +SAVE usr/src/drv/pic.drv.s ASM diff --git a/DRV/SSC.DRV.S.txt b/DRV/SSC.DRV.S.txt index 03b91c41..50980c96 100644 --- a/DRV/SSC.DRV.S.txt +++ b/DRV/SSC.DRV.S.txt @@ -4,13 +4,13 @@ NEW *-------------------------------------- SSCIRQ .EQ 0 *-------------------------------------- - .INB INC/MACROS.I - .INB INC/A2OSX.I - .INB INC/MLI.E.I - .INB INC/COM.I - .INB INC/COM.6551.I - .INB USR/SRC/DRV/X.SSC.DRV.S + .INB inc/macros.i + .INB inc/a2osx.i + .INB inc/mli.e.i + .INB inc/com.i + .INB inc/com.6551.i + .INB usr/src/shared/x.ssc.drv.s *-------------------------------------- MAN -SAVE USR/SRC/DRV/SSC.DRV.S +SAVE usr/src/drv/ssc.drv.s ASM diff --git a/DRV/SSC.I.DRV.S.txt b/DRV/SSC.I.DRV.S.txt index a169e31e..69ffd4fc 100644 --- a/DRV/SSC.I.DRV.S.txt +++ b/DRV/SSC.I.DRV.S.txt @@ -4,13 +4,13 @@ NEW *-------------------------------------- SSCIRQ .EQ 1 *-------------------------------------- - .INB INC/MACROS.I - .INB INC/A2OSX.I - .INB INC/MLI.E.I - .INB INC/COM.I - .INB INC/COM.6551.I - .INB USR/SRC/DRV/X.SSC.DRV.S + .INB inc/macros.i + .INB inc/a2osx.i + .INB inc/mli.e.i + .INB inc/com.i + .INB inc/com.6551.i + .INB usr/src/shared/x.ssc.drv.s *-------------------------------------- MAN -SAVE USR/SRC/DRV/SSC.I.DRV.S +SAVE usr/src/drv/ssc.i.drv.s ASM diff --git a/DRV/UTHER2.AI.DRV.S.txt b/DRV/UTHER2.AI.DRV.S.txt index 27d24e10..97a85bfa 100644 --- a/DRV/UTHER2.AI.DRV.S.txt +++ b/DRV/UTHER2.AI.DRV.S.txt @@ -120,7 +120,7 @@ Dev.Detect >STYA ARGS >PUSHW L.FD.DEV >PUSHW L.FD.DEV.NAME - >SYSCALL MKDEV + >SYSCALL MKDev bcs .9 ldx DEVSLOT0x @@ -130,8 +130,8 @@ Dev.Detect >STYA ARGS .9 rts *-------------------------------------- Dev.ParseArgs >LDYA ARGS - >STYA ZPArgPTR - lda (ZPArgPTR) + >STYA ZPArgPtr + lda (ZPArgPtr) bne .1 lda A2osX.RANDOM16 @@ -157,7 +157,7 @@ Dev.ParseArgs >LDYA ARGS >PUSHBI 12 6 x byte PTRs - >SYSCALL sscanf + >SYSCALL SScanF bcc .8 lda #E.SYN @@ -433,9 +433,9 @@ READ.ICMP lda #S.IP.PROTOCOL.ICMP >AR.Sn.SELECT S0.RX.RD lda W5100.DR,x get the received ptr HI - sta offset+1 + sta Offset+1 ldy W5100.DR,x get the received ptr LO - sty offset + sty Offset and Sn.MASK ora Sn.BASE @@ -492,7 +492,7 @@ READ.ICMP lda #S.IP.PROTOCOL.ICMP sta FRM.HDR.IPLEN >LDYA BUF.Size - >SYSCALL2 getmem + >SYSCALL2 GetMem bcc .14 jmp READWRITE.9 @@ -576,9 +576,9 @@ READ.ICMP lda #S.IP.PROTOCOL.ICMP *-------------------------------------- READ.RAW >AR.SELECT S0.RX.RD lda W5100.DR,x get the received ptr HI - sta offset+1 + sta Offset+1 ldy W5100.DR,x get the received ptr LO - sty offset + sty Offset and /$7FF ora /RX.BASE @@ -608,7 +608,7 @@ READ.RAW >AR.SELECT S0.RX.RD sta Counter+1 >LDYA BUF.Size - >SYSCALL2 getmem + >SYSCALL2 GetMem bcc .14 jmp READWRITE.9 diff --git a/DRV/UTHERNET.DRV.S.txt b/DRV/UTHERNET.DRV.S.txt index 40a79db4..a987a6fc 100644 --- a/DRV/UTHERNET.DRV.S.txt +++ b/DRV/UTHERNET.DRV.S.txt @@ -112,7 +112,7 @@ Dev.Detect >STYA ZPArgPtr >PUSHW L.FD.DEV >PUSHW L.FD.DEV.NAME - >SYSCALL MKDEV + >SYSCALL MKDev bcs .9 ldx DEVSLOT0x @@ -121,7 +121,7 @@ Dev.Detect >STYA ZPArgPtr * clc .9 rts *-------------------------------------- -Dev.ParseArgs lda (ZPArgPTR) +Dev.ParseArgs lda (ZPArgPtr) bne .1 lda A2osX.RANDOM16 @@ -146,7 +146,7 @@ Dev.ParseArgs lda (ZPArgPTR) bne .2 >PUSHBI 12 6 x byte PTRs - >SYSCALL sscanf + >SYSCALL SScanF bcc .8 lda #E.SYN @@ -372,7 +372,7 @@ READ php sta Counter+1 pla - >SYSCALL2 getmem + >SYSCALL2 GetMem bcs READWRITE.99 >STYA ZPBufPtr phx diff --git a/DRV/UTHERNET2.DRV.S.txt b/DRV/UTHERNET2.DRV.S.txt index 571f23dc..e7dae7bb 100644 --- a/DRV/UTHERNET2.DRV.S.txt +++ b/DRV/UTHERNET2.DRV.S.txt @@ -5,12 +5,12 @@ NEW .OR $2000 .TF drv/uthernet2.drv *-------------------------------------- - .INB INC/MACROS.I - .INB INC/A2OSX.I - .INB INC/MLI.E.I - .INB INC/NIC.I - .INB INC/NIC.W5100.I - .INB INC/ETH.I + .INB inc/macros.i + .INB inc/a2osx.i + .INB inc/mli.e.i + .INB inc/nic.i + .INB inc/nic.w5100.i + .INB inc/eth.i *-------------------------------------- ZPArgPtr .EQ ZPBIN DEVSLOT0x .EQ ZPBIN+2 @@ -119,7 +119,7 @@ Dev.Detect >STYA ARGS >PUSHW L.FD.DEV >PUSHW L.FD.DEV.NAME - >SYSCALL MKDEV + >SYSCALL MKDev bcs .9 ldx DEVSLOT0x @@ -129,8 +129,8 @@ Dev.Detect >STYA ARGS .9 rts *-------------------------------------- Dev.ParseArgs >LDYA ARGS - >STYA ZPArgPTR - lda (ZPArgPTR) + >STYA ZPArgPtr + lda (ZPArgPtr) bne .1 lda A2osX.RANDOM16 @@ -156,7 +156,7 @@ Dev.ParseArgs >LDYA ARGS >PUSHBI 12 6 x byte PTRs - >SYSCALL sscanf + >SYSCALL SScanF bcc .8 lda #E.SYN @@ -318,9 +318,9 @@ READ php .1 >AR.SELECT S0.RX.RD lda W5100.DR,x get the received ptr HI - sta offset+1 + sta Offset+1 ldy W5100.DR,x get the received ptr LO - sty offset + sty Offset and /RXTX.MASK ora /RX.BASE @@ -350,7 +350,7 @@ READ php sta Counter+1 >LDYA BUF.Size - >SYSCALL2 getmem + >SYSCALL2 GetMem bcc .14 jmp READWRITE.9 diff --git a/DRV/X.SSC.DRV.S.txt b/DRV/X.SSC.DRV.S.txt index 88e05a32..e232a7aa 100644 --- a/DRV/X.SSC.DRV.S.txt +++ b/DRV/X.SSC.DRV.S.txt @@ -4,9 +4,9 @@ NEW .OR $2000 *-------------------------------------- .DO SSCIRQ=1 - .TF DRV/SSC.I.DRV + .TF drv/ssc.i.drv .ELSE - .TF DRV/SSC.DRV + .TF drv/ssc.drv .FIN *-------------------------------------- .DO SSCIRQ=1 @@ -30,7 +30,7 @@ CS.START cld .DA CS.END-CS.START Code Length .DA 0 .DA #32 SS - .DA #8 ZP + .DA #10 ZP .DA 0 *-------------------------------------- * Relocation Table @@ -118,13 +118,13 @@ Dev.Detect >STYA ARGS >PUSHW L.FD.DEV >PUSHW L.FD.DEV.NAME - >SYSCALL MKDEV + >SYSCALL MKDev .9 rts *-------------------------------------- Dev.ParseArgs >LDYA ARGS - >STYA ZPArgPTR - lda (ZPArgPTR) + >STYA ZPArgPtr + lda (ZPArgPtr) bne .1 clc @@ -157,7 +157,7 @@ Dev.ParseArgs >LDYA ARGS >PUSHW ZPParityPtr >PUSHW ZPControlPtr >PUSHBI 10 5 x byte PTRs - >SYSCALL sscanf + >SYSCALL SScanF bcs .90 .90 lda ZPhControl @@ -570,6 +570,6 @@ DCB .DA #S.DCB.T.COM *-------------------------------------- DRV.END MAN -SAVE USR/SRC/DRV/X.SSC.DRV.S -LOAD USR/SRC/DRV/SSC.I.DRV.S +SAVE usr/src/drv/x.ssc.drv.s +LOAD usr/src/drv/ssc.i.drv.s ASM