Kernel version 0.9 : Telnet ECHO mode and other IAC stuff

BIN/EDIT.S.txt

@@ -144,8 +144,6 @@ CS.RUN			>LDYA L.SEQ.DETECT
 				lda (pData),y			for W & H
 				beq .1
 				
-				>DEBUG
-				
 				jsr SCRN.Init
 				bcs .9
 				
@@ -196,7 +194,7 @@ CS.QUIT			ldy #hBuffer
 .9				rts
 *--------------------------------------
 CharIn			tax
-				>DEBUG
+
 				ldy #bEscMode
 				lda (pData),y
 				asl
@@ -251,6 +249,7 @@ CharIn.Esc		ldy #bEscMode
 				beq .2
 				dex
 				bne .1
+				
 				cmp #'R'				Response to cursor position query?
 				beq .3
 				

DRV/CONSOLE.DRV.S.txt

@@ -12,6 +12,7 @@ AUTO 6
 				.INB /A2OSX.DEV/INC/A2OSX.I
 				.INB /A2OSX.DEV/INC/IO.I
 				.INB /A2OSX.DEV/INC/MLI.ERR.I
+				.INB /A2OSX.DEV/INC/NET.TELNET.I				
 *--------------------------------------
 CURSOR.BLINK.SPEED	.EQ 8
 ESCSEQ.MAXLEN	.EQ 16
@@ -106,6 +107,14 @@ OPEN			stz CURON
 
 				jsr RESET
 				jsr HOME
+				
+				ldy #0
+				
+.1				lda TelnetOpt,y
+				beq CONTROL
+				jsr Char.Out.Put
+				iny
+				bne .1
 *--------------------------------------
 CONTROL			sta SETTEXT
 				sta SETALTCHAR
@@ -810,6 +819,8 @@ KeyRemappedDOWN	.HS 1B5B4200			esc[B
 KeyRemappedUP	.HS 1B5B4100			esc[A
 KeyRemappedCR	.HS 0D0A00				crlf
 KeyRemappedRGHT	.HS 1B5B4300			esc[C
+TelnetOpt		.DA #IAC,#DO,#TELOPT.ECHO
+				.DA #13,#10,#0
 *--------------------------------------
 CtrlChars.Cnt	.EQ 6
 CtrlChars		.HS 05080A0C0D1B

DRV/SSC.I.DRV.S.txt

@@ -199,6 +199,10 @@ READ.DEBUG		phx
 				lda (ZPTmpPtr1),y
 				sta READ.DEBUG.JMP+2
 				
+				lda #'('
+				ldx #DEVMGR.WRITE
+				jsr READ.DEBUG.JMP
+
 				pla
 				pha
 				lsr
@@ -220,7 +224,7 @@ READ.DEBUG		phx
 				ldx #DEVMGR.WRITE
 				jsr READ.DEBUG.JMP
 				
-				lda #'/'
+				lda #')'
 				ldx #DEVMGR.WRITE
 				jsr READ.DEBUG.JMP
 				

INC/NET.TELNET.I.txt

@@ -7,6 +7,8 @@ AUTO 6
 * https://android.googlesource.com/platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.7-4.6/+/jb-dev/sysroot/usr/include/arpa/telnet.h
 SE				.EQ 240
 SB				.EQ 250
+SB.IS			.EQ 0
+SB.SEND			.EQ 1
 WILL			.EQ 251					$FB
 WONT			.EQ 252					$FC
 DO				.EQ 253					$FD

SBIN/GETTY.S.txt

@@ -12,6 +12,8 @@ AUTO 6
 				.INB /A2OSX.DEV/INC/A2OSX.I
 				.INB /A2OSX.DEV/INC/NET.TELNET.I
 *--------------------------------------
+TIMEOUT.MAX		.EQ 10					1 sec.
+*--------------------------------------
 ZPTmp1			.EQ ZPBIN
 *--------------------------------------
 *			File Header (16 Bytes)
@@ -33,7 +35,7 @@ CS.START		cld
 				.DA CS.DOEVENT
 				.DA	CS.QUIT
 L.MSG.USAGE		.DA MSG.USAGE
-L.MSG.TELNETOPT	.DA MSG.TELNETOPT
+L.MSG.TELNET.OPT	.DA MSG.TELNET.OPT
 L.MSG.GREETINGS .DA MSG.GREETINGS
 L.TERM			.DA TERM
 				.DA 0					End Of Reloc Table
@@ -72,55 +74,124 @@ CS.INIT			>SYSCALL GetArgC
 				
 				ldy #hBinName
 				sta (pData),y
+
+				lda (pPs)
+				ora #S.PS.F.EVENT		Now accept events
+				sta (pPs)
+
 				clc
 .9				rts
 *--------------------------------------
-CS.RUN			
+CS.RUN			jsr Init.Timeout
-				>LDYA L.MSG.TELNETOPT
+
-				>SYSCALL CPrintFYA
+.66				>SYSCALL Sleep
-				bcs *
-				
-				lda #$83
-				jsr PRINT.DEBUG
-								
-.1				>SYSCALL Sleep
 				>SYSCALL GetC
-				bcs .2	
+				bcc .1
-					
+				bcs .66
-				jsr PRINT.DEBUG
+*				jsr Wait.Timeout
-				bra .1
+*				bcc .66
+
+*				jmp .2
+
 				
-.2				lda #5					Ctrl-E
+.10				>SYSCALL Sleep
-				>SYSCALL PutCA
-				bcs *
-				
-				lda #$84
-				jsr PRINT.DEBUG
-								
-.3				>SYSCALL Sleep
 				>SYSCALL GetC
-				bcs .4
+				bcs .1
+
 				
-				jsr PRINT.DEBUG
 				
-				tax
+.1				cmp #IAC
-				lda (pData)
+				beq .11
-				cmp #63
+				
-				beq .4
+				jmp .2
-				inc
+				
-				sta (pData)
+.11				>SYSCALL Sleep
-				tay
+				>SYSCALL GetC
-				txa
+				bcs .11
+
+				ldy #IAC.VERB
 				sta (pData),y
-				bra .3
 				
-.4				lda (pData)
+*				jsr PRINT.DEBUG				
+				
+.12				>SYSCALL Sleep
+				>SYSCALL GetC
+				bcs .12
+				
+				ldy #IAC.OPT
+				sta (pData),y
+				
+*				jsr PRINT.DEBUG
+				
+				ldy #IAC.VERB
+				lda (pData),y
+				cmp #SB
+				bne .10
+				
+				ldy #IAC.OPT
+				lda (pData),y
+				cmp #TELOPT.TTYPE
+				bne .15					only interested in Term Type, go get IAC,SE
+				
+.13				>SYSCALL Sleep
+				>SYSCALL GetC
+				bcs .13			
+				
+				cmp #SB.IS				not a valid reply, go get IAC,SE
+				bne .15
+				
+				lda #0
+				sta (pData)				reset IAC.TERM
+				
+.14				>SYSCALL Sleep
+				>SYSCALL GetC
+				bcs .14			
+				
+				cmp #IAC
+				beq .16					end of DATA, go wait SE
+				
+				pha
+				lda (pData)
+				inc
+				tay
+				sta (pData)
+				pla
+				
+				sta (pData),y
+				bra .14
+				
+.15				>SYSCALL Sleep
+				>SYSCALL GetC
+				bcs .15
+				
+				cmp #IAC
+				bne .15
+				
+.16				>SYSCALL Sleep
+				>SYSCALL GetC
+				bcs .16
+				
+				cmp #SE
+				bne .16
+				
+				
+				jmp .10
+				
+.2				
+				
+				lda (pData)
 				beq .5
-				>PUSHW pdata
+				>PUSHW pData
 				>PUSHW L.TERM
 				>SYSCALL SetEnv
 				
-.5				>LDYA L.MSG.GREETINGS
+.5				
+
+				>LDYA L.MSG.TELNET.OPT
+				>SYSCALL CPrintFYA
+				bcs *
+
+				>LDYA L.MSG.GREETINGS
 				>SYSCALL CPrintFYA
 				
 				bcs .8					unable to send greetings...loop..
@@ -134,8 +205,18 @@ CS.RUN
 .8				clc
 				rts
 *--------------------------------------
-CS.DOEVENT		sec
+CS.DOEVENT		lda (pEvent)
-				rts		
+				bpl .9					is it a TIMER event?
+
+				ldy #TimeOut
+				lda (pData),y
+				beq .9
+				
+				dec 
+				sta (pData),y
+				
+.9				sec						do not discard TIMER event
+				rts	
 *--------------------------------------
 CS.QUIT			ldy #hBinName
 				lda (pData),y
@@ -198,18 +279,33 @@ PRINT.DEBUG		phx
 				rts
 PRINT.DEBUG.JMP	jmp $ffff				
 *--------------------------------------
+Init.Timeout	ldy #TimeOut
+				lda #TIMEOUT.MAX
+				sta (pData),y
+				rts
+*--------------------------------------
+Wait.TimeOut	sec
+				ldy #TimeOut
+				lda (pData),y
+				beq .9
+				clc
+.9				rts
+*--------------------------------------
 CS.END
 PRINT.DEBUG.CHAR	.AS "0123456789ABCDEF"
 MSG.USAGE		>CSTR "GETTY <DEV> <PROGRAM>\r\n"
-MSG.TELNETOPT	
+MSG.TELNET.OPT	
+*				.DA #IAC,#WILL,#TELOPT.BINARY
 *				.DA #IAC,#DO,#TELOPT.LINEMODE
 *				.DA #IAC,#SB,#TELOPT.LINEMODE,#1,#0,#IAC,#SE
-				.DA #IAC,#WILL,#TELOPT.BINARY
+				.DA #IAC,#DONT,#TELOPT.ECHO
 				.DA #IAC,#WILL,#TELOPT.ECHO
-*				.DA #IAC,#WILL,#TELOPT.SGA
+				.DA #IAC,#WILL,#TELOPT.SGA
+				.DA #IAC,#DO,#TELOPT.SGA
 *				.DA #IAC,#DO,#TELOPT.NAWS
-				.DA #IAC,#DO,TELOPT.TTYPE
+				.DA #IAC,#DO,#TELOPT.TTYPE
-				.DA #13,#10,#0
+				.DA #IAC,#SB,#TELOPT.TTYPE,#SB.SEND,#IAC,#SE
+				.DA #0
 MSG.GREETINGS	>CSTR "\r\nA2osX-GeTTY\r\n"
 TERM			>PSTR "TERM"
 * \e[12h
@@ -217,8 +313,11 @@ TERM			>PSTR "TERM"
 				.DUMMY
 				.OR 0
 DS.START
-InBuf			.BS 64				
+IAC.TERM		.BS 64				
 hBinName		.BS 1
+TimeOut			.BS 1
+IAC.VERB		.BS 1
+IAC.OPT			.BS 1
 DS.END			.ED
 MAN
 SAVE SBIN/GETTY.S