From 343efe71f49451a88a2ef9a46b667fd1ba0c2891 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20GIBERT?= Date: Wed, 17 Jan 2018 06:56:16 +0000 Subject: [PATCH] Kernel 0.9.1 : TCPIP, bugfix in DNS,ARP cache --- .Floppies/A2OSX.BUILD.po | Bin 819200 -> 819200 bytes .Floppies/A2OSX.SRC.po | Bin 819200 -> 819200 bytes BIN/ARP.S.txt | 2 ++ BIN/NETSTAT.S.txt | 2 +- DRV/UTHERNET.DRV.S.txt | 1 + DRV/X.NET.DRV.S.txt | 38 +++++++++++++++++++++----------------- 6 files changed, 25 insertions(+), 18 deletions(-) diff --git a/.Floppies/A2OSX.BUILD.po b/.Floppies/A2OSX.BUILD.po index ded14c77a3ac6eff88a56b1198476836d7a350e3..7e533d3ca75357f6016cd318b69f44be1c0880b5 100644 GIT binary patch delta 1104 zcmY*XZ)h837=PcpTbo?d)eaq3;VpIe&4|t4xf4Iz|h0~L(eVyC*VamHwhVa@J+UJxoHZ12XoVq*?L((MG zp$iBM09~jb4dYkvX*`bIQiBx5U*ek>fV7D8W|TaKfRW*qdMUf^bj+@c!Gy55USyxY ziS$-<<;Ls{y~T!yY44BLR>6W*uI%kZ&0UdpHgKyp{RAul!CnpQ9Ti1 zl(`9p;o9HoYtKzGcVKRcc^!r5i(0?(2hNr&!wF`wY}RG|;pdIc>a0db6%ufj{ z*f?2Wi+^UzCKqKijwah1G3@oFTdaLnTeUhxk#cGy1R@*i+C0-#cP#Yk$=60gBfCz3 zU43bQ-N&0`MxI<1Zqxf` z1MG1)s@4Zs#F<22Rd)y22U@NY{ThiYg>&)gLgI)9;~!IZs*qkI`gQeafNg`i`eA?_ ziwO*u+s`^KHA(O+RN;0;!cXGkc$WSu$^@Q{sBJvA3x1*w@m%wePP8A+Z{;;W_NURfi9zvY$d z>K8oM`E&v#!J=I8t{@&~cJTDXO+o|rR|EB}CZYGA%QeN480-z2a#HTB#KHvvfCiNnvOov1R-)~(XP^Ug zhbse&Gl0*{W;dtSPVK&-4%KFD4i`tw!WwF|)Ev~D P)Oc!j%MO=o>z)4q3o*C2 delta 1040 zcmY*XUu;uV96o<8TYG!$E@Y!cH+IfFZJ7_wF+sNp$uF`l~{|DF5ro%?;? z@B97E$%#bzBa!~xbpb!=8=Sr&_=H|xk62t4K8A7zfiueXHU@qG-~@ZhUHqt}mTc>= z*dEzpiB+@r@@YTVb>O-EdtZ4u2<+9e3L!WT!4c-!ux8ZRdgt`&<$cgIy>pJ>8P;D6 z&3yvfzQH_f&<=aT*IN8BbMU*;ODeny_0gkP&WuA;lH;%mr)4BBBp`ZtSR!vi0AvJ! zkL)13>1*^u8lj@%RuZ&CS1174c4Bsr^aTRSIZ<;eg(atBYRMZ)$@!%Q-n~N1P2}di zse7i^29FIJ^-vViv3IEXm`yxt!~e`#r;>IPTt3%9j?>(BBA3$vtIt<8-1JAjNUtlq z6)SsD{wbBfsmE5fv3b)qW80%#O$)Av{<-56GQ#NW@2{hPsdQV z(w<*#;-Sgqfsn~-F7kSQj&`GGayc}RvP7tFoj{xQ^D*?E;6FCx&!`9q9FLWD&7jY% zd)v7XM@LAQMu{=3{Xz?*xi5wCq~^-~DbAO-kei)To#nt9q+s60HXFyQxbbU&)P!@$ z5V*O^Hg~SUe+Hi;-Y|)gIT{8rs@La{$0Z&Qzjf;Eli`!SCrS_I(fV1zfXRuO5j@!X zsgj5)nyL?v;0~DA502nx#X6hp8()-vzmnH4jo|m;nC=W>vaQa{+bpS7FC-Jy)L|=u zZ{yYM*UW7E!@vG7e}|cO^*4gJo9CVh;<1Gnu;Yd&04LxjxDf^D^YjBc!=H#2r-`$A zwj z{rV2<*A*k+H%XL~%- zbeOl8Gs0zC^V-@qt_|DTFxRqIshOkRkmEEDQ6)i@)~Qm9Dz&PTLzSGWB&w1tBT1+J E0wnm1YybcN diff --git a/.Floppies/A2OSX.SRC.po b/.Floppies/A2OSX.SRC.po index c3d11bbd5dc5da306c97a777bda03cf8b5a43442..8f50f7fd39d5c6c3d0ca4fce842c3be403b1e295 100644 GIT binary patch delta 6323 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 delta 6274 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 A(EtDd diff --git a/BIN/ARP.S.txt b/BIN/ARP.S.txt index d2335b2f..a9bb3070 100644 --- a/BIN/ARP.S.txt +++ b/BIN/ARP.S.txt @@ -21,6 +21,8 @@ CS.START cld .DA #$61 6502,Level 1 (65c02) .DA #1 BIN Layout Version 1 .DA 0 + .DA CS.END-CS.START CS + .DA DS.END-DS.START DS .DA #16 SS .DA #2 ZP .DA 0 diff --git a/BIN/NETSTAT.S.txt b/BIN/NETSTAT.S.txt index dad00b84..1de14a10 100644 --- a/BIN/NETSTAT.S.txt +++ b/BIN/NETSTAT.S.txt @@ -128,7 +128,7 @@ CS.QUIT lda hLIBTCPIP rts *-------------------------------------- CS.END -LIBTCPIP >PSTR "libtcpip.o" +LIBTCPIP >CSTR "libtcpip.o" MSG0 >CSTR "Proto Local Remote Options Status\r\n" MSG1 >CSTR "%s %03d.%03d.%03d.%03d:%05D %03d.%03d.%03d.%03d:%05D %b %s\r\n" MSG1.UDP >CSTR "UDP" diff --git a/DRV/UTHERNET.DRV.S.txt b/DRV/UTHERNET.DRV.S.txt index 55ced03c..c192bc86 100644 --- a/DRV/UTHERNET.DRV.S.txt +++ b/DRV/UTHERNET.DRV.S.txt @@ -91,6 +91,7 @@ Dev.Detect >STYA ARGS >LDYA ARGS >STYA ZPTmpPTR + lda (ZPTmpPTR) bne .4 diff --git a/DRV/X.NET.DRV.S.txt b/DRV/X.NET.DRV.S.txt index b69da5f3..781ce7c2 100644 --- a/DRV/X.NET.DRV.S.txt +++ b/DRV/X.NET.DRV.S.txt @@ -3,14 +3,13 @@ PREFIX /A2OSX.BUILD AUTO 4,1 .LIST OFF *-------------------------------------- -DecodeMac lda (ZPTmpPTR) - cmp #12 - bne .9 - - ldy #1 +DecodeMac ldy #0 ldx #0 - + .1 lda (ZPTmpPTR),y + beq .9 + iny + jsr Asc2NibbleA bcs .9 @@ -20,16 +19,18 @@ DecodeMac lda (ZPTmpPTR) asl sta MAC,x - iny lda (ZPTmpPTR),y + beq .9 + + iny + jsr Asc2NibbleA bcs .9 ora MAC,x sta MAC,x inx - iny - cpy #13 + cpx #6 bne .1 clc @@ -38,22 +39,25 @@ DecodeMac lda (ZPTmpPTR) .9 sec rts *-------------------------------------- -Asc2NibbleA cmp #$30 +Asc2NibbleA cmp #'0' bcc .9 - cmp #$3A + cmp #'9'+1 bcs .1 and #$0F - clc +* clc rts -.1 cmp #$41 + +.1 cmp #'A' bcc .9 - cmp #$47 - bcs .9 + cmp #'F'+1 + bcs .99 + sbc #$36 - clc +* clc rts + .9 sec - rts +.99 rts *-------------------------------------- MAN SAVE /A2OSX.SRC/DRV/X.NET.DRV.S