From 3903a2001fd9877809ac6e2af59f7b42ae729138 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20GIBERT?= Date: Fri, 7 Apr 2017 08:31:47 +0200 Subject: [PATCH] Kernel version 0.9 : TCP, bugfix (#7) ... --- Floppies/A2OSX.BUILD.po | Bin 819200 -> 819200 bytes Floppies/A2OSX.SRC.po | Bin 819200 -> 819200 bytes LIB/LIBTCPIP.S.TCP.txt | 8 +++++--- README.md | 3 +-- SBIN/TELNETD.S.txt | 11 ++++++++++- 5 files changed, 16 insertions(+), 6 deletions(-) diff --git a/Floppies/A2OSX.BUILD.po b/Floppies/A2OSX.BUILD.po index 8e6f063cb818565ba843ba366c9a8052bfb0ea67..4e5fce653cae970a54bd98b0c5db386f94910b90 100644 GIT binary patch delta 385 zcmZo@FluNp+F-`Y+@@qX*^*U-rA>)lY;z)O;WCiO=Buk~7zH?(8ETc(1e6&bGbn(h zn-kY=Ph88Wxq*>+dv`38EF+`l^p$Z;4nS)4BWB6%%<)XDqF(oE)(vnC}c&E5lR$+~d z!Xh`I#G3EZ14Nj`7{5->EMZb-{4;%G36lup_vy<@n7n}0#}X!S!S70oloXivHW+41 zRO&TS1Zt5iWinPx=xtK$odx77Eiwa2PY_!5!T03e3!V!EHY%-H$uLo=!LGMsdR{4$ zlnkfBF_lRwAeBZyl`H>)cq{cGV$=IdnUsK5Z7gLH=7d_c_WSg+Kz+-~n3(u8lS+~c zG7I$bLtK6QTtlXx5oK20E?vQNhOw=RsjZ5+t%{|sinXnZt*wf^t%{?qinFbXtF4NA ISrrc(02#lAzW@LL delta 362 zcmZo@FluNp+F-`Y+^VE7*^*U-rA5h-Z*wAR;WCiO=Buk~7zN%lG1Mxl2`Do>W>5ez zniJPj?kdrF(MI5{S1NhBy-Ra`5p zutr8o<6aJNrds<^kpSXUO?(&36r?sJ*7oT3e0;O z3^OJw^%^MxwMdpS87sN>)&to}i_Cy>6NFZMFh9BXg7E@@jY=z4GE7uz(CBTQURcT` z#db_(k_u4I@=_)xS*TG}zfPRG@MeMFMx_rNAR|D=ue~>YsVKAZbj}JUfn{Y(Oxq_;$Bw8!v+AFGJmN6 diff --git a/Floppies/A2OSX.SRC.po b/Floppies/A2OSX.SRC.po index 78981bc2ec8a957406c38a0e927e81b490d96c03..9c8d2a24f592cd3bc985b042c2c0eedf8ba9c52b 100644 GIT binary patch delta 3436 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 HdH#O^Owj=) diff --git a/LIB/LIBTCPIP.S.TCP.txt b/LIB/LIBTCPIP.S.TCP.txt index aa2f6cd5..726b600e 100644 --- a/LIB/LIBTCPIP.S.TCP.txt +++ b/LIB/LIBTCPIP.S.TCP.txt @@ -238,7 +238,7 @@ TCP.IN.JMP.ESTBLSH and #S.TCP.OPTIONS.FIN beq .8 - ldy #S.TCP.OPTIONS + ldy #S.SOCKET.TCP.OPTIONS lda (ZPPtrSKT),y ora #S.TCP.OPTIONS.ACK ACK the FIN.... sta (ZPPtrSKT),y @@ -447,7 +447,9 @@ TCP.OUT.SendOpt sta .1+1 TCP.OUT.Send ldy #S.TCP.OPTIONS sta (ZPFrameOutPtr),y - bit #S.TCP.OPTIONS.ACK + + and #S.TCP.OPTIONS.ACK + beq .11 ldx #3 @@ -489,7 +491,7 @@ TCP.OUT.Send ldy #S.TCP.OPTIONS ldy #S.SOCKET.TCP.OPTIONS lda (ZPPtrSKT),y - bit #S.TCP.OPTIONS.FIN + and #S.TCP.OPTIONS.FIN beq .8 ldy #S.SOCKET.TCP.STATUS diff --git a/README.md b/README.md index 89303220..48881dde 100644 --- a/README.md +++ b/README.md @@ -92,9 +92,8 @@ OApple+1,OApple+2,OApple+3 to switch between screens : Kernel Log, text, DHGR. | CD | Working | Improved syntax : now, 'CD ../BIN' works | | PWD | Working | | | DATE | Working | | -| ECHO | Working | \b,\e,\f,\n,\\ and \% supported | +| ECHO | Working | \b,\e,\f,\n,\\\ and \\% supported | | EXIT | Working | | -| IF | | | | PAUSE | Working | | | READ | Working | -S : no echo (password) | | | | -P : "prompt message" | diff --git a/SBIN/TELNETD.S.txt b/SBIN/TELNETD.S.txt index 5481e86c..4df584fa 100644 --- a/SBIN/TELNETD.S.txt +++ b/SBIN/TELNETD.S.txt @@ -172,6 +172,7 @@ CS.RUN.CLIENT ldy #SktIndex beq .8 sta .1+1 hSocket + sta .3+1 >LIBCALL hLIBTCPIP,LIBTCPIP.SKT.GetCA bcc .10 @@ -189,7 +190,6 @@ CS.RUN.CLIENT ldy #SktIndex bra .8 .10 sta .2+1 - >PUSHA >LDYA L.MSG.BYTE >SYSCALL CPrintFYA @@ -199,6 +199,15 @@ CS.RUN.CLIENT ldy #SktIndex .2 lda #$ff data and #$7F + ora #$20 + >PUSHA + + >LIBCALL hLIBTCPIP,LIBTCPIP.SKT.PutC + +.3 lda #$ff hSocket + >PUSHA + + lda #'/' >PUSHA >LIBCALL hLIBTCPIP,LIBTCPIP.SKT.PutC