diff --git a/.Floppies/A2OSX.BUILD.po b/.Floppies/A2OSX.BUILD.po index 22f01159..942cd0a3 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 45faffc1..49f62d20 100644 Binary files a/.Floppies/A2OSX.SRC.po and b/.Floppies/A2OSX.SRC.po differ diff --git a/BIN/ASM.S.FIO.txt b/BIN/ASM.S.FIO.txt index 83a3986b..b698047f 100644 --- a/BIN/ASM.S.FIO.txt +++ b/BIN/ASM.S.FIO.txt @@ -60,7 +60,7 @@ FIO.LOAD.ASM.T >STYA ZPPtr2 >PUSHWI 0 Aux type >PUSHBI 6 S.FI.T.BIN >PUSHBI SYS.FOpen.R - >PUSHW L.ASM.T.FILENAME + >LDYA L.ASM.T.FILENAME >SYSCALL LoadFile bcs .9 @@ -139,7 +139,7 @@ FIO.OpenFile >STYA ZPPtr1 >PUSHBI $FA >PUSHBI SYS.FOpen.R -.3 >PUSHW ZPPtr1 +.3 >LDYA ZPPtr1 >SYSCALL FOpen bcs .99 @@ -229,9 +229,9 @@ FIO.ReadLine >LDYA ZPLineBuf bcc .9 LEN should be at least 3 tay - >PUSHW ZPTmpBuf lda #0 >PUSHYA + >PUSHW ZPTmpBuf jsr FIO.ReadFromFile bcs .9 diff --git a/BIN/CAT.S.txt b/BIN/CAT.S.txt index e793fd28..3b936fd9 100644 --- a/BIN/CAT.S.txt +++ b/BIN/CAT.S.txt @@ -132,8 +132,8 @@ CS.RUN >SYSCALL GetChar rts .2 pha - >PUSHW ZPBufPtr >PUSHWI 256 + >PUSHW ZPBufPtr pla >SYSCALL FRead @@ -254,7 +254,7 @@ CS.RUN.OPEN >SYSCALL RealPath >PUSHBI SYS.FOpen.R+SYS.FOpen.T pla - >PUSHYA + >SYSCALL FOpen bcs .99 diff --git a/BIN/DNSINFO.S.txt b/BIN/DNSINFO.S.txt index 0dbc4ca7..78d0fc8e 100644 --- a/BIN/DNSINFO.S.txt +++ b/BIN/DNSINFO.S.txt @@ -8,6 +8,7 @@ AUTO 4,1 *-------------------------------------- .INB INC/MACROS.I .INB INC/A2OSX.I + .INB INC/ETH.I .INB INC/LIBTCPIP.I *-------------------------------------- ZPPTR1 .EQ ZPBIN diff --git a/BIN/EDIT.S.txt b/BIN/EDIT.S.txt index 76ff9af5..5421ef2a 100644 --- a/BIN/EDIT.S.txt +++ b/BIN/EDIT.S.txt @@ -346,7 +346,6 @@ LoadFile >PUSHWI 0 Aux type >SYSCALL GetMemPtr - >PUSHYA >SYSCALL LoadFile bcs .9 @@ -415,18 +414,18 @@ SaveFile >PUSHWI 0 Aux type >PUSHBI SYS.FOpen.X+SYS.FOpen.W >LDA.G hFileName >SYSCALL GetMemPtr - >PUSHYA + >SYSCALL FOpen bcs .9 pha + >PUSHW.G FileLen + >LDA.G hBuffer >SYSCALL GetMemPtr >PUSHYA - >PUSHW.G FileLen - pla pha diff --git a/BIN/MD5.S.txt b/BIN/MD5.S.txt index e051904e..952f3b23 100644 --- a/BIN/MD5.S.txt +++ b/BIN/MD5.S.txt @@ -144,9 +144,6 @@ CS.RUN.FILE >LDA.G Arg >LDA.G hFullPath >SYSCALL GetMemPtr - - >PUSHYA - >SYSCALL FOpen bcs .9 >STA.G hFile @@ -156,8 +153,8 @@ CS.RUN.FILE >LDA.G Arg >STA.G hMD5Ctx -.1 >PUSHW ZPDataBufPtr Dst Ptr - >PUSHWI FILEBUF.SIZE Bytes To Read +.1 >PUSHWI FILEBUF.SIZE Bytes To Read + >PUSHW ZPDataBufPtr Dst Ptr >LDA.G hFile >SYSCALL FRead diff --git a/BIN/X.CPMVRM.S.txt b/BIN/X.CPMVRM.S.txt index 2a3ad25e..c414d550 100644 --- a/BIN/X.CPMVRM.S.txt +++ b/BIN/X.CPMVRM.S.txt @@ -608,7 +608,6 @@ CS.RUN.Open phy Save Filename ply jsr CS.RUN.GetPathY - >PUSHYA >SYSCALL FOpen rts *-------------------------------------- @@ -620,8 +619,8 @@ CS.RUN.Copy stz .90+1 >STYA ZPPtr1 stx .90+1 - >PUSHW ZPPtr1 Dst Ptr >PUSHWI X.COPY.BUF.SIZE Bytes To Read + >PUSHW ZPPtr1 Dst Ptr >LDA.G hSrcFile >SYSCALL FRead bcc .1 @@ -632,8 +631,8 @@ CS.RUN.Copy stz .90+1 .1 >STYA ZPPtr2 - >PUSHW ZPPtr1 Src Ptr >PUSHW ZPPtr2 Bytes To Write + >PUSHW ZPPtr1 Src Ptr >LDA.G hDstFile >SYSCALL FWrite bcs .9 diff --git a/BMP2PIX.S.txt b/BMP2PIX.S.txt index bb328efc..3eb0e0f6 100644 --- a/BMP2PIX.S.txt +++ b/BMP2PIX.S.txt @@ -108,7 +108,7 @@ CS.INIT.OPENINPUT >PUSHWI 0 Aux type >PUSHBI 0 Type >PUSHBI SYS.FOpen.R - >PUSHW ZPPtr1 + >LDYA ZPPtr1 >SYSCALL LoadFile bcs CS.INIT.RTS @@ -184,7 +184,7 @@ CS.INIT.CREATEOUTPUT >PUSHWI 0 Aux type >PUSHBI $CB PIX Type >PUSHBI SYS.FOpen.W+SYS.FOpen.X - >PUSHW ZPPtr1 + >LDYA ZPPtr1 >SYSCALL FOpen bcs .9 >STA.G hOutputFile @@ -249,8 +249,8 @@ CS.RUN lda #S.BM.F.BBP1 adc ZPInputBufLen+1 sta ZPInputDataPtr+1 - >PUSHEA.G PIX.Header >PUSHWI S.BM + >PUSHEA.G PIX.Header >LDA.G hOutputFile >SYSCALL FWrite bcs CS.RUN.RTS @@ -286,8 +286,8 @@ CS.RUN.LOOP inc ZPLineCount cpy ZPPIXRowBytes bne .2 - >PUSHW ZPBufPtr >PUSHW ZPPIXRowBytes + >PUSHW ZPBufPtr >LDA.G hOutputFile >SYSCALL FWrite bcs CS.RUN.RTS diff --git a/FNT2FON.S.txt b/FNT2FON.S.txt index d608baea..b8d03618 100644 --- a/FNT2FON.S.txt +++ b/FNT2FON.S.txt @@ -111,7 +111,7 @@ CS.INIT.OPENINPUT >PUSHWI 0 Aux type >PUSHBI 0 Type >PUSHBI SYS.FOpen.R - >PUSHW ZPPtr1 + >LDYA ZPPtr1 >SYSCALL LoadFile bcs CS.INIT.RTS @@ -174,7 +174,7 @@ CS.INIT.CREATEOUTPUT >PUSHWI 0 Aux type >PUSHBI $CC FON Type >PUSHBI SYS.FOpen.W+SYS.FOpen.X - >PUSHW ZPPtr1 + >LDYA ZPPtr1 >SYSCALL FOpen bcs .9 >STA.G hOutputFile @@ -700,8 +700,8 @@ CS.RUN.WriteByte clc bne .8 - >PUSHW ZPOutPutBufPtr >PUSHWI 256 + >PUSHW ZPOutPutBufPtr >LDA.G hOutputFile >SYSCALL FWrite bcs .9 @@ -718,12 +718,12 @@ CS.RUN.FlushOutPutBuf clc >LDA.G OutPutPtr beq .8 - pha - - >PUSHW ZPOutPutBufPtr - ply + + tay lda #0 >PUSHYA + + >PUSHW ZPOutPutBufPtr >LDA.G hOutputFile >SYSCALL FWrite @@ -748,17 +748,12 @@ CS.RUN.WriteBMAndTbl >SYSCALL FSeek bcs .9 - >LEA.G FON.Header - >PUSHYA >PUSHWI S.FON + >PUSHEA.G FON.Header >LDA.G hOutputFile >SYSCALL FWrite bcs .9 - >LDA.G hTblBuf - >SYSCALL GetMemPtr - >PUSHYA - >LDA.G FON.Header+S.FON.Last sec >SBC.G FON.Header+S.FON.First @@ -770,6 +765,11 @@ CS.RUN.WriteBMAndTbl rol ply >PUSHYA + + >LDA.G hTblBuf + >SYSCALL GetMemPtr + >PUSHYA + >LDA.G hOutputFile >SYSCALL FWrite diff --git a/LIB/LIBTCPIP.S.FRM.txt b/LIB/LIBTCPIP.S.FRM.txt index d0a5dc45..23186e58 100644 --- a/LIB/LIBTCPIP.S.FRM.txt +++ b/LIB/LIBTCPIP.S.FRM.txt @@ -293,11 +293,9 @@ FRM.Retry ldx FRM.QUEUE.Tail .8 rts *-------------------------------------- -FRM.Send.Out >DEBUG - - >LDYA ZPDataOutPtr +FRM.Send.Out >LDYA ZPFrameOutPtr >STYA IOCTL+S.IOCTL.BUFPTR - >LDYA ZPDataOutLen + >LDYA ZPFrameOutLen >STYA IOCTL+S.IOCTL.BYTECNT FRM.Send.IOCTL >PUSHW L.IOCTL diff --git a/README.md b/README.md index 235ceff3..ecf92b02 100644 --- a/README.md +++ b/README.md @@ -248,7 +248,7 @@ OApple+1,OApple+2,OApple+3 to switch between screens : Kernel Log, text, DHGR. | KCONFIG | Working | Kernel Configuration Utility | 0.92 | | ---- | ------ | ------- | ----- | | TCPIPD | Working | Socket API.ARP,IP,ICMP,UDP & TCP ok | 0.92 | -| DHCPCLNT| Working | rewritten to use new Socket API | 0.9.1 | +| DHCPCLNT| Working | rewritten to use new Socket API | 0.92 | | TELNETD | In Progress | | 0.9 | | HTTPD | In Progress | | 0.9 | @@ -344,9 +344,9 @@ note : '$VAR' does NOT expand Variable | ---- | ------ | ------- | ----- | | IPCONFIG | Working | renamed from NETINFO | 0.92 | | NETSTAT | Working | | 0.92 | -| ARP | Working | dump ARP cache, setup a static ARP entry | 0.9.1 | -| DNSINFO | Working | dump DNS cache, setup a static DNS entry | 0.9.1 | -| PING | Working | | 0.9.1 | +| ARP | Working | dump ARP cache, setup a static ARP entry | 0.92 | +| DNSINFO | Working | dump DNS cache, setup a static DNS entry | 0.92 | +| PING | Working | | 0.92 | ## DEV tools: | Name | Status | Comment | K.Ver | diff --git a/SBIN/DHCPCLNT.S.txt b/SBIN/DHCPCLNT.S.txt index 76ee4a8c..89459429 100644 --- a/SBIN/DHCPCLNT.S.txt +++ b/SBIN/DHCPCLNT.S.txt @@ -27,7 +27,7 @@ CS.START cld .DA 0 .DA CS.END-CS.START CS .DA DS.END-DS.START DS - .DA #16 SS + .DA #64 SS .DA #6 ZP .DA 0 *-------------------------------------- @@ -212,7 +212,7 @@ CS.RUN.KO pha *-------------------------------------- CS.RUN.SKT.RCVD ldy #hSocket lda (pData),y - >LIBCALL hLIBTCPIP,LIBTCPIP.SKT.ReadA + >LIBCALL hLIBTCPIP,LIBTCPIP.SKT.ReadFrame bcs .9 ldy #hFrame sta (pData),y diff --git a/SBIN/KCONFIG.S.txt b/SBIN/KCONFIG.S.txt index 42a28092..7002598f 100644 --- a/SBIN/KCONFIG.S.txt +++ b/SBIN/KCONFIG.S.txt @@ -184,11 +184,8 @@ CS.RUN.Load >PUSHEA.G StatBuf >PUSHWI 0 Aux type >PUSHBI 6 S.FI.T.BIN >PUSHBI SYS.FOpen.R - >LDA.G hFileName - + >LDA.G hFileName >SYSCALL GetMemPtr - - >PUSHYA >SYSCALL LoadFile bcs .99 txa @@ -219,15 +216,14 @@ CS.RUN.Save >PUSHWI 0 AUXTYPE >LDA.G hFileName >SYSCALL GetMemPtr - >PUSHYA >SYSCALL FOpen bcs .9 pha save hFile - >PUSHW ZPCfgPtr >PUSHWI 16 LEN + >PUSHW ZPCfgPtr pla pha diff --git a/SBIN/SHELL.S.CMD.txt b/SBIN/SHELL.S.CMD.txt index a0047c32..298d42ea 100644 --- a/SBIN/SHELL.S.CMD.txt +++ b/SBIN/SHELL.S.CMD.txt @@ -76,9 +76,12 @@ Cmd.Exec lda #0 >STA.G CMD.hFullpath * SET +X -* >LDYA ZPCMDBuf -* >SYSCALL puts + >LDYA ZPCMDBuf + >SYSCALL puts + sta $C055 + >DEBUG + >LDYA ZPCMDBuf >SYSCALL ExpandStr >STYA ZPPtr1 Ptr to CMD ARGS diff --git a/SBIN/TCPIPD.S.CFG.txt b/SBIN/TCPIPD.S.CFG.txt index 40eb555f..1c58d892 100644 --- a/SBIN/TCPIPD.S.CFG.txt +++ b/SBIN/TCPIPD.S.CFG.txt @@ -152,7 +152,10 @@ CFG.Read.HOSTS >LDYA L.HOSTS jsr CFG.Read.LoadFile bcs .9 - + +.8 jsr CFG.Read.CleanUp + clc + rts .9 jsr CFG.Read.CleanUp sec @@ -172,7 +175,6 @@ CFG.Read.LoadFile >PUSHBI 4 S.FI.T.TXT >PUSHBI SYS.FOpen.R pla - >PUSHYA >SYSCALL LoadFile bcs .9 diff --git a/SBIN/TCPIPD.S.txt b/SBIN/TCPIPD.S.txt index d55d8796..f2dc0831 100644 --- a/SBIN/TCPIPD.S.txt +++ b/SBIN/TCPIPD.S.txt @@ -24,7 +24,7 @@ CS.START cld .DA 0 .DA CS.END-CS.START CS .DA DS.END-DS.START DS - .DA #16 SS + .DA #64 SS .DA #4 ZP .DA 0 *-------------------------------------- diff --git a/SYS/KERNEL.S.BIN.txt b/SYS/KERNEL.S.BIN.txt index 153e7660..fb853761 100644 --- a/SYS/KERNEL.S.BIN.txt +++ b/SYS/KERNEL.S.BIN.txt @@ -207,7 +207,7 @@ BIN.Load.1 >PUSHWI K.S.STAT >PUSHYA Push AUXTYPE >PUSHBI S.FI.T.BIN >PUSHBI SYS.FOpen.R - >PUSHW BIN.CmdLine + >LDYA BIN.CmdLine >SYSCALL LoadFile BANK1!!! .9 bcs .99 Error Loading file diff --git a/SYS/KERNEL.S.FIO.txt b/SYS/KERNEL.S.FIO.txt index 6d24b764..2e03e3bd 100644 --- a/SYS/KERNEL.S.FIO.txt +++ b/SYS/KERNEL.S.FIO.txt @@ -15,7 +15,6 @@ K.LoadTxtFile pha >PUSHBI 4 S.FI.T.TXT >PUSHBI SYS.FOpen.R pla - >PUSHYA sec .HS 90 BCC */-------------------------------------- @@ -25,7 +24,7 @@ K.LoadTxtFile pha * PUSHW = AUXTYPE (Handled by.... * PUSHB = TYPE ... * PUSHB = MODE ... -* PUSHW = PATH ...FOpen) +* LDYA = PATH ...FOpen) * **Out:** * Y,A = File Length * X = hMem of Loaded File @@ -56,8 +55,8 @@ K.LoadFile clc >STYA FIO.Mem stx .8+1 - >PUSHW FIO.Mem >PUSHW FIO.FSize + >PUSHW FIO.Mem lda FIO.hFile jsr K.FRead bcs .98 diff --git a/SYS/KERNEL.S.IO.txt b/SYS/KERNEL.S.IO.txt index e9a4dba9..4f1b1e20 100644 --- a/SYS/KERNEL.S.IO.txt +++ b/SYS/KERNEL.S.IO.txt @@ -142,8 +142,8 @@ IO.READ.REG clc .HS B0 BCS *-------------------------------------- IO.WRITE.REG sec - >PUSHW K.S.IOCTL+S.IOCTL.BUFPTR >PUSHW K.S.IOCTL+S.IOCTL.BYTECNT + >PUSHW K.S.IOCTL+S.IOCTL.BUFPTR ldy #S.FD.REG.REF lda (pFD),y bcs .1 diff --git a/SYS/KERNEL.S.IRQ.txt b/SYS/KERNEL.S.IRQ.txt index 7238c34f..ba8d2237 100644 --- a/SYS/KERNEL.S.IRQ.txt +++ b/SYS/KERNEL.S.IRQ.txt @@ -23,8 +23,8 @@ K.IrqHAuxLC cld pla pha and #$10 BRK? - bne K.IrqHAuxLC.BRK - +* bne K.IrqHAuxLC.BRK + bne * stx K.IrqHAuxLC.5+1 sty K.IrqHAuxLC.4+1 diff --git a/SYS/KERNEL.S.STDIO.txt b/SYS/KERNEL.S.STDIO.txt index 7408ab55..16279e09 100644 --- a/SYS/KERNEL.S.STDIO.txt +++ b/SYS/KERNEL.S.STDIO.txt @@ -792,8 +792,8 @@ K.SScanF.GetVAL tya Y=char count parsed * CC : A = hFILE * CS : A = EC *\-------------------------------------- -K.FOpen jsr PFT.CheckPathSTK - jsr STDIO.PullMLIPath +K.FOpen jsr PFT.CheckPathYA + jsr STDIO.SetMLIPathYA >PULLB K.FOpen.MODE >PULLB K.FOpen.TYPE >PULLW K.FOpen.AUXTYPE @@ -953,8 +953,8 @@ K.FRead jsr PFT.CheckNodeA K.FWrite jsr PFT.CheckNodeA ldx #MLIWRITE K.FReadWrite.1 jsr STDIO.GetRefNum - >PULLW K.MLI.PARAMS+4 >PULLW K.MLI.PARAMS+2 + >PULLW K.MLI.PARAMS+4 lda #4 Param Count = 4 for MLIREAD & MLIWRITE jsr GP.MLICall @@ -963,6 +963,9 @@ K.FReadWrite.1 jsr STDIO.GetRefNum .9 rts */-------------------------------------- * # FFlush +* ## C +* int fflush(hFILE stream); +* ## ASM * **In:** * A = hFILE *\-------------------------------------- @@ -973,6 +976,9 @@ K.FFlush jsr PFT.CheckNodeA */------------------------------------- * # FSeek * Set the file-position indicator for hFILE +* ## C +* `int fseek(hFILE stream, long offset, int whence);` +* ## ASM * **In:** * PUSHW = Ptr to Offset (DWORD) * PUSHB = From @@ -1081,6 +1087,9 @@ K.FEOF.MARK .BS 3 */-------------------------------------- * # FTell * Return the current value of the file-position indicator +* ## C +* `long ftell(hFILE stream);` +* ## ASM * **In:** * PUSHW = Ptr to Offset (DWORD) * PUSHB = hFILE