Kernel 0.93

LIB/LIBTCPIP.S.SKT.txt

@@ -400,9 +400,10 @@ SKT.Read 		jsr SKT.PullhFDDataInPtrLen
 				sbc ZPDataInLen+1
 				bcs SKT.GetDataFromSktIn	more data in pipe, get full buffer of data
 				
-				stx ZPDataInLen			less data than buff size, Get only INUSED data
+				stx ZPDataInLen			less data than INUSED, Get only INUSED data
 				lda (ZPPtrSKT),y
-				sta ZPDataInLen+1			
+				sta ZPDataInLen+1
+
 				bra SKT.GetDataFromSktIn
 				
 .7				jsr SKT.CheckStream
@@ -499,9 +500,9 @@ SKT.GetDataFromSktIn
 .80				jsr SKT.StoreTCB
 
 				lda #S.TCP.OPTIONS.ACK
-				jsr TCP.OUT.SendOptA
+*				jsr TCP.OUT.SendOptA	trash ZPDataInLen
 				
-*				jsr TCP.SetSocketTCPO.ACK
+				jsr TCP.SetSocketTCPO.ACK
 
 *				jsr TCP.OUT.I			SKT.GetTCB already called 
 
@@ -1061,13 +1062,18 @@ SKT.AddDataToSktIn
 				>SYSCALL printf
 				.FIN
 
-				ldx SKT.Cache+S.SOCKET.TCP.INFREE
-				cpx ZPDataInLen
+				lda SKT.Cache+S.SOCKET.TCP.INFREE
+				sec
+				sbc ZPDataInLen
+				tax
 				lda SKT.Cache+S.SOCKET.TCP.INFREE+1
 				sbc ZPDataInLen+1
 				bcc .9					Not enough room in Q
 
-.66				ldy #S.TCP.SEQNUM+3
+				stx SKT.Cache+S.SOCKET.TCP.INFREE
+				sta SKT.Cache+S.SOCKET.TCP.INFREE+1
+
+				ldy #S.TCP.SEQNUM+3
 				ldx #3
 
 .10				lda (ZPFrameInPtr),y
@@ -1139,8 +1145,7 @@ SKT.AddDataToSktIn
 .9				sec
 				rts
 
-.8				>SBC16 SKT.Cache+S.SOCKET.TCP.INFREE,ZPDataInLen
-				>ADC16 SKT.Cache+S.SOCKET.TCP.INUSED,ZPDataInLen
+.8				>ADC16 SKT.Cache+S.SOCKET.TCP.INUSED,ZPDataInLen
 
 				clc
 
@@ -1151,13 +1156,13 @@ SKT.AddDataToSktIn
 				lda SKT.Cache+S.SOCKET.TCP.INLASTSEQNUM+2
 				adc ZPDataInLen+1
 				sta SKT.Cache+S.SOCKET.TCP.INLASTSEQNUM+2
-				bcc .80
+				bcc .81
 				inc SKT.Cache+S.SOCKET.TCP.INLASTSEQNUM+1
 				bne .80
 				inc SKT.Cache+S.SOCKET.TCP.INLASTSEQNUM
 
 .80				clc
-				rts
+.81				rts
 *--------------------------------------
 * From TCP.OUT
 * Src : hOutMem/OUTTAIL

LIB/LIBTCPIP.S.txt

@@ -58,7 +58,7 @@ ZPTmpPtr1		.EQ ZPLIB+26
 TmpDWord		.EQ ZPLIB+28
 IP.CHECKSUM		.EQ ZPLIB+28
 ZPTmpPtr2		.EQ ZPLIB+28
-*				.EQ ZPLIB+30
+ZPTmpPtr3		.EQ ZPLIB+30
 *--------------------------------------
 *			File Header (16 Bytes)
 *--------------------------------------