Apple-2-SW/A2osX
1
0
Fork 0
mirror of https://github.com/A2osX/A2osX.git synced 2025-02-16 18:30:26 +00:00
Code Issues Projects Releases Wiki Activity

Kernel version 0.9 : TCP, fix in PutC not writing in the right buffer ;-)

Browse Source
This commit is contained in:
Rémy GIBERT 2017-03-23 08:32:11 +01:00
parent 68110dc42a
commit 0ff04e7815
7 changed files with 33 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
A2OSX.BOOT.po
View File

Binary file not shown.

BIN
A2OSX.DEV.po
View File

Binary file not shown.

BIN
A2OSX.SRC.po
View File

Binary file not shown.

4
INC/LIBTCPIP.I.txt
View File

@ -179,8 +179,8 @@ S.TCB.OUTUSED .EQ 10
S.TCB.INFREE .EQ 12 S.TCB.INFREE .EQ 12
S.TCB.OUTFREE .EQ 14 S.TCB.OUTFREE .EQ 14
S.TCB.SEQNUM .EQ 16 S.TCB.SEQNUM .EQ 16
S.TCB.NEXTSEQNUM .EQ 20 S.TCB.ACKNUM .EQ 20
S.TCB.ACKNUM .EQ 24 S.TCB.NEXTSEQNUM .EQ 24
* *
S.TCB .EQ 32 S.TCB .EQ 32
*-------------------------------------- *--------------------------------------

29
LIB/LIBTCPIP.S.SKT.txt
View File

@ -407,7 +407,7 @@ SKT.Write.TCP ldy #S.SOCKET.TCP.STATUS
jsr SKT.AddDataToSktOut jsr SKT.AddDataToSktOut
bcs .90 bcs .90
jsr TCP.OUT try to push, ignore error.... jsr TCP.OUT.I try to push, ignore error....
clc clc
rts rts
@ -467,14 +467,14 @@ SKT.PutC >PULLB TmpByte
>PULLA >PULLA
ldx #1 ldx #1
stx ZPDataOutLen stx ZPDataInLen
stz ZPDataOutLen+1 stz ZPDataInLen+1
ldx L.TmpByte ldx L.TmpByte
stx ZPDataOutPtr stx ZPDataInPtr
ldx L.TmpByte+1 ldx L.TmpByte+1
stx ZPDataOutPtr+1 stx ZPDataInPtr+1
jmp SKT.Write.I jmp SKT.Write.I
*/-------------------------------------- */--------------------------------------
@ -486,14 +486,14 @@ SKT.PutC >PULLB TmpByte
* ##Out : * ##Out :
*\-------------------------------------- *\--------------------------------------
SKT.PutS >PULLW ZPDataOutPtr SKT.PutS >PULLW ZPDataOutPtr
lda (ZPDataOutPtr) lda (ZPDataInPtr)
sta ZPDataOutLen sta ZPDataInLen
stz ZPDataOutLen+1 stz ZPDataInLen+1
inc ZPDataOutPtr inc ZPDataInPtr
bne .1 bne .1
inc ZPDataOutPtr+1 inc ZPDataInPtr+1
.1 jmp SKT.Write.I .1 jmp SKT.Write.I
*/-------------------------------------- */--------------------------------------
@ -864,10 +864,10 @@ SKT.GetDataFromSktIn
SKT.AddDataToSktOut SKT.AddDataToSktOut
jsr SKT.GetTCB jsr SKT.GetTCB
ldx ZPDataInLen ldx SKT.TCBCache+S.TCB.OUTFREE
cpx SKT.TCBCache+S.TCB.OUTFREE cpx ZPDataInLen
lda ZPDataInLen+1 lda SKT.TCBCache+S.TCB.OUTFREE+1
sbc SKT.TCBCache+S.TCB.OUTFREE+1 sbc ZPDataInLen+1
bcc .9 Not enough room in Q bcc .9 Not enough room in Q
ldy #S.SOCKET.SQ.hOutMem ldy #S.SOCKET.SQ.hOutMem
@ -1128,7 +1128,6 @@ SKT.NewTCB >PUSHWI S.TCB
.2 lda A2osX.TIMER16,x .2 lda A2osX.TIMER16,x
sta SKT.TCBCache+S.TCB.SEQNUM,x sta SKT.TCBCache+S.TCB.SEQNUM,x
sta SKT.TCBCache+S.TCB.NEXTSEQNUM,x
dex dex
bpl .2 bpl .2

6
LIB/LIBTCPIP.S.TCP.txt
View File

@ -423,10 +423,10 @@ TCP.OUT.I ldy SKT.TCBCache+S.TCB.OUTUSED
ldy #S.TCP.OPTIONS ldy #S.TCP.OPTIONS
sta (ZPFrameOutPtr),y sta (ZPFrameOutPtr),y
ldx #3 ldx #7
ldy #S.TCP.ACK.NUMBER+3 ldy #S.TCP.SEQ.NUMBER+7
.3 lda SKT.TCBCache+S.TCB.ACKNUM,x .3 lda SKT.TCBCache+S.TCB.SEQNUM,x
sta (ZPFrameOutPtr),y sta (ZPFrameOutPtr),y
dey dey
dex dex

19
SBIN/TELNETD.S.txt
View File

@ -106,7 +106,7 @@ CS.RUN.INIT ldx #3
jsr CS.RUN.SERVER jsr CS.RUN.SERVER
bcs CS.RUN.ERR bcs CS.RUN.ERR
* jsr CS.RUN.CLIENT jsr CS.RUN.CLIENT
bra .2 bra .2
.9 >LDYA L.MSG.SKTERR .9 >LDYA L.MSG.SKTERR
@ -178,7 +178,16 @@ CS.RUN.CLIENT ldy #SktIndex
tax tax
beq .8 NO DATA beq .8 NO DATA
cmp #ERR.SKT.BAD
bne .8
ldy #SktIndex
lda (pData),y
tay
lda #0
sta (pData),y
bra .8
.10 sta .2+1 .10 sta .2+1
>PUSHA >PUSHA
@ -186,12 +195,12 @@ CS.RUN.CLIENT ldy #SktIndex
>SYSCALL CPrintFYA >SYSCALL CPrintFYA
.1 lda #$ff hSocket .1 lda #$ff hSocket
* >PUSHA >PUSHA
.2 lda #$ff data .2 lda #$ff data
* >PUSHA >PUSHA
* >LIBCALL hLIBTCPIP,LIBTCPIP.SKT.PutC >LIBCALL hLIBTCPIP,LIBTCPIP.SKT.PutC
.8 ldy #SktIndex .8 ldy #SktIndex
lda (pData),y lda (pData),y