diff --git a/.Floppies/A2OSX.BUILD.po b/.Floppies/A2OSX.BUILD.po index e3d7ad23..e2bb73ca 100644 Binary files a/.Floppies/A2OSX.BUILD.po and b/.Floppies/A2OSX.BUILD.po differ diff --git a/SBIN/LOGIN.S.txt b/SBIN/LOGIN.S.txt index 434a9ed9..f0637770 100644 --- a/SBIN/LOGIN.S.txt +++ b/SBIN/LOGIN.S.txt @@ -82,7 +82,7 @@ CS.RUN >LDYAI 33 Enough for HASH >STYA ZPGetLinePtr stx ZPhGetLine - + >LDYA L.ETCISSUE jsr CS.RUN.DUMPFILE diff --git a/SYS/KERNEL.S.BIN.txt b/SYS/KERNEL.S.BIN.txt index 30752518..6774397c 100644 --- a/SYS/KERNEL.S.BIN.txt +++ b/SYS/KERNEL.S.BIN.txt @@ -19,7 +19,7 @@ BIN.R.Stop .BS 2 *-------------------------------------- K.LoadLib jsr ENV.Search.LIB bcs .9 - jsr BIN.Load Y,A = "/PATH/BIN" + jsr BIN.Load K.Buf256 = "/PATH/BIN" bcs .9 >STYA .1+1 @@ -66,7 +66,7 @@ K.LoadDrv >STYA .2+1 Save "BIN\0ARGS\0\0" jsr ENV.Search.DRV bcs .9 - jsr BIN.Load Y,A = "/PATH/BIN" + jsr BIN.Load K.Buf256 = "/PATH/BIN" bcs .9 >STYA .3+1 @@ -105,13 +105,13 @@ BIN.Load.Cleanup.RTS *-------------------------------------- * BIN.Load * in : -* Y,A = /BIN/PATH (CSTR) +* K.Buf256 = /BIN/PATH (CSTR) * out : * Y,A = MEMPTR * X = hMem of Code Segment *-------------------------------------- BIN.Load ldx #0 - + .1 cpx Mem.LastSlot beq BIN.Load.1 @@ -201,7 +201,8 @@ BIN.Load.1 >LDYA K.S.STAT+S.STAT.P.AUXTYPE txa Get Back Cmd line hMem ldy #S.MEM.BIN sta (ZPMemMgrSPtr),y - + + ldx BIN.hMem setup X = CS hMem clc jmp MEM.GetMEMPTR ...and Y,A=PTR to CS diff --git a/SYS/KERNEL.S.PS.txt b/SYS/KERNEL.S.PS.txt index 5b53e7d4..98a4e9bb 100644 --- a/SYS/KERNEL.S.PS.txt +++ b/SYS/KERNEL.S.PS.txt @@ -291,7 +291,7 @@ PS.Load.SCRIPT ldx #$ff .1 inx .2 lda $ffff,x SELF MODIFIED - sta K.Buf256,x K.Buf256 = "/ROOT/" + sta K.Buf256,x K.Buf256 = "$ROOT" bne .1 ldy #0 @@ -306,12 +306,12 @@ PS.Load.SCRIPT ldx #$ff .4 iny inx lda K.IOBuf+128-1,y - sta K.Buf256-1,x K.Buf256 = "/ROOT/BIN/SHELL" + sta K.Buf256-1,x K.Buf256 = "${ROOT}BIN/SHELL" beq .5 eor #C.CR bne .4 - sta K.Buf256-1,x K.Buf256 = "/ROOT/BIN/SHELL\0" + sta K.Buf256-1,x K.Buf256 = "${ROOT}BIN/SHELL\0" .5 >PUSHWI K.S.STAT >LDYAI K.Buf256 @@ -321,9 +321,9 @@ PS.Load.SCRIPT ldx #$ff lda K.S.STAT+S.STAT.P.TYPE cmp #S.FI.T.BIN - bne PS.Load.IBIN K.Buf256= /.../SHELL, K.IOBuf=/.../SCRIPT + bne PS.Load.IBIN *-------------------------------------- -PS.LoadBIN jsr BIN.Load +PS.LoadBIN jsr BIN.Load K.Buf256= "${ROOT}BIN/SHELL\0", K.IOBuf=/.../SCRIPT bcs .9 >STYA ZPPtr4 save PTR to Code Segment diff --git a/SYS/KERNEL.S.TERM.txt b/SYS/KERNEL.S.TERM.txt index d2317fea..9eebce70 100644 --- a/SYS/KERNEL.S.TERM.txt +++ b/SYS/KERNEL.S.TERM.txt @@ -1276,7 +1276,11 @@ DRV.TERM.SETUP.L1X DRV.TERM.SETUP.L1X.SCR lda SCR.BASEL,x sta ZPScrBaseL1 - lda SCR.BASEH,x + txa + lsr + and #$3 + ora #4 +* lda SCR.BASEH,x sta ZPScrBaseL1+1 DRV.TERM.SETUP.L1X.8 rts @@ -1313,6 +1317,92 @@ SB.IS.NAWS .DA #IAC,#SB,#TELOPT.NAWS,#SB.IS .DA #IAC,#SE SB.IS.NAWS.LEN .EQ *-SB.IS.NAWS *-------------------------------------- +RESET.VALUES .DA #0 S.DCB.TTY.MODE + .DA #0 S.DCB.TTY.CH + .DA #0 S.DCB.TTY.CV + .DA #0 S.DCB.TTY.SCROLLTOP + .DA #23 S.DCB.TTY.SCROLLBOT + .DA #0 S.DCB.TTY.bCURON + .DA #0 S.DCB.TTY.bTITLE + + .DA #$80 S.DCB.TTY.bNORMAL + .DA #$80 S.DCB.TTY.bLINEWRAP + .DA #$80 S.DCB.TTY.bCRLF + + .DA #0 + + .DA #0 S.DCB.TTY.bG0G1 + .DA #0 S.DCB.TTY.bG0ALT + .DA #$80 S.DCB.TTY.bG1ALT + + .DA #S.DCB.TTY.OUTBUFFER S.DCB.TTY.OUTTAIL + .DA #S.DCB.TTY.OUTBUFFER S.DCB.TTY.OUTHEAD + .DA #S.DCB.TTY.INBUFFER S.DCB.TTY.INBUFFER +*-------------------------------------- +DRV.TERM.DIB .DA #S.DIB.S.WRITE+S.DIB.S.READ + .DA #0,#0,#0 + >PSTR "A2osX VT100 TERM" + .DA #S.DIB.T.CHAR + .DA #0 + .DA K.VER +*-------------------------------------- +* ` a b c d e f g h i j k l m n o +REMAP.E0.FF .HS 5B4142434445464748495FA0DF544e4f +* p q r s t u v w x y z { | } ~ DEL + .HS 50DF5253545556575F595a5b5c5d5e5f +*-------------------------------------- +BUF.BASEL .DA #0 + .DA #80 + .DA #160 + .DA #240 + .DA #320 + .DA #400 + .DA #480 + .DA #560 + .DA #640 + .DA #720 + .DA #800 + .DA #880 + .DA #960 + .DA #1040 + .DA #1120 + .DA #1200 + .DA #1280 + .DA #1360 + .DA #1440 + .DA #1520 + .DA #1600 + .DA #1680 + .DA #1760 + .DA #1840 +BUF.BASEH .DA /0 + .DA /80 + .DA /160 + .DA /240 + .DA /320 + .DA /400 + .DA /480 + .DA /560 + .DA /640 + .DA /720 + .DA /800 + .DA /880 + .DA /960 + .DA /1040 + .DA /1120 + .DA /1200 + .DA /1280 + .DA /1360 + .DA /1440 + .DA /1520 + .DA /1600 + .DA /1680 + .DA /1760 + .DA /1840 +*-------------------------------------- +SCR.BASEL .HS 00.80.00.80.00.80.00.80.28.A8.28.A8.28.A8.28.A8.50.D0.50.D0.50.D0.50.D0 +*SCR.BASEH .HS 04.04.05.05.06.06.07.07.04.04.05.05.06.06.07.07.04.04.05.05.06.06.07.07 +*-------------------------------------- MAN SAVE USR/SRC/SYS/KERNEL.S.TERM LOAD USR/SRC/SYS/KERNEL.S diff --git a/SYS/KERNEL.S.TERMLC.txt b/SYS/KERNEL.S.TERMLC.txt index 2d53898e..4fd88823 100644 --- a/SYS/KERNEL.S.TERMLC.txt +++ b/SYS/KERNEL.S.TERMLC.txt @@ -147,7 +147,11 @@ DRV.TERM.COPY.XtoL1 lda SCR.BASEL,x sta ZPScrBaseL2 - lda SCR.BASEH,x +* lda SCR.BASEH,x + txa + lsr + and #$3 + ora #4 sta ZPScrBaseL2+1 sta SET80STORE @@ -269,92 +273,6 @@ GetCharAtCurPos ldy #S.DCB.TTY.CV *-------------------------------------- * TEMP *-------------------------------------- -RESET.VALUES .DA #0 S.DCB.TTY.MODE - .DA #0 S.DCB.TTY.CH - .DA #0 S.DCB.TTY.CV - .DA #0 S.DCB.TTY.SCROLLTOP - .DA #23 S.DCB.TTY.SCROLLBOT - .DA #0 S.DCB.TTY.bCURON - .DA #0 S.DCB.TTY.bTITLE - - .DA #$80 S.DCB.TTY.bNORMAL - .DA #$80 S.DCB.TTY.bLINEWRAP - .DA #$80 S.DCB.TTY.bCRLF - - .DA #0 - - .DA #0 S.DCB.TTY.bG0G1 - .DA #0 S.DCB.TTY.bG0ALT - .DA #$80 S.DCB.TTY.bG1ALT - - .DA #S.DCB.TTY.OUTBUFFER S.DCB.TTY.OUTTAIL - .DA #S.DCB.TTY.OUTBUFFER S.DCB.TTY.OUTHEAD - .DA #S.DCB.TTY.INBUFFER S.DCB.TTY.INBUFFER -*-------------------------------------- -DRV.TERM.DIB .DA #S.DIB.S.WRITE+S.DIB.S.READ - .DA #0,#0,#0 - >PSTR "A2osX VT100 TERM" - .DA #S.DIB.T.CHAR - .DA #0 - .DA K.VER -*-------------------------------------- -* ` a b c d e f g h i j k l m n o -REMAP.E0.FF .HS 5B4142434445464748495FA0DF544e4f -* p q r s t u v w x y z { | } ~ DEL - .HS 50DF5253545556575F595a5b5c5d5e5f -*-------------------------------------- -BUF.BASEL .DA #0 - .DA #80 - .DA #160 - .DA #240 - .DA #320 - .DA #400 - .DA #480 - .DA #560 - .DA #640 - .DA #720 - .DA #800 - .DA #880 - .DA #960 - .DA #1040 - .DA #1120 - .DA #1200 - .DA #1280 - .DA #1360 - .DA #1440 - .DA #1520 - .DA #1600 - .DA #1680 - .DA #1760 - .DA #1840 -BUF.BASEH .DA /0 - .DA /80 - .DA /160 - .DA /240 - .DA /320 - .DA /400 - .DA /480 - .DA /560 - .DA /640 - .DA /720 - .DA /800 - .DA /880 - .DA /960 - .DA /1040 - .DA /1120 - .DA /1200 - .DA /1280 - .DA /1360 - .DA /1440 - .DA /1520 - .DA /1600 - .DA /1680 - .DA /1760 - .DA /1840 -*-------------------------------------- -SCR.BASEL .HS 00.80.00.80.00.80.00.80.28.A8.28.A8.28.A8.28.A8.50.D0.50.D0.50.D0.50.D0 -SCR.BASEH .HS 04.04.05.05.06.06.07.07.04.04.05.05.06.06.07.07.04.04.05.05.06.06.07.07 -*-------------------------------------- MAN SAVE USR/SRC/SYS/KERNEL.S.TERMLC LOAD USR/SRC/SYS/KERNEL.S