diff --git a/.Floppies/A2OSX.BUILD.po b/.Floppies/A2OSX.BUILD.po index 03db7402..6ec965e4 100644 Binary files a/.Floppies/A2OSX.BUILD.po and b/.Floppies/A2OSX.BUILD.po differ diff --git a/.Floppies/A2OSX.SRC.po b/.Floppies/A2OSX.SRC.po index 51b31cf0..f8bcad53 100644 Binary files a/.Floppies/A2OSX.SRC.po and b/.Floppies/A2OSX.SRC.po differ diff --git a/BIN/EDIT.S.txt b/BIN/EDIT.S.txt index 5c433286..eef2fa9f 100644 --- a/BIN/EDIT.S.txt +++ b/BIN/EDIT.S.txt @@ -8,6 +8,7 @@ AUTO 4,1 *-------------------------------------- .INB INC/MACROS.I .INB INC/A2OSX.I + .INB INC/MLI.I *-------------------------------------- ZPPTR1 .EQ ZPBIN ZPPTR2 .EQ ZPBIN+2 diff --git a/BIN/LSDEV.S.txt b/BIN/LSDEV.S.txt index 26465e47..5b1eaca1 100644 --- a/BIN/LSDEV.S.txt +++ b/BIN/LSDEV.S.txt @@ -46,7 +46,7 @@ CS.RUN >LDYA L.MSG0 >SYSCALL puts >LDA.G DEV.ID - + .1 >SYSCALL GetDevByID bcs .7 diff --git a/BIN/X.CPMVRM.S.txt b/BIN/X.CPMVRM.S.txt index e598d552..ae832ddd 100644 --- a/BIN/X.CPMVRM.S.txt +++ b/BIN/X.CPMVRM.S.txt @@ -132,10 +132,6 @@ CS.INIT .FIN -* lda (pPs) -* ora #S.PS.F.EVENT Now accept events -* sta (pPs) - clc rts *-------------------------------------- diff --git a/DRV/CONSOLE.DRV.S.txt b/DRV/CONSOLE.DRV.S.txt index 7c7a6781..53232746 100644 --- a/DRV/CONSOLE.DRV.S.txt +++ b/DRV/CONSOLE.DRV.S.txt @@ -46,9 +46,9 @@ Dev.Detect >LDYA L.MSG.DETECT >SYSCALL MKDEV .9 rts +*-------------------------------------- CS.END MSG.DETECT .AZ "Apple IIe/IIc 80 Col Driver." -*-------------------------------------- FD.DEV .DA #S.FD.T.CDEV .DA #0 HANDLER .DA #0 BUSID diff --git a/DRV/X.SSC.DRV.S.txt b/DRV/X.SSC.DRV.S.txt index 171421ce..a753c2ef 100644 --- a/DRV/X.SSC.DRV.S.txt +++ b/DRV/X.SSC.DRV.S.txt @@ -228,7 +228,7 @@ STATUS jsr STATUS.CONTROL.Init .1 ldy #3 .2 lda DIB,y - sta (ZPIOCTL),y + sta (ZPBufPtr),y dey bpl .2 @@ -241,7 +241,7 @@ STATUS.DCB cmp #S.IOCTL.STATCODE.GETDCB ldy #S.DCB.COM-1 .2 lda DCB,y - sta (ZPIOCTL),y + sta (ZPBufPtr),y dey bpl .2 @@ -261,7 +261,7 @@ CONTROL jsr STATUS.CONTROL.Init ldy #S.DCB.COM-1 -.2 lda (ZPIOCTL),y +.2 lda (ZPBufPtr),y sta DCB,y dey bpl .2 diff --git a/INC/A2osX.I.txt b/INC/A2osX.I.txt index 071277cd..ae1b7f2e 100644 --- a/INC/A2osX.I.txt +++ b/INC/A2osX.I.txt @@ -56,6 +56,7 @@ A2osX.RANDOM16 .EQ $BEEE WORD *-------------------------------------- * $BEF0->$BEFF : Kernel Config Block *-------------------------------------- +A2osX.KCONFIG .EQ $BEF0 A2osX.HZ .EQ $BEF0 5/6 for 50/60Hz A2osX.F .EQ $BEF8 A2osX.F.CHROOT .EQ %10000000 ChRooting to /RAMx diff --git a/INC/LIBTCPIP.I.txt b/INC/LIBTCPIP.I.txt index 0e3cef9c..f9375e12 100644 --- a/INC/LIBTCPIP.I.txt +++ b/INC/LIBTCPIP.I.txt @@ -289,3 +289,5 @@ S.DNS.QCLASS.IN .EQ 1 *-------------------------------------- MAN SAVE /A2OSX.BUILD/INC/LIBTCPIP.I +LOAD /A2OSX.SRC/LIB/LIBTCPIP.S +ASM diff --git a/LIB/LIBTCPIP.S.txt b/LIB/LIBTCPIP.S.txt index a1415269..d0c335a4 100644 --- a/LIB/LIBTCPIP.S.txt +++ b/LIB/LIBTCPIP.S.txt @@ -248,16 +248,16 @@ GetDynPort inc DYNPORT.LAST clc rts *-------------------------------------- - .INB /A2OSX.SRC/LIB/LIBTCPIP.S.ARP - .INB /A2OSX.SRC/LIB/LIBTCPIP.S.CFG - .INB /A2OSX.SRC/LIB/LIBTCPIP.S.DNS - .INB /A2OSX.SRC/LIB/LIBTCPIP.S.FRM - .INB /A2OSX.SRC/LIB/LIBTCPIP.S.HST - .INB /A2OSX.SRC/LIB/LIBTCPIP.S.ICMP - .INB /A2OSX.SRC/LIB/LIBTCPIP.S.IP - .INB /A2OSX.SRC/LIB/LIBTCPIP.S.SKT - .INB /A2OSX.SRC/LIB/LIBTCPIP.S.TCP - .INB /A2OSX.SRC/LIB/LIBTCPIP.S.UDP + .INB /A2OSX.SRC/LIB/LIBTCPIP.S.ARP + .INB /A2OSX.SRC/LIB/LIBTCPIP.S.CFG + .INB /A2OSX.SRC/LIB/LIBTCPIP.S.DNS + .INB /A2OSX.SRC/LIB/LIBTCPIP.S.FRM + .INB /A2OSX.SRC/LIB/LIBTCPIP.S.HST + .INB /A2OSX.SRC/LIB/LIBTCPIP.S.ICMP + .INB /A2OSX.SRC/LIB/LIBTCPIP.S.IP + .INB /A2OSX.SRC/LIB/LIBTCPIP.S.SKT + .INB /A2OSX.SRC/LIB/LIBTCPIP.S.TCP + .INB /A2OSX.SRC/LIB/LIBTCPIP.S.UDP *-------------------------------------- CS.END *-------------------------------------- @@ -315,7 +315,7 @@ FD.SSOCK .DA #S.FD.T.SSOCK *-------------------------------------- .DA #AF.INET S.SOCKET.AF .DA #S.SOCKET.T.STREAM - .BS #S.IP.PROTOCOL.TCP + .DA #S.IP.PROTOCOL.TCP FD.SSOCK.SIZE .EQ *-FD.SSOCK *-------------------------------------- IOCTL .BS S.IOCTL diff --git a/SBIN/KCONFIG.S.txt b/SBIN/KCONFIG.S.txt index 602c1e2e..42573ce0 100644 --- a/SBIN/KCONFIG.S.txt +++ b/SBIN/KCONFIG.S.txt @@ -7,6 +7,7 @@ AUTO 4,1 .TF SBIN/KCONFIG *-------------------------------------- .INB INC/MACROS.I + .INB INC/MLI.I .INB INC/A2OSX.I *-------------------------------------- ZPCfgPtr .EQ ZPBIN @@ -84,7 +85,7 @@ CS.RUN >LDYA L.FILENAME >LDYA L.MSG.KCONF >SYSCALL printf - >LDYAI A2osX.HZ + >LDYAI A2osX.KCONFIG jsr CS.RUN.DumpConfYA >PUSHBI 0 >LDYA L.MSG.STATUSBAR @@ -169,25 +170,25 @@ CS.RUN.Load >PUSHEA.G StatBuf >SYSCALL Stat bcs .99 -* sec -* >LDA.G StatBuf+S.STAT.SIZE -* eor #16 -* bne .99 - -* iny -* lda (pData),y -* iny -* ora (pData),y -* iny -* ora (pData),y -* bne .99 - - >LDA.G StatBuf+S.STAT.P.TYPE - eor #6 + sec + >LDA.G StatBuf+S.STAT.SIZE + eor #16 bne .99 - >PUSHWI 0 Aux type - >PUSHBI 6 S.FI.T.BIN + iny + lda (pData),y + iny + ora (pData),y + iny + ora (pData),y + bne .99 + + >LDA.G StatBuf+S.STAT.P.TYPE + eor #S.FI.T.SYS + bne .99 + + >PUSHWI A2osX.KCONFIG + >PUSHBI S.FI.T.SYS >PUSHBI O.RDONLY >LDA.G hFileName >SYSCALL GetMemPtr @@ -215,9 +216,9 @@ CS.RUN.Load >PUSHEA.G StatBuf sec rts *-------------------------------------- -CS.RUN.Save >PUSHWI 0 AUXTYPE - >PUSHBI 6 S.FI.T.BIN - >PUSHBI O.WRONLY+O.CREATE +CS.RUN.Save >PUSHWI A2osX.KCONFIG + >PUSHBI S.FI.T.SYS + >PUSHBI O.WRONLY+O.CREATE+O.TRUNC >LDA.G hFileName >SYSCALL GetMemPtr diff --git a/SBIN/SHELL.S.IO.txt b/SBIN/SHELL.S.IO.txt index acc0ecaf..95daed2b 100644 --- a/SBIN/SHELL.S.IO.txt +++ b/SBIN/SHELL.S.IO.txt @@ -34,13 +34,15 @@ IO.PrintErrMsg pha Save EC for PrintF inc ZPPTR1+1 bra .3 -.8 >PUSHW ZPPTR1 +.8 + >PUSHW ZPPTR1 pla >PUSHA - - >PUSHBI 4 - >LDYA L.MSG.ERROR - >SYSCALL printf + >PUSHBI 3 + >PUSHW L.MSG.ERROR + ldy #S.PS.hStdErr + lda (pPS),y + >SYSCALL fprintf rts *-------------------------------------- MAN diff --git a/SYS/KERNEL.S.DIRENT.txt b/SYS/KERNEL.S.DIRENT.txt index aa35c05e..62a91071 100644 --- a/SYS/KERNEL.S.DIRENT.txt +++ b/SYS/KERNEL.S.DIRENT.txt @@ -34,7 +34,7 @@ K.OpenDir jsr PFT.CheckPathYA lda (ZPPtr2),y One char ? beq .8 No, Go open dir.... -.7 >MLICALL MLIGETFILEINFO + >MLICALL MLIGETFILEINFO bcs .98 file/dir does not exists....quit lda K.MLI.PARAMS+4 cmp #$0F Directory ? @@ -51,13 +51,15 @@ K.OpenDir jsr PFT.CheckPathYA ldy #S.FD.DIR.REF sta (pFD),y -.8 lda #$ff Self Modified - clc - rts +.8 ldx #$ff Self Modified + >LDYA ZPPtr2 + jsr STDIO.NewHFileYAX + + bcc .99 .98 pha save MLI error lda .8+1 - jsr K.FClose =K.CloseDir + jsr K.Close pla get back MLI error sec .99 rts @@ -87,8 +89,7 @@ K.ReadDir.EPB .BS 1 K.ReadDir.EC .BS 2 *-------------------------------------- K.ReadDir jsr PFT.CheckNodeA - jsr K.GetMemPtr - >STYA pFD + jsr STDIO.GetHFile ldy #S.FD.DIR.REF lda (pFD),y diff --git a/SYS/KERNEL.S.INIT.txt b/SYS/KERNEL.S.INIT.txt index 1774d77e..4a265788 100644 --- a/SYS/KERNEL.S.INIT.txt +++ b/SYS/KERNEL.S.INIT.txt @@ -1067,7 +1067,7 @@ A2OSXCONF >PSTR "A2osX.KCONFIG" *-------------------------------------- MLIREAD00 .DA #4 .BS 1 - .DA A2osX.HZ + .DA A2osX.KCONFIG .DA 16 .BS 2 *-------------------------------------- diff --git a/SYS/KERNEL.S.IO.txt b/SYS/KERNEL.S.IO.txt index 20a1667e..ba93b20c 100644 --- a/SYS/KERNEL.S.IO.txt +++ b/SYS/KERNEL.S.IO.txt @@ -20,15 +20,16 @@ K.Open.AUXTYPE .BS 2 *-------------------------------------- K.Open pha >PULLB K.Open.FLAGS - pla - -IO.Open.I jsr STDIO.SetMLIPathYA - + lda #S.FI.T.TXT sta K.Open.TYPE stz K.Open.AUXTYPE stz K.Open.AUXTYPE+1 + pla + +IO.Open.I jsr STDIO.SetMLIPathYA + ldx #5 $/DEV/ cpx K.MLI.PATH bcs IO.OPEN.REG @@ -39,7 +40,7 @@ IO.Open.I jsr STDIO.SetMLIPathYA dex bne .1 *-------------------------------------- -* CDEV,BDEV,DSOCK,SSOCK,PIPE +* /DEV/xxxxxx (CDEV,BDEV,DSOCK,SSOCK,PIPE) *-------------------------------------- >LDYAI K.MLI.PATH+6 skip $/DEV/ diff --git a/SYS/KERNEL.S.PFT.txt b/SYS/KERNEL.S.PFT.txt index 84870707..011160c1 100644 --- a/SYS/KERNEL.S.PFT.txt +++ b/SYS/KERNEL.S.PFT.txt @@ -74,7 +74,9 @@ PFT.CheckPathYA >STYA ZPPtr1 * PULLB/A = hFILE/hDIR * Out : *-------------------------------------- -PFT.CheckNodeA sta .9+1 save hFILE +PFT.CheckNodeA rts + + sta .9+1 save hFILE jsr K.GetMemPtr X = unmodified >STYA ZPPtr1 diff --git a/SYS/KERNEL.S.STDIO.txt b/SYS/KERNEL.S.STDIO.txt index d901b6b1..81ea5320 100644 --- a/SYS/KERNEL.S.STDIO.txt +++ b/SYS/KERNEL.S.STDIO.txt @@ -172,20 +172,20 @@ K.SPrintF >STYA pIOBuf Out Buffer >PULLW ZPPtr1 format bra K.PrintF.1 -K.FPrintF jsr STDIO.GetHFile - bcs K.PutS.RTS - +K.FPrintF pha >PULLW ZPPtr1 format + pla + bra K.PrintF.0 K.PrintF >STYA ZPPtr1 format ldy #S.PS.hStdOut lda (pPs),y - jsr STDIO.GetHFile +K.PrintF.0 jsr STDIO.GetHFile bcs K.PutS.RTS -K.PrintF.0 >LDYAI K.IOBuf + >LDYAI K.IOBuf >STYA pIOBuf K.PrintF.1 stz PrintF.Cnt