diff --git a/.Floppies/A2OSX.BUILD.po b/.Floppies/A2OSX.BUILD.po index 4e8398a8..2aa2e24c 100644 Binary files a/.Floppies/A2OSX.BUILD.po and b/.Floppies/A2OSX.BUILD.po differ diff --git a/.Floppies/A2OSX.TEST.po b/.Floppies/A2OSX.TEST.po index 08efad71..226f0199 100644 Binary files a/.Floppies/A2OSX.TEST.po and b/.Floppies/A2OSX.TEST.po differ diff --git a/INC/NET.TELNET.I.txt b/INC/NET.TELNET.I.txt index e6af6b76..ae516a73 100644 --- a/INC/NET.TELNET.I.txt +++ b/INC/NET.TELNET.I.txt @@ -18,47 +18,47 @@ DO .EQ 253 $FD DONT .EQ 254 $FE IAC .EQ 255 $FF *-------------------------------------- -TELOPT.BINARY .EQ 0 8-bit data path -TELOPT.ECHO .EQ 1 echo -TELOPT.RCP .EQ 2 prepare to reconnect -TELOPT.SGA .EQ 3 suppress go ahead -TELOPT.NAMS .EQ 4 approximate message size -TELOPT.STATUS .EQ 5 give status -TELOPT.TM .EQ 6 timing mark -TELOPT.RCTE .EQ 7 remote controlled transmission and echo -TELOPT.NAOL .EQ 8 negotiate about output line width -TELOPT.NAOP .EQ 9 negotiate about output page size -TELOPT.NAOCRD .EQ 10 negotiate about CR disposition -TELOPT.NAOHTS .EQ 11 negotiate about horizontal tabstops -TELOPT.NAOHTD .EQ 12 negotiate about horizontal tab disposition -TELOPT.NAOFFD .EQ 13 negotiate about formfeed disposition -TELOPT.NAOVTS .EQ 14 negotiate about vertical tab stops -TELOPT.NAOVTD .EQ 15 negotiate about vertical tab disposition -TELOPT.NAOLFD .EQ 16 negotiate about output LF disposition -TELOPT.XASCII .EQ 17 extended ascii character set -TELOPT.LOGOUT .EQ 18 force logout -TELOPT.BM .EQ 19 byte macro -TELOPT.DET .EQ 20 data entry terminal -TELOPT.SUPDUP .EQ 21 supdup protocol -TELOPT.SUPDUPOUTPUT .EQ 22 supdup output -TELOPT.SNDLOC .EQ 23 send location -TELOPT.TTYPE .EQ 24 terminal type -TELOPT.EOR .EQ 25 end or record -TELOPT.TUID .EQ 26 TACACS user identification -TELOPT.OUTMRK .EQ 27 output marking -TELOPT.TTYLOC .EQ 28 terminal location number -TELOPT.3270REGIME .EQ 29 3270 regime -TELOPT.X3PAD .EQ 30 X.3 PAD -TELOPT.NAWS .EQ 31 window size -TELOPT.TSPEED .EQ 32 terminal speed -TELOPT.LFLOW .EQ 33 remote flow control -TELOPT.LINEMODE .EQ 34 Linemode option -TELOPT.XDISPLOC .EQ 35 X Display Location -TELOPT.OLDENVIRON .EQ 36 Old - Environment variables -TELOPT.AUTHENTICATION .EQ 37 Authenticate -TELOPT.ENCRYPT .EQ 38 Encryption option -TELOPT.NEWENVIRON .EQ 39 New - Environment variables -TELOPT.EXOPL .EQ 255 extended-options-list +TN.O.BINARY .EQ 0 8-bit data path +TN.O.ECHO .EQ 1 echo +TN.O.RCP .EQ 2 prepare to reconnect +TN.O.SGA .EQ 3 suppress go ahead +TN.O.NAMS .EQ 4 approximate message size +TN.O.STATUS .EQ 5 give status +TN.O.TM .EQ 6 timing mark +TN.O.RCTE .EQ 7 remote controlled transmission and echo +TN.O.NAOL .EQ 8 negotiate about output line width +TN.O.NAOP .EQ 9 negotiate about output page size +TN.O.NAOCRD .EQ 10 negotiate about CR disposition +TN.O.NAOHTS .EQ 11 negotiate about horizontal tabstops +TN.O.NAOHTD .EQ 12 negotiate about horizontal tab disposition +TN.O.NAOFFD .EQ 13 negotiate about formfeed disposition +TN.O.NAOVTS .EQ 14 negotiate about vertical tab stops +TN.O.NAOVTD .EQ 15 negotiate about vertical tab disposition +TN.O.NAOLFD .EQ 16 negotiate about output LF disposition +TN.O.XASCII .EQ 17 extended ascii character set +TN.O.LOGOUT .EQ 18 force logout +TN.O.BM .EQ 19 byte macro +TN.O.DET .EQ 20 data entry terminal +TN.O.SUPDUP .EQ 21 supdup protocol +TN.O.SUPDUPOUT .EQ 22 supdup output +TN.O.SNDLOC .EQ 23 send location +TN.O.TTYPE .EQ 24 terminal type +TN.O.EOR .EQ 25 end or record +TN.O.TUID .EQ 26 TACACS user identification +TN.O.OUTMRK .EQ 27 output marking +TN.O.TTYLOC .EQ 28 terminal location number +TN.O.3270REGIME .EQ 29 3270 regime +TN.O.X3PAD .EQ 30 X.3 PAD +TN.O.NAWS .EQ 31 window size +TN.O.TSPEED .EQ 32 terminal speed +TN.O.LFLOW .EQ 33 remote flow control +TN.O.LINEMODE .EQ 34 Linemode option +TN.O.XDISPLOC .EQ 35 X Display Location +TN.O.OLDENV .EQ 36 Old - Environment variables +TN.O.AUTH .EQ 37 Authenticate +TN.O.ENCRYPT .EQ 38 Encryption option +TN.O.NEWENV .EQ 39 New - Environment variables +TN.O.EXOPL .EQ 255 extended-options-list *-------------------------------------- MAN SAVE INC/NET.TELNET.I diff --git a/SBIN/GETTY.S.txt b/SBIN/GETTY.S.txt index 2120895c..03c39b98 100644 --- a/SBIN/GETTY.S.txt +++ b/SBIN/GETTY.S.txt @@ -3,11 +3,11 @@ NEW .LIST OFF .OP 65C02 .OR $2000 - .TF SBIN/GETTY + .TF sbin/getty *-------------------------------------- - .INB INC/MACROS.I - .INB INC/A2OSX.I - .INB INC/NET.TELNET.I + .INB inc/macros.i + .INB inc/a2osx.i + .INB inc/net.telnet.i *-------------------------------------- TIMEOUT.MAX .EQ 40 4 sec. IAC.BUF.MAX .EQ 32 @@ -198,14 +198,14 @@ CS.RUN.IACMODE >SYSCALL GetChar Wait for IAC CMD (or SB) CS.RUN.IAC.CMD cmp #WILL bne .8 - cpx #TELOPT.TTYPE + cpx #TN.O.TTYPE bne .2 >PUSHWI TELNETOPT.TTYPE.LEN >PUSHW L.TELNETOPT.TTYPE bra .7 -.2 cpx #TELOPT.LINEMODE +.2 cpx #TN.O.LINEMODE bne .8 >PUSHWI TELNETOPT.LMODE.LEN @@ -240,7 +240,7 @@ CS.RUN.IAC.SB >SYSCALL GetChar Wait for IAC SB.IS or SEND bne .8 lda IAC.SUBCMD - cmp #TELOPT.TTYPE + cmp #TN.O.TTYPE bne .8 lda IAC.SB.CMD cmp #SB.IS @@ -315,19 +315,19 @@ MSG.GREETINGS .AZ "\r\nA2osX-GeTTY %d.%d on %s\r\n" MSG.USAGE .AS "Usage : GETTY \r\n" .AZ " -E : Exit on disconnect\r\n" *-------------------------------------- -TELNETOPTS .DA #IAC,#WILL,#TELOPT.BINARY - .DA #IAC,#WILL,#TELOPT.ECHO - .DA #IAC,#WILL,#TELOPT.SGA - .DA #IAC,#DO,#TELOPT.SGA -* .DA #IAC,#DO,#TELOPT.NAWS - .DA #IAC,#DO,#TELOPT.TTYPE - .DA #IAC,#DO,#TELOPT.LINEMODE +TELNETOPTS .DA #IAC,#WILL,#TN.O.BINARY + .DA #IAC,#WILL,#TN.O.ECHO + .DA #IAC,#WILL,#TN.O.SGA + .DA #IAC,#DO,#TN.O.SGA +* .DA #IAC,#DO,#TN.O.NAWS + .DA #IAC,#DO,#TN.O.TTYPE + .DA #IAC,#DO,#TN.O.LINEMODE TELNETOPTS.LEN .EQ *-TELNETOPTS *-------------------------------------- -TELNETOPT.TTYPE .DA #IAC,#SB,#TELOPT.TTYPE,#SB.SEND,#IAC,#SE +TELNETOPT.TTYPE .DA #IAC,#SB,#TN.O.TTYPE,#SB.SEND,#IAC,#SE TELNETOPT.TTYPE.LEN .EQ *-TELNETOPT.TTYPE *-------------------------------------- -TELNETOPT.LMODE .DA #IAC,#SB,#TELOPT.LINEMODE,#SB.SEND,#0,#IAC,#SE +TELNETOPT.LMODE .DA #IAC,#SB,#TN.O.LINEMODE,#SB.SEND,#0,#IAC,#SE TELNETOPT.LMODE.LEN .EQ *-TELNETOPT.LMODE ENV.TERM .AZ "TERM" *-------------------------------------- @@ -337,5 +337,5 @@ DS.START IAC.SB.DATA .BS IAC.BUF.MAX DS.END .ED MAN -SAVE USR/SRC/SBIN/GETTY.S +SAVE usr/src/sbin/getty.s ASM diff --git a/SYS/KERNEL.S.FS.txt b/SYS/KERNEL.S.FS.txt index 40d85aa3..9b9b5e32 100644 --- a/SYS/KERNEL.S.FS.txt +++ b/SYS/KERNEL.S.FS.txt @@ -157,10 +157,18 @@ IO.MLI.OPEN >LDYAI 1024 get a ProDOS IOBUF .9 FS.OPEN.RTS rts *-------------------------------------- +FS.STAT.I >PUSHYA + >PUSHWI K.S.STAT + jsr PFT.CheckPath2 + bcs .9 + jsr FS.Stat.203 + +.9 >RET 4 +*-------------------------------------- FS.Stat bit CORE.FSID bmi FS.Stat.FX - >MLICALL MLIGETFILEINFO +FS.Stat.203 >MLICALL MLIGETFILEINFO bcs FS.OPEN.RTS jsr FS.ClrStat diff --git a/SYS/KERNEL.S.PS.txt b/SYS/KERNEL.S.PS.txt index 03a71ed0..1a2904a0 100644 --- a/SYS/KERNEL.S.PS.txt +++ b/SYS/KERNEL.S.PS.txt @@ -323,9 +323,8 @@ PS.Load ldy #$ff cmp #'/' bne .1 - >PUSHW PS.ArgV found /, some path specified, no search - >PUSHWI K.S.STAT - >SYSCALL2 stat + >LDYA PS.ArgV found /, some path specified, no search + jsr FS.STAT.I bcc .6 REAL path in K.Buf256 .99 rts @@ -396,9 +395,8 @@ PS.Load.SCRIPT ldx #$ff sta K.Buf256-1,x K.Buf256 = "${ROOT}BIN/SHELL\0" -.5 >PUSHWI K.Buf256 - >PUSHWI K.S.STAT - >SYSCALL2 stat +.5 >LDYAI K.Buf256 + jsr FS.STAT.I bcs PS.Load.RTS lda K.S.STAT+S.STAT.P.TYPE @@ -947,9 +945,8 @@ ENV.Search.4 lda $ffff,y Self Modified, Append Filename... inx bra ENV.Search.4 -ENV.Search.5 >PUSHWI K.Buf256 - >PUSHWI K.S.STAT - >SYSCALL2 stat +ENV.Search.5 >LDYAI K.Buf256 + jsr FS.STAT.I bcs ENV.Search.1 Failed...retry next path... lda K.S.STAT+S.STAT.P.TYPE diff --git a/SYS/KERNEL.S.TERMX.txt b/SYS/KERNEL.S.TERMX.txt index 42a95666..18747545 100644 --- a/SYS/KERNEL.S.TERMX.txt +++ b/SYS/KERNEL.S.TERMX.txt @@ -801,7 +801,7 @@ TERMX.IAC ldy #S.DCB.TTY.INBUFFER COUT.IAC.SB ldy #S.DCB.TTY.INBUFFER+2 lda (ZPDCBPtr),y Get SUBCMD in A - cmp #TELOPT.TTYPE + cmp #TN.O.TTYPE bne COUT.IAC.SB.9 iny lda (ZPDCBPtr),y @@ -1414,22 +1414,22 @@ KeyRemapped .HS 080A0B15 Left,Down,Up,Right KeyRemapped.Cnt .EQ *-KeyRemapped KeyRemapped.Tbl .HS 44424143 esc[D,esc[B,esc[A,esc[C *-------------------------------------- -WILLDO .DA #TELOPT.BINARY,#TELOPT.SGA,#TELOPT.ECHO +WILLDO .DA #TN.O.BINARY,#TN.O.SGA,#TN.O.ECHO WILLDO.CNT .EQ *-WILLDO -WILLDONT .DA #TELOPT.TSPEED,#TELOPT.LINEMODE,#TELOPT.STATUS +WILLDONT .DA #TN.O.TSPEED,#TN.O.LINEMODE,#TN.O.STATUS WILLDONT.CNT .EQ *-WILLDONT -DOWILL .DA #TELOPT.BINARY,#TELOPT.SGA,#TELOPT.TTYPE,#TELOPT.NAWS +DOWILL .DA #TN.O.BINARY,#TN.O.SGA,#TN.O.TTYPE,#TN.O.NAWS DOWILL.CNT .EQ *-DOWILL -DOWONT .DA #TELOPT.ECHO,#TELOPT.NEWENVIRON,#TELOPT.XDISPLOC - .DA #TELOPT.TSPEED,#TELOPT.LFLOW,#TELOPT.AUTHENTICATION +DOWONT .DA #TN.O.ECHO,#TN.O.NEWENV,#TN.O.XDISPLOC + .DA #TN.O.TSPEED,#TN.O.LFLOW,#TN.O.AUTH DOWONT.CNT .EQ *-DOWONT *-------------------------------------- -SB.IS.TTYPE .DA #IAC,#SB,#TELOPT.TTYPE,#SB.IS +SB.IS.TTYPE .DA #IAC,#SB,#TN.O.TTYPE,#SB.IS ENQ.String .AS "vt100" ENQ.String.Len .EQ *-ENQ.String .DA #IAC,#SE SB.IS.TTYPE.LEN .EQ *-SB.IS.TTYPE -SB.IS.NAWS .DA #IAC,#SB,#TELOPT.NAWS,#SB.IS +SB.IS.NAWS .DA #IAC,#SB,#TN.O.NAWS,#SB.IS .DA 80 .DA 24 .DA #IAC,#SE