diff --git a/A2OSX.BOOT.po b/A2OSX.BOOT.po index da3f3bfb..8ef33d99 100644 Binary files a/A2OSX.BOOT.po and b/A2OSX.BOOT.po differ diff --git a/A2OSX.DEV.po b/A2OSX.DEV.po index 80f866d4..74bf8c0a 100644 Binary files a/A2OSX.DEV.po and b/A2OSX.DEV.po differ diff --git a/A2OSX.SRC.po b/A2OSX.SRC.po index 2b04284e..5ba209a3 100644 Binary files a/A2OSX.SRC.po and b/A2OSX.SRC.po differ diff --git a/A2osX.STARTUP.txt b/A2osX.STARTUP.txt index ee3fda07..274c8afc 100644 --- a/A2osX.STARTUP.txt +++ b/A2osX.STARTUP.txt @@ -21,8 +21,8 @@ INSDRV UTHERNET.DRV 000E3A123456 #INSDRV UTHER2.AI.DRV 0008DC123456 #INSDRV LANCEGS.DRV STARTPROC TCPIP -#STARTPROC DHCPCLNT -#STARTPROC TELNETD +STARTPROC DHCPCLNT +STARTPROC TELNETD #STARTPROC HTTPD #NFSMOUNT 192.168.1.5:/A2OSX /MNT/A2OSX #CIFSMOUNT 192.168.1.5:/MSSHARE /MNT/MSSHARE diff --git a/BIN/IPCONFIG.S.txt b/BIN/IPCONFIG.S.txt index 8177fa80..5609fe00 100644 --- a/BIN/IPCONFIG.S.txt +++ b/BIN/IPCONFIG.S.txt @@ -107,6 +107,14 @@ CS.RUN.DUMPDEV sta DevID >PUSHYA + lda ZPDevStatPtr + clc + adc #S.DEVSTAT.IDSTRING + tay + lda ZPDevStatPtr+1 + adc /S.DEVSTAT.IDSTRING + >PUSHYA + >PUSHB DevID >LDYA L.MSG1.DEV @@ -256,7 +264,7 @@ MSG0 >CSTR "TCP/IP Status : " MSG0.L >CSTR "Loaded\r\n" MSG0.NL >CSTR "Not Loaded\r\n" *-------------------------------------- -MSG1.DEV >CSTR "\r\nDevice Configuration :\r\n DevID : $%h\r\n Device Name : %s\r\n HW Address : %02h:%02h:%02h:%02h:%02h:%02h\r\n" +MSG1.DEV >CSTR "\r\nDevice Configuration :\r\n DevID : $%h\r\n Device Type : %S\r\n Device Name : %S\r\n HW Address : %02h:%02h:%02h:%02h:%02h:%02h\r\n" MSG1.DEV.ARP >CSTR " ARP Offload : %d\r\n" MSG1.DEV.IP >CSTR " IP Offload : %d\r\n" MSG1.LINK >CSTR " Link Status : %s\r\n" diff --git a/BIN/RPCDUMP.S.txt b/BIN/RPCDUMP.S.txt index 74666d03..c5766bf2 100644 --- a/BIN/RPCDUMP.S.txt +++ b/BIN/RPCDUMP.S.txt @@ -102,23 +102,30 @@ CS.RUN jsr Init.Timeout .2 >PUSHW L.Socket >LIBCALL hLIBTCPIP,LIBTCPIP.SKT.New - bcs .99 + bcs .91 txa ldy #hSocket sta (pData),y -.3 >PUSHWI RPC.Request.End-RPC.Request - >PUSHW L.RPC.Request - ldy #hSocket + ldx #3 + +.21 lda A2osX.TIMER16,x + sta RPC.Request,x + dex + bpl .21 + +.3 ldy #hSocket >PUSHB (pData),y + >PUSHW L.RPC.Request + >PUSHWI RPC.Request.End-RPC.Request >LIBCALL hLIBTCPIP,LIBTCPIP.SKT.Write bcc .4 >SYSCALL Sleep jsr Wait.Timeout bcc .3 - bra .99 +.91 bra .99 .4 jsr Init.Timeout @@ -168,9 +175,11 @@ CS.DOEVENT lda (pEvent) *-------------------------------------- CS.QUIT ldy #hSocket lda (pData),y + beq .1 + >LIBCALL hLIBTCPIP,LIBTCPIP.SKT.CLOSEA - lda hLIBTCPIP +.1 lda hLIBTCPIP beq .8 >SYSCALL UnloadLibA @@ -247,9 +256,8 @@ Socket.Src.Addr .BS 4 Socket.Src.Port .DA 0 Dynamic Socket.Dst.Addr .BS 4 Socket.Dst.Port .DA UDP.PORT.PMAP - .BS S.SOCKET-16 *-------------------------------------- -RPC.Request .HS 12345678 XID +RPC.Request .BS 4 XID .HS 00000000 0=CALL .HS 00000002 RPCVERS .HS 000186A0 PROG=portmapper diff --git a/DRV/UTHERNET.DRV.S.txt b/DRV/UTHERNET.DRV.S.txt index ee47a37c..2d8d21e0 100644 --- a/DRV/UTHERNET.DRV.S.txt +++ b/DRV/UTHERNET.DRV.S.txt @@ -342,7 +342,7 @@ WRITEBLOCK.1 ldy #S.ETH.SRCMAC+5 OPEN jsr CLOSE >LDYAI PP.RxCTL >STYA PacketPagePTR,x - >LDYAI PP.RxCTL.LID+PP.RxCTL.RxOKA+PP.RxCTL.IA+PP.RxCTL.BroadcastA + >LDYAI PP.RxCTL.LID+PP.RxCTL.RxOKA+PP.RxCTL.IA+PP.RxCTL.BroadcastA+PP.RxCTL.RuntA >STYA PacketPageDATA,x >LDYAI PP.MAC @@ -371,6 +371,10 @@ CLOSE ldx DEVSLOTx0 >LDYAI PP.SelfCTL.LID+PP.SelfCTL.RESET >STYA PacketPageDATA,x + lda #0 +.1 dec + bne .1 + >LDYAI PP.SelfCTL >STYA PacketPagePTR,x >LDYAI PP.SelfCTL.LID diff --git a/INC/NET.8900A.I.txt b/INC/NET.8900A.I.txt index 5dabed56..31396eb1 100644 --- a/INC/NET.8900A.I.txt +++ b/INC/NET.8900A.I.txt @@ -29,7 +29,7 @@ PP.RxCTL.MulticastA .EQ %00000010.00000000 PP.RxCTL.IA .EQ %00000100.00000000 PP.RxCTL.BroadcastA .EQ %00001000.00000000 *PP.RxCTL.CRCerrorA .EQ %00010000.00000000 -*PP.RxCTL.RuntA .EQ %00100000.00000000 +PP.RxCTL.RuntA .EQ %00100000.00000000 *PP.RxCTL.ExtradataA .EQ %01000000.00000000 PP.TxCFG .EQ $0106 Transmit Configuration (RW) PP.TxCMD .EQ $0108 Receiver Control (RW) diff --git a/LIB/LIBTCPIP.S.HST.txt b/LIB/LIBTCPIP.S.HST.txt index 45442996..ce72c31e 100644 --- a/LIB/LIBTCPIP.S.HST.txt +++ b/LIB/LIBTCPIP.S.HST.txt @@ -7,6 +7,7 @@ AUTO 6 *-------------------------------------- HST.GetByName >PULLW ZPPtrDNS >PULLW ZPPtrIP + jsr HST.ScanIP bcc .9 jmp DNS.QUERY.I diff --git a/LIB/LIBTCPIP.S.SKT.txt b/LIB/LIBTCPIP.S.SKT.txt index a6c82e99..dc9ccb78 100644 --- a/LIB/LIBTCPIP.S.SKT.txt +++ b/LIB/LIBTCPIP.S.SKT.txt @@ -827,6 +827,8 @@ SKT.AddDataToSktOut inc beq .8 + pha + .2 lda (ZPDataInPtr),y sta (ZPTmpPtr2) iny diff --git a/LIB/LIBTCPIP.S.txt b/LIB/LIBTCPIP.S.txt index 26404975..4f2b95f7 100644 --- a/LIB/LIBTCPIP.S.txt +++ b/LIB/LIBTCPIP.S.txt @@ -1,6 +1,6 @@ PR#3 PREFIX /A2OSX.SRC -LOMEM $A00 +LOMEM $900 INC 1 AUTO 6 .LIST OFF @@ -107,6 +107,8 @@ L.TCP.IN.JMP .DA TCP.IN.JMP.CLOSED .DA TCP.IN.JMP.FINWT2 .DA TCP.IN.JMP.CLOSING .DA TCP.IN.JMP.TIMEWT +L.DUMP.LEN .DA DUMP.LEN +L.DUMP.DATA .DA DUMP.DATA .DA 0 *-------------------------------------- LIB.LOAD lda bFirstLoad @@ -164,6 +166,8 @@ POLL ldx #DEVMGR.READBLOCK bne .9 cpx /S.ETH.ETHERTYPE.IP bne .9 + + jsr DumpFrame jmp IP.IN @@ -211,6 +215,24 @@ DecDataInLen lda ZPDataInLen .9 rts *-------------------------------------- NetDevJmp jmp * +*-------------------------------------- +DumpFrame ldy #3 + lda (ZPFrameInPtr),y + cmp #$ff + beq .9 + + >PUSHW ZPFrameInLen + >LDYA L.DUMP.LEN + >SYSCALL CPrintFYA + + ldy #63 +.1 >PUSHB (ZPFrameInPtr),y + dey + cpy #1 + bne .1 + >LDYA L.DUMP.DATA + >SYSCALL CPrintFYA +.9 rts *-------------------------------------- .INB LIB/LIBTCPIP.S.ARP .INB LIB/LIBTCPIP.S.CFG @@ -225,6 +247,9 @@ NetDevJmp jmp * *-------------------------------------- CS.END *-------------------------------------- +DUMP.LEN >CSTR "Len :%D\r\n" +DUMP.DATA >CSTR "Data:%h%h%h%h%h%h%h%h%h%h%h%h%h%h %h%h%h%h%h%h%h%h%h%h%h%h%h%h%h%h\r\n %h%h%h%h%h%h%h%h%h%h%h%h%h%h%h%h %h%h%h%h%h%h%h%h%h%h%h%h%h%h%h%h\r\n" +*-------------------------------------- ARP.REQ .DA S.ARP-2 Frame size ARP.REQ.DSTMAC .HS FFFFFFFFFFFF ARP.REQ.SRCMAC .BS 6 @@ -293,7 +318,6 @@ TmpDWord .BS 4 TmpOffset .BS 2 hFrameIn .BS 1 hFrameOut .BS 1 -* hSocket .BS 1 bTextMode .BS 1 HST.DecStr .BS 4 HST.IP .BS 5 diff --git a/README.md b/README.md index 9267fb13..d8196b20 100644 --- a/README.md +++ b/README.md @@ -145,10 +145,10 @@ note : '$VAR' does NOT expand Variable | | | -R : Recurse subdirectories | | | RM | Working | -C : Continue On Error | 0.9 | | | | -R : Recurse subdirectories | | -| CP | In Progress | -C : Continue On Error | 0.9 | +| CP | Working | -C : Continue On Error | 0.9 | | | | -R : Recurse subdirectories | | | | | -Y : Dont't Prompt For Override | | -| MV | In Progress | -C : Continue On Error | 0.9 | +| MV | Working | -C : Continue On Error | 0.9 | | | | -R : Recurse subdirectories | | | | | -Y : Dont't Prompt For Override | | | CAT | Working | -A : Show All non printable caracters | 0.9 | diff --git a/SBIN/DHCPCLNT.S.txt b/SBIN/DHCPCLNT.S.txt index ab5c51a2..536332f6 100644 --- a/SBIN/DHCPCLNT.S.txt +++ b/SBIN/DHCPCLNT.S.txt @@ -240,10 +240,11 @@ CS.DOEVENT lda (pEvent) *-------------------------------------- CS.QUIT ldy #hSocket lda (pData),y + beq .1 >LIBCALL hLIBTCPIP,LIBTCPIP.SKT.CLOSEA - lda hLIBTCPIP +.1 lda hLIBTCPIP >SYSCALL UnloadLibA clc rts