diff --git a/.Floppies/A2OSX.B800.po b/.Floppies/A2OSX.B800.po index 81c776ae..92c8f697 100644 Binary files a/.Floppies/A2OSX.B800.po and b/.Floppies/A2OSX.B800.po differ diff --git a/.Floppies/A2OSX.BOOT.po b/.Floppies/A2OSX.BOOT.po index 9b789e1a..a1bbaa3c 100644 Binary files a/.Floppies/A2OSX.BOOT.po and b/.Floppies/A2OSX.BOOT.po differ diff --git a/.Floppies/A2OSX.BUILD.po b/.Floppies/A2OSX.BUILD.po index 476b2a52..fbf683ec 100644 Binary files a/.Floppies/A2OSX.BUILD.po and b/.Floppies/A2OSX.BUILD.po differ diff --git a/BIN/SHELL.S.CL.txt b/BIN/SHELL.S.CL.txt index c78d08f8..d826ab09 100644 --- a/BIN/SHELL.S.CL.txt +++ b/BIN/SHELL.S.CL.txt @@ -264,21 +264,16 @@ CL.PrintCmdBuf >LDYA ZPCLBuf CL.GetLine >LDYA ZPFileBufPtr >STYA.G CMD.FileBufPtr - lda #"a" - sta $815 - lda (ZPFileBufPtr) beq .9 - inc $815 - ldx #0 not in " ldy #0 .1 lda (ZPFileBufPtr),y beq .7 - inc $815 + cmp #C.CR beq .6 diff --git a/BIN/SHELL.S.txt b/BIN/SHELL.S.txt index 06cad22a..7c12d8ed 100644 --- a/BIN/SHELL.S.txt +++ b/BIN/SHELL.S.txt @@ -166,48 +166,21 @@ J.CMD.Eval.TOKEN4 .DA M32.Add L.M32.Printf .DA M32.Printf L.ERR.Codes .DA ERR.Codes L.ERR.Messages .DA ERR.Messages -L.MSG.DEBUG .DA MSG.DEBUG .DO CSH=1 .INB USR/SRC/BIN/SHELL.R.CSH .FIN .DA 0 *-------------------------------------- -CS.DEBUG >PUSHWI K.VER - >PUSHBI 2 - >LDYA L.MSG.GREETINGS - >SYSCALL printf - - lda #0 - >SYSCALL ArgV - >PUSHYA - >PUSHBI 2 - >LDYA L.MSG.DEBUG - >SYSCALL printf - - lda #1 - >SYSCALL ArgV - >PUSHYA - >PUSHBI 2 - >LDYA L.MSG.DEBUG - >SYSCALL printf - rts -*-------------------------------------- CS.INIT clc CS.INIT.RTS rts *-------------------------------------- -CS.RUN lda #"I" - sta $819 - sta $817 - - jsr CMD.Init +CS.RUN jsr CMD.Init bcs CS.INIT.RTS ldy #S.PS.ARGC lda (pPS),y beq .1 no arg, continue starting interactive - jsr CS.DEBUG - lda #1 >SYSCALL ArgV >SYSCALL LoadTxtFile @@ -386,9 +359,6 @@ CS.RUN.BATCH >SYSCALL GetChar cmp #C.EOF bne .3 - lda #"\" - sta $819 - lda #$ff >STA.G bExit inc @@ -398,8 +368,7 @@ CS.RUN.BATCH >SYSCALL GetChar .3 sec bra CS.RUN.LOOP.END -.7 inc $817 - >LDA.G CL.bExec +.7 >LDA.G CL.bExec bpl CS.RUN.LOOP.80 lda (ZPCLBuf) @@ -594,7 +563,6 @@ ENV.PATH .AZ "PATH" ENV.PWD .AZ "PWD" ENV.PS1 .AZ "PS1" ENV.HOME .AZ "HOME" -MSG.DEBUG .AZ "{%s}\r\n" *-------------------------------------- * https://www.tldp.org/LDP/abs/html/io-redirection.html *-------------------------------------- diff --git a/DRV/CONSOLE.DRV.S.txt b/DRV/CONSOLE.DRV.S.txt index 557acfcf..f3bbf2bb 100644 --- a/DRV/CONSOLE.DRV.S.txt +++ b/DRV/CONSOLE.DRV.S.txt @@ -149,12 +149,7 @@ STATUS >STYA ZPIOCTL OPEN sta A2osX.SCRNDEVS DEV.ID in A lda #S.DIB.S.OPENED - ora DIB+S.DIB.S - sta DIB+S.DIB.S - - lda #"C" - sta $417 - sta $817 + tsb DIB+S.DIB.S stz OutPtr stz OutCnt @@ -168,9 +163,7 @@ CONTROL sta SETTEXT sta CLRPAGE2 lda #1 sta A2osX.ASCREEN - lda #"c" - sta $417 - sta $817 + clc rts *-------------------------------------- diff --git a/SYS/KERNEL.S.DRV.txt b/SYS/KERNEL.S.DRV.txt index eab41e27..8b6c1199 100644 --- a/SYS/KERNEL.S.DRV.txt +++ b/SYS/KERNEL.S.DRV.txt @@ -244,9 +244,7 @@ DRV.SYS cld DRV.SYS.STATUS >LDYAI DRV.SYS.DIB jmp DRV.STATUS.YA *-------------------------------------- -DRV.SYS.Open lda #"S" - sta $423 - lda #DEVID.SYS +DRV.SYS.Open lda #DEVID.SYS sta A2osX.SCRNDEVS+1 jsr DRV.SYS.FF *-------------------------------------- diff --git a/SYS/KERNEL.S.INIT.txt b/SYS/KERNEL.S.INIT.txt index 6c0845ab..c30c4eb1 100644 --- a/SYS/KERNEL.S.INIT.txt +++ b/SYS/KERNEL.S.INIT.txt @@ -102,40 +102,34 @@ Kernel.Init3 sta SETALTZP sta IRQ.InKernel jsr SysScrInit - lda #"A" - sta $427 + jsr MemMgrInit >LDYAI FD.NULL >SYSCALL MKDev - inc $427 + >LDYAI FD.SYS >SYSCALL MKDev - inc $427 + jsr PS0.Init - bcc .10 - - lda #"D" - sta $427 - bra * - -.10 inc $427 + bcs * + >LDYAI MSG.Init3 >SYSCALL puts - inc $427 + jsr CPU.Init.6502 - inc $427 + jsr CPU.Init.Z80 - inc $427 + jsr DevMgrInit - inc $427 + jsr IrqMgrInit bcs * - inc $427 + jsr EvtMgrInit - inc $427 + jsr TskMgrInit bcs * - inc $427 + ldy #S.PS.hPREFIX lda (pPs),y @@ -146,7 +140,6 @@ Kernel.Init3 sta SETALTZP >PUSHBI 2 >LDYAI MSG.Prefix >SYSCALL printf - inc $427 lda KBD bpl .1 diff --git a/SYS/KERNEL.S.IO.txt b/SYS/KERNEL.S.IO.txt index a2eab023..62684ff8 100644 --- a/SYS/KERNEL.S.IO.txt +++ b/SYS/KERNEL.S.IO.txt @@ -186,15 +186,11 @@ K.IO.OPEN.REG.E >LDYAI S.FD.REG IO.OPEN.CDEV sta .1+1 A=DEVID pha jsr K.IOCTL.GetPDrv - lda #"C" - sta $425 ldx #IOCTL.OPEN pla pass A=DEVID To Driver jsr K.IOCTL.pDrvJmp - inc $425 bcs .9 - inc $425 .1 ldx #$ff SELF MODIFIED lda Dev.Table.hFD,x diff --git a/SYS/KERNEL.S.STDIO.txt b/SYS/KERNEL.S.STDIO.txt index cc0eb810..01788854 100644 --- a/SYS/KERNEL.S.STDIO.txt +++ b/SYS/KERNEL.S.STDIO.txt @@ -989,21 +989,16 @@ K.SScanF.Fwd tya Y=char count parsed * CC : A = hFILE * CS : A = EC *\-------------------------------------- -K.FOpen pha - lda #"O" - sta $426 - pla - jsr PFT.CheckPathYA - inc $426 +K.FOpen jsr PFT.CheckPathYA bcs .99 - inc $426 + >PULLB K.Open.FLAGS >PULLB K.Open.TYPE >PULLW K.Open.AUXTYPE jsr IO.Open.I bcs .9 - inc $426 + tax stx .1+1 save hFD @@ -1011,9 +1006,7 @@ K.FOpen pha >LDYAI K.Buf256 jsr STDIO.NewHFileYAX - inc $426 bcc .9 - inc $426 pha save MLI error .1 lda #$ff SELF MODIFIED