From 49f95d618409d7b7c1b32b0b84b07c901c02db95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20GIBERT?= <burniouf@users.noreply.github.com>
Date: Mon, 5 Nov 2018 08:12:31 +0100
Subject: [PATCH] Kernel 0.9.2

---
 .Floppies/A2OSX.BUILD.po | Bin 819200 -> 819200 bytes
 .Floppies/A2OSX.SRC.po   | Bin 819200 -> 819200 bytes
 BIN/PING.S.txt           |  55 +++++++++++++++++++++------------------
 3 files changed, 30 insertions(+), 25 deletions(-)

diff --git a/.Floppies/A2OSX.BUILD.po b/.Floppies/A2OSX.BUILD.po
index abdb71360c9a9533350102aff3ed24cdcff1b530..241e0cd9c726ca82079a3df893a1a2e726a923ff 100644
GIT binary patch
delta 838
zcmYjPO=uHA6rSvET9dRSkp9HlHq+fnZPQju5R8Qu4?T#~n+K^Ytk{AP>OsBeB@4Ez
zmq4}(ErKvCrm&iUY&`UoLJyXvAofr%(||Sg;zi@ZilW7tT^0B6-rM*4z3+{#r*u74
zT9>4mL{G=dSJDKIT#&$(gc4A|K7ibNKU#PYE%;WW1>x((Y^&G;&Po8J;3OQEcjZ>4
z9rd6%N}vwqlrpQ_QywdCl@|&C#TX<<p|uP_r6lFrP)sYfA*%_BmHEAe_vO9Oa8ZUt
zfmV`b*l*Gr1`h2qsa56`cjxO1`);UQua0bYV4qWOWU3RR`Pu4N>FQt@`%J38hQDMI
zha0uU8tHXaVW0mL>Rj@9-E3Z7hLH-Cl>E-p`VS$R?T6$z)VujSESPla8YFSF-EIT7
z2tks7)}_Co1jj?fW6NAvVkM5au@yP6o7|ECNCv$UOT=Mk?`bD`xE1+^{p8bHPC+K!
zB%jxEh#9tTqn2H)*??n%99y`Ugk<PH7DSVtBged*x?FXgC(At9r(wTCbAxD;$t1$f
zX@_QjNpnNo<66UrapJ9F4{&s(&+7$Ug+(VxdA}6vSGvq{88=qHd!(w^IM3p4c$AN8
zS@|glS<c)$I3<@-dLNe9fj+Qoeja#3F7;xG5maX$EZGbRyAy5r#~Oad>!ZH3R^EvO
zaDe&5F_We>MqcMX@+6nM6Of$r$kXhBG!A^BIOui?ne=(16UTxMjb&zV(4_fh9CF{t
z*7ipnS~3oWGpC0k8TnJrp)~v+7`6s8Qw$erL(F=@tQZ@B118njl%<11;rlajx_3M=
zGYs!!=4QtelW^{~dP}_tfB?KtSZ$pa>pnvj4OKE!zo9l6YO|ppG1P#e1`Rc|qPC#l
Djm=`W

delta 771
zcmXv~OK1~O6n&YQ{A}~7shIxa?aZW~SS4g*TC8;8LPU36*gB<IR3u0%sQV7I9o+;n
zb`dEQ9)l^2WFS))U8NwXG~G0at4E<Vbt4pw)DM=TzBkdgxbJZ9yXTyDR5hilsq!m9
zn2rwxUcM2o;P7PuO~oa@gbol)#rypWk>cY>(X|mNa^J^qo^W9_CLnYX#vmbXizlKW
zx65uxlE$U1v>?5fRwRT<QLs9|cm}9a7IM5C&6IfA@Bm*~++X^zzMl-0Vql#sOdNCF
zvGscOLahV4?0VyVHJQIx9Vy=(3}Kf})OT>WtbS`RO!oL%uQ7^lN|6^KT!AAozf(MT
zyZdyvSZCGbSS^WQNuc&%WE0Hk<i<2$-X^s(CUV9AR&U{$s?KANK?kcrnf0G+hmTB;
z^FjtI4#q9&+~9G@-e2{}bovwft<Rge)3Q#stS_6n2nALbunnuzxtKd(?n0$Lu=>GB
zPzrM=oxxt6V82arQF)8j4jH$kZ8DcdI>~jimV>%vI24;E%>jqDr^(*!T-a+9rjViv
z<=gZrjlk%0;;r(H>;K0|W}ua2vj@XsIi>bupH7UAuy(?6^Qf{|UpjyZu^hubn;3Pv
zk9{UJLc=Ew_ejG{6H|NBnf3Q!KMv3yKcbU##t^W_Ce5H~KTN?1DgoB{W>6V(AdLfG
z2@X13A)UNvoW((#M6)wEsFS>x21z<;4%@X)I8-S7=7ui~fHnAUotbI4n|A0wDNIpk
z7B5q@LQ#|o;DAmtRHfkk!~JR-jn53hqwMUR(fC!EeW*Nm&QAuEIYf_(6@)folYHH^
h9Ol|Ih1V28Q{0;3(G;(y_%y|@DW^20Wld?7{{k)zM2G+Y

diff --git a/.Floppies/A2OSX.SRC.po b/.Floppies/A2OSX.SRC.po
index 437fc3f3d343cd00f6db94c7cb87080b12d135a4..6d3dca317719f5277cfb316e84bb1e003986579d 100644
GIT binary patch
delta 4099
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

delta 3900
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
Q)=y3sOimk4Obbu_9}iEIrvLx|

diff --git a/BIN/PING.S.txt b/BIN/PING.S.txt
index 93821309..ec06ee29 100644
--- a/BIN/PING.S.txt
+++ b/BIN/PING.S.txt
@@ -35,7 +35,9 @@ CS.START		cld
 				.DA CS.DOEVENT		
 				.DA	CS.QUIT
 L.LIBTCPIP		.DA LIBTCPIP
-L.Socket		.DA Socket
+L.SA.LOCAL		.DA SA.LOCAL
+L.SA.REMOTE		.DA SA.REMOTE
+L.SA.REMOTE.AD	.DA SA.REMOTE+S.SOCKADDR.ADDR
 L.ICMP.Request	.DA ICMP.Request
 L.MSG.IPKO		.DA MSG.IPKO
 L.MSG.USAGE		.DA MSG.USAGE
@@ -71,10 +73,11 @@ CS.RUN.IPOK
 				>SYSCALL ArgV
 				bcs .8
 				>STYA ZPTmpPtr
+				>SYSCALL puts
 				
 				lda (ZPTmpPtr)
 				cmp #'-'
-				bne .2
+				bne .21
 
 				ldy #1 
 				lda (ZPTmpPtr),y
@@ -89,9 +92,9 @@ CS.RUN.IPOK
 				>STA.G PingCount
 				bra .1			
 				
-				jsr Init.Timeout
+.21				jsr Init.Timeout
 				
-.2				>PUSHEA.G DST.IP
+.2				>PUSHW L.SA.REMOTE.AD
 				>PUSHW ZPTmpPtr
 				>LIBCALL hLIBTCPIP,LIBTCPIP.HST.GETBYNAME
 				bcc .3
@@ -108,7 +111,7 @@ CS.RUN.IPOK
 				>STA.G ArgHostName
 				jmp .1
 				
-.8				>LDA.G DST.IP
+.8				lda SA.REMOTE+S.SOCKADDR.ADDR
 				bne CS.RUN.ARGSOK
 				
 .9				>PUSHBI 0
@@ -124,13 +127,10 @@ CS.RUN.ARGSOK	>LDA.G ArgHostName
 				>SYSCALL ArgV
 				>PUSHYA
 				
-				ldy #DST.IP+3
 				ldx #3
 				
-.1				lda (pData),y
-				sta Socket.Dst.Addr,x
+.1				lda SA.REMOTE+S.SOCKADDR.ADDR,x
 				>PUSHA
-				dey
 				dex
 				bpl .1
 				
@@ -142,21 +142,22 @@ CS.RUN.OPENSKT	ldx #3
 				ldy #S.IPCFG.IP+3
 				
 .1				lda (ZPIPCfgPtr),y
-				sta Socket.Src.Addr,x
+				sta SA.LOCAL+S.SOCKADDR.ADDR,x
 				dey
 				dex
 				bpl .1
 				
 				ldy #Identifier
 				lda A2OSX.RANDOM16
-				sta Socket.Dst.Port
+				sta SA.REMOTE+S.SOCKADDR.PORT
 				sta (pData),y
 				iny
 				lda A2OSX.RANDOM16+1
-				sta Socket.Dst.Port+1
+				sta SA.REMOTE+S.SOCKADDR.PORT+1
 				sta (pData),y
 				
-				>PUSHW L.Socket
+				>PUSHBI S.IP.PROTOCOL.ICMP
+				lda #S.SOCKET.T.RAW
 				>LIBCALL hLIBTCPIP,LIBTCPIP.socket
 				bcc .2
 				
@@ -167,6 +168,12 @@ CS.RUN.OPENSKT	ldx #3
 				rts
 				
 .2				>STA.G hSocket
+				pha
+				>PUSHW L.SA.LOCAL
+				pla
+				>LIBCALL hLIBTCPIP,LIBTCPIP.Bind
+				bcc CS.RUN.SEND.ECHO
+				rts
 
 CS.RUN.SEND.ECHO				
 				ldy #Identifier
@@ -251,13 +258,11 @@ CS.DOEVENT		lda (pEvent)
 				rts
 *--------------------------------------
 CS.Print.UNREACH
-				ldx #4
-				ldy #DST.IP+3
+				ldx #3
 				
-.1				>PUSHB (pData),y
-				dey
+.1				>PUSHB SA.LOCAL+S.SOCKADDR.ADDR,x
 				dex
-				bne .1
+				bpl .1
 				
 				>PUSHBI 4
 				>LDYA L.MSG.UNREACH
@@ -349,14 +354,15 @@ MSG.UNREACH		.AZ "%d.%d.%d.%d: TimeOut/Host unreachable\r\n"
 MSG.REPLY		.AZ "32 bytes from %d.%d.%d.%d, icmp_seq=%D, ttl=%d, time=%D ms\r\n"
 hLIBTCPIP		.BS 1
 *--------------------------------------
-Socket			.DA #S.SOCKET.T.RAW
+SA.LOCAL		.DA #AF.INET			S.SOCKADDR.AF
 				.BS 1
-				.DA #S.IP.PROTOCOL.ICMP
+				.BS 4					S.SOCKADDR.ADDR
+				.BS 2					S.SOCKADDR.PORT
+*--------------------------------------
+SA.REMOTE		.DA #AF.INET			S.SOCKADDR.AF
 				.BS 1
-Socket.Src.Addr	.BS 4
-Socket.Src.Port	.DA 0					Dynamic
-Socket.Dst.Addr	.BS 4
-Socket.Dst.Port	.DA 0					Identifier
+				.BS 4					S.SOCKADDR.ADDR
+				.BS 2
 *--------------------------------------
 ICMP.Request	.DA #S.ICMP.TYPE.ECHOREQ
 				.DA #0					CODE
@@ -373,7 +379,6 @@ DS.START
 ArgIndex		.BS 1
 PingCount		.BS 1
 ArgHostName		.BS 1
-DST.IP			.BS 4
 hSocket			.BS 1
 hFrame			.BS 1
 Identifier		.BS 2