From 42fc2a01e109fac04cc12c280931a9cd0673cc5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20GIBERT?= <burniouf@users.noreply.github.com>
Date: Thu, 27 Sep 2018 17:34:38 +0200
Subject: [PATCH] Kernel 0.9.2

---
 .Floppies/A2OSX.BUILD.po | Bin 819200 -> 819200 bytes
 .Floppies/A2OSX.SRC.po   | Bin 819200 -> 819200 bytes
 LIB/LIBTCPIP.S.SKT.txt   |  19 ++++++++++++++++++-
 LIB/LIBTCPIP.S.TCP.txt   |   8 ++++----
 LIB/LIBTCPIP.S.txt       |   6 +++++-
 SBIN/TCPIPD.S.txt        |   9 +++------
 6 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/.Floppies/A2OSX.BUILD.po b/.Floppies/A2OSX.BUILD.po
index b7bcc39379c848ffd2e8236f6ce62ee7736dc5bf..9e14b66f97de7d83d9e1b07763dcbc9b0b264ba5 100644
GIT binary patch
delta 155
zcmZo@FluNp+7QdiVy&tvusM<S<Z^*%1_oDUSutgX#|#P}(Ppc)+pX3zp4sEb#Nf}s
zz~BJHG77p1<_fL~{t65XYa|rbN-8Xxp}??r19NYbLc*FTg+&|+%zGsgHeC_m0P(nh
zJd1?2QQQ5pm^Lv^7GPp;%VBEEVQ$M|Y0F`4%VBHF0g7<6<#4v;aJA)dFU#Q(0RTpz
BEkXbQ

delta 158
zcmZo@FluNp+7QdiVx=k|vN@6U<Z^)|1_oDUSutgX#|#SWs@i<bR%^Fgtz|s3$Af_(
zjDdl{0f=Q3Ocd-Cd=$bI7#P+_D6ExKSTsX{Veba6-b95>*EpFbU6V*ylc=zWLxFj(
zM8c*k0vsS77m#O>ur_hKdlu6s#<m=$wjAcR9G12m*0vnBwjB1h9FDde&bAz`wjAzd
HIXof&5sfdZ

diff --git a/.Floppies/A2OSX.SRC.po b/.Floppies/A2OSX.SRC.po
index af7df100ae26c802bb260b58323f8d576db1b95b..e28d96cd78e73e69e173ef1b3e5a749bc7e87126 100644
GIT binary patch
delta 476
zcmZo@FluNp+Q84sVy&tnuvwUOk+6Uj3xlh&pr|s#<74??(W4S6W=vut(+`@mi1LUs
z%+zynY*aR2kQSRB$j>Y_JzyuZ5u?HMp0%tx)7S50))Ev}fT(c})^qW94RiHd6cEQ4
zGQC8KO-F=F86s!Ez@fsRbwEv*K}L1*x<%3fY78^&f+K^S9esQneex4id@_?5c+?qY
zCM6d)>RDPc2x&0PEG|iG%<%Da3ULnb3}E2YV$hnAoRiGJt<3;bF|DYin1MqFVyL$6
z^tENID)IsTK0XW_dJHo`>NxZnW`Y$NKom(EPIF<A<mEO3+ES1Mw1q*<c(UVqRW=ib
znGDLNlXKQ937SE*m_xKkT1;>F!y>_C$uPaafmL)mvmK+j2$wAb(5tR~E({!Y5M{FV
zlh+@YmJoJefIGKa&ndXkkb%PysAACu3lpHvxt%~^5$fw3$-w0dWcmj+8Zhv<Ft`Nk
z1&25Wg)s2Bg4jTV`}ACahP!QFn8Fm#I9Y%xx9L^eE5^20Ol_~2+g`D>y<%;9#n$$U
Tz3ml8+bhntS6s_paZdvPwTpwj

delta 589
zcmX|;&rj1}7{{M=EtGC-!)>@x6j|BWkI?-PCqu<`YlX!E9qml;pcz|?CQC*f@!T5e
z#l%aKHRa|G-b4}(#v2zeoctfWy?=uT3-7}1dB4x+dA`r{yt-b}_0n08BG;3_$a$C=
zg+p&hkhqyB2Y*lclgV7*{CBKd_A?Q1cu_D4z((z6&^zauwVS`ZbL?%bbLG`zRfRxo
z{45;5RP2*HnW3lVA$yTp`D9<_$wWH5fPuQoi@VYbX-9+5y&I|7YG}YNg3OPUS61_4
zHo_!uvH&!9-3R8EEa8-`CBfNH_tm-}%ZA)<cjb2n;7@^b&>0wfr2@B>!5JL2jkj{6
zrqz{(0)Y%Ty>8n`A1Z?kq_g%SNi1h`7{emH0#2vb0Ur-;kKy~H0nmADn=9DgKTu27
zpVNtW5mR&toNMGhM%dM%NXDmq58NpZd+rpFD%-^c>h84Cl2r+)hu{FWW>tSAW-8;-
zbzB;MWb6OP81Wcvy-Gz(PsR=#W9%u$m@2r3lXgU)1+3hu0bX!)wr2MQD*C(*H!FYU
zYpPKMTEwhRy1Hd+dwU<4XKuK==YFSu6GW9)HDOPKz}8jlw*SIQu0`YL*DmqeV}%Ie
gBQlZ4M1+aFCL&ElnP|d9lP01~G-V>@8}beR1O7^%DF6Tf

diff --git a/LIB/LIBTCPIP.S.SKT.txt b/LIB/LIBTCPIP.S.SKT.txt
index c76998e9..3bdc1d9a 100644
--- a/LIB/LIBTCPIP.S.SKT.txt
+++ b/LIB/LIBTCPIP.S.SKT.txt
@@ -44,6 +44,23 @@ AUTO 4,1
 * CC: A = hSOCKET
 * CS: A = EC
 *\--------------------------------------
+SKT.connect		>SYSCALL GetMemPtr
+				>STYA ZPPtrSKT
+				
+				>PULLW ZPTmpPtr1		sockaddr
+				
+				ldy #S.SOCKET.SOCK
+				lda (ZPTmpPtr1),y
+				tax
+				jmp (J.SKT.connect,x)
+				
+SKT.connect.RAW
+SKT.connect.DGRAM
+
+
+SKT.connect.STREAM
+SKT.connect.SEQPACKET
+				
 */--------------------------------------
 * # SKT.listen
 * Create a new socket
@@ -162,7 +179,7 @@ SKT.New			>PULLW ZPTmpPtr1
 				ldy #S.SOCKET.TCP.OPTIONS
 				lda (ZPPtrSKT),y
 				ora #S.TCP.OPTIONS.SYN
-				jsr TCP.OUT.SendOptA	Send SYN,Only for CLIENT conn,or SYN/ACK if comminf from LISTEN
+				jsr TCP.OUT.SendOptA	Send SYN,Only for CLIENT conn,or SYN/ACK if coming from LISTEN
 				bcs .99
 				
 				ldy #S.SOCKET.TCP.STATUS
diff --git a/LIB/LIBTCPIP.S.TCP.txt b/LIB/LIBTCPIP.S.TCP.txt
index f4e8d816..90d1192d 100644
--- a/LIB/LIBTCPIP.S.TCP.txt
+++ b/LIB/LIBTCPIP.S.TCP.txt
@@ -58,7 +58,7 @@ TCP.IN			jsr IP.FillSKT.TemplateSrcDstIPP
 				asl
 				tax
 				
-				jmp (L.TCP.IN.JMP,x)
+				jmp (J.TCP.IN,x)
 				
 .7				lda ZPPtrSKT
 				clc
@@ -81,9 +81,11 @@ TCP.IN.JMP.LISTEN
 				sta SKT.Template+S.SOCKET.SOCK
 				stz SKT.Template+S.SOCKET.SO
 				stz SKT.Template+S.SOCKET.TCP.STATUS
-				lda #S.TCP.OPTIONS.ACK
+				lda #S.TCP.OPTIONS.SYN+S.TCP.OPTIONS.ACK
 				sta SKT.Template+S.SOCKET.TCP.OPTIONS
 				
+				jsr ARP.AddFromFrameInPtr
+
 				>PUSHW L.SKT.Template
 
 				jsr SKT.New				Assign OUTNEXTSEQ
@@ -106,8 +108,6 @@ TCP.IN.JMP.LISTEN
 				
 				jsr SKT.StoreTCB
 				
-				jsr ARP.AddFromFrameInPtr
-
 				lda #S.TCP.OPTIONS.SYN+S.TCP.OPTIONS.ACK
 				jsr TCP.OUT.SendOptA	SYN received, Send SYN.ACK
 				bcs .9
diff --git a/LIB/LIBTCPIP.S.txt b/LIB/LIBTCPIP.S.txt
index ee5d05db..e1f28606 100644
--- a/LIB/LIBTCPIP.S.txt
+++ b/LIB/LIBTCPIP.S.txt
@@ -113,7 +113,7 @@ L.SKT.Template	.DA SKT.Template
 L.HST.SScanF	.DA HST.SScanF
 L.IOCTL			.DA IOCTL
 L.DCB.NIC		.DA DCB.NIC
-L.TCP.IN.JMP	.DA TCP.IN.JMP.CLOSED
+J.TCP.IN		.DA TCP.IN.JMP.CLOSED
 				.DA TCP.IN.JMP.LISTEN
 				.DA TCP.IN.JMP.SYNSENT
 				.DA TCP.IN.JMP.SYNRCVD
@@ -124,6 +124,10 @@ L.TCP.IN.JMP	.DA TCP.IN.JMP.CLOSED
 				.DA TCP.IN.JMP.FINWT2
 				.DA TCP.IN.JMP.CLOSING
 				.DA TCP.IN.JMP.TIMEWT
+J.SKT.connect	.DA SKT.connect.RAW
+				.DA SKT.connect.DGRAM
+				.DA SKT.connect.STREAM
+				.DA SKT.connect.SEQPACKET				
 				.DA 0
 *--------------------------------------
 LIB.LOAD		ldx RefCount
diff --git a/SBIN/TCPIPD.S.txt b/SBIN/TCPIPD.S.txt
index 9bf821ec..21cbd07b 100644
--- a/SBIN/TCPIPD.S.txt
+++ b/SBIN/TCPIPD.S.txt
@@ -17,7 +17,8 @@ CS.START		cld
 				jmp (.1,x)
 				.DA #$61				6502,Level 1 (65c02)
 				.DA #1					BIN Layout Version 1
-				.DA 0
+				.DA #S.PS.F.EVENT
+				.DA #0
 				.DA CS.END-CS.START		CS
 				.DA DS.END-DS.START		DS
 				.DA #64					SS
@@ -38,11 +39,7 @@ CS.INIT			>LDYA L.LIBTCPIP
 				bcs .99
 				sta hLIBTCPIP
 
-				lda (pPs)
-				ora #S.PS.F.EVENT		Now accept events
-				sta (pPs)
-
-				clc
+*				clc
 .99				rts
 *--------------------------------------
 CS.RUN			>LIBCALL hLIBTCPIP,LIBTCPIP.POLL