diff --git a/A2OSX.BOOT.po b/A2OSX.BOOT.po index 1074f1f9..13ed511f 100644 Binary files a/A2OSX.BOOT.po and b/A2OSX.BOOT.po differ diff --git a/A2OSX.SRC.po b/A2OSX.SRC.po index 0af09df7..74422368 100644 Binary files a/A2OSX.SRC.po and b/A2OSX.SRC.po differ diff --git a/BIN/ASM.S.FIO.txt b/BIN/ASM.S.FIO.txt index 0556ea72..d0331f3c 100644 --- a/BIN/ASM.S.FIO.txt +++ b/BIN/ASM.S.FIO.txt @@ -295,7 +295,10 @@ FIO.LOAD.ASM.T ldy #ASM.T.hMem >PUSHW L.MSG.T.FILE >LIBCALL hLIBSTR,LIBSTR.PRINTF - >LDYA L.ASM.T.FILENAME + >PUSHWI 0 Aux type + >PUSHBI 6 S.FILEINFO.TYPE.BIN + >PUSHBI SYS.FOPEN.R + >PUSHW L.ASM.T.FILENAME >SYSCALL SYS.LoadFileYA bcs .9 diff --git a/INC/A2osX.I.txt b/INC/A2osX.I.txt index 2ca4867f..eec47bed 100644 --- a/INC/A2osX.I.txt +++ b/INC/A2osX.I.txt @@ -472,7 +472,7 @@ S.Time.MINUTE .EQ 5 0..59 S.Time.SECOND .EQ 6 0..61 S.Time.WDAY .EQ 7 1..7 * -K.Time .EQ 8 +S.Time .EQ 8 *-------------------------------------- * S.STAT *-------------------------------------- diff --git a/SBIN/SHELL.S.CMD.txt b/SBIN/SHELL.S.CMD.txt index 2e2080d2..800b4e11 100644 --- a/SBIN/SHELL.S.CMD.txt +++ b/SBIN/SHELL.S.CMD.txt @@ -413,8 +413,11 @@ Cmd.Exec.ECHO lda ARGS *-------------------------------------- Cmd.Exec.TYPE lda ARGS beq .98 - >LDYA L.ARGS - >SYSCALL SYS.LoadFileYA + >PUSHWI 0 Aux type + >PUSHBI 4 S.FILEINFO.TYPE.TXT + >PUSHBI SYS.FOPEN.R + >PUSHW L.ARGS + >SYSCALL SYS.LoadFile bcs .99 >STYA ZPPTR2 store file len diff --git a/SBIN/SHELL.S.txt b/SBIN/SHELL.S.txt index 261be1da..95d466d5 100644 --- a/SBIN/SHELL.S.txt +++ b/SBIN/SHELL.S.txt @@ -290,14 +290,14 @@ CS.EVENT.CTRL.CHAR .2 cpx #10 LF (down arrow) bne .3 - jsr HIK.GetNext + jsr HIS.GetNext clc rts .3 cpx #11 VT (up arrow) bne .4 - jsr HiK.GetPrev + jsr HIS.GetPrev clc rts @@ -444,7 +444,7 @@ EscChars >PSTRING "DBAC" EscAscii .HS 04080A0B15 CMD .BS 256 ARGS .BS 256 -TIME .BS K.Time +TIME .BS S.Time hNEWPATH .BS 1 hCmdLine .BS 1 Cmd.Exec.Mode .BS 1 diff --git a/SBIN/TCPIP.S.txt b/SBIN/TCPIP.S.txt index 7b32af08..72b833dd 100644 --- a/SBIN/TCPIP.S.txt +++ b/SBIN/TCPIP.S.txt @@ -178,319 +178,6 @@ CS.QUIT lda IPCFG+S.IPCFG.HDEV clc rts *-------------------------------------- -CFG.Read >PUSHW L.HOSTNAME - >LDYA L.MSG.CFG - >SYSCALL SYS.PStrOutYA - - jsr CFG.Read.HOSTNAME - bcc .1 - >PUSHA - >LDYA L.MSG.CFG.KO - >SYSCALL SYS.PStrOutYA - bra .2 -.1 >LDYA L.MSG.CFG.OK - >SYSCALL SYS.PStrOutYA - -.2 >PUSHW L.TCPIP.CONF - >LDYA L.MSG.CFG - >SYSCALL SYS.PStrOutYA - - jsr CFG.Read.TCPIP.CONF - bcc .3 - >PUSHA - >LDYA L.MSG.CFG.KO - >SYSCALL SYS.PStrOutYA - bra .4 -.3 >LDYA L.MSG.CFG.OK - >SYSCALL SYS.PStrOutYA - -.4 >PUSHW L.HOSTS - >LDYA L.MSG.CFG - >SYSCALL SYS.PStrOutYA - - jsr CFG.Read.HOSTS - bcc .5 - >PUSHA - >LDYA L.MSG.CFG.KO - >SYSCALL SYS.PStrOutYA - bra .6 -.5 >LDYA L.MSG.CFG.OK - >SYSCALL SYS.PStrOutYA -.6 rts -*-------------------------------------- -CFG.Read.HOSTNAME - >LDYA L.HOSTNAME - >SYSCALL SYS.LoadFileYA - bcs .99 - stx CFG.hCfgFile - >STYA CFG.FileLen - - txa - >SYSCALL SYS.GetMemPtrA - >STYA ZPIPCfgPtr - - lda CFG.FileLen+1 - bne .2 - ldy CFG.FileLen - beq .2 - cpy #15 - bcs .2 - - sta IPCFG+S.IPCFG.HOSTNAME,y - -.1 dey - bmi .89 - lda (ZPIPCfgPtr),y - sta IPCFG+S.IPCFG.HOSTNAME,y - bra .1 - -.2 jsr .89 - sec - rts - -.89 lda CFG.hCfgFile - >SYSCALL SYS.FreeMemA - - clc -.99 rts -*-------------------------------------- -CFG.Read.TCPIP.CONF - >LDYA L.TCPIP.CONF - >SYSCALL SYS.LoadFileYA - bcs .99 - stx CFG.hCfgFile - >STYA CFG.FileLen - txa - >SYSCALL SYS.GetMemPtrA - >STYA ZPIPCfgPtr - -.1 jsr CFG.GetLine - bcs .89 - - jsr CFG.GetKeyword - bcs .1 - - lda CFG.Keyword - bne .3 - - ldy TmpBuffer256 - - lda TmpBuffer256+1,y - cmp #35 DOMAIN too long!!! - bcs .1 - - sta IPCFG+S.IPCFG.DOMAIN - ldx #0 - -.2 lda TmpBuffer256+2,y - sta IPCFG+S.IPCFG.DOMAIN,x - beq .1 - inx - iny - bne .2 - bra .1 - -.3 jsr CFG.ScanIP - bcs .1 - - ldy CFG.Keyword - lda CFG.Keyword.Map,y - tax - ldy #0 - -.4 lda CFG.IP+1,y - sta IPCFG,x - inx - iny - cpy #4 - bne .4 - lda CFG.Keyword - cmp #1 - bne .1 - lda #S.IPCFG.STATUS.OK - sta IPCFG - bra .1 - -.89 lda CFG.hCfgFile - >SYSCALL SYS.FreeMemA - - clc -.99 rts -*-------------------------------------- -CFG.Read.HOSTS >LDYA L.HOSTS - >SYSCALL SYS.LoadFileYA - bcs .99 - stx CFG.hCfgFile - >STYA CFG.FileLen - - txa - >SYSCALL SYS.GetMemPtrA - >STYA ZPIPCfgPtr - -.89 lda CFG.hCfgFile - >SYSCALL SYS.FreeMemA - clc -.99 rts -*-------------------------------------- -CFG.GetLine stz TmpBuffer256 - ldx #0 - ldy #0 - -.1 jsr CFG.GetChar - bne .2 end of file? - txa - bne .8 - sec - rts - -.2 cmp #$0D - beq .8 end of line - inx - sta TmpBuffer256,x - cmp #'=' - bne .3 - txa - dec - tay -.3 cpx #64 line too long ? - bne .1 - sec - rts - -.8 tya = found ? - beq .9 - - sta TmpBuffer256 - txa - sec - sbc TmpBuffer256 - sta TmpBuffer256+1,y - stz TmpBuffer256+1,x End with 0 for ScanIP - clc - rts - -.9 sec - rts -*-------------------------------------- -CFG.GetChar lda CFG.FileLen - bne .1 - lda CFG.FileLen+1 - beq .9 - dec CFG.FileLen+1 -.1 dec CFG.FileLen - lda (ZPIPCfgPtr) - inc ZPIPCfgPtr - bne .9 - inc ZPIPCfgPtr+1 NZ -.9 rts -*-------------------------------------- -CFG.GetKeyword stz CFG.Keyword - - ldx #0 - -.1 phx - ldy #0 - -.2 lda CFG.Keywords,x - cmp TmpBuffer256,y - bne .3 - cpy TmpBuffer256 - beq .4 - inx - iny - bne .2 - plx - sec - rts - -.3 inc CFG.Keyword - plx - txa - sec - adc CFG.Keywords,x - tax - lda CFG.Keywords,x - bne .1 - sec - rts - -.4 plx - clc - rts -*-------------------------------------- -CFG.ScanIP stz CFG.IP - - ldx TmpBuffer256 - -.1 ldy #0 -.11 lda TmpBuffer256+2,x - beq .3 - cmp #'0' - bcc .2 - cmp #'9'+1 - bcs .2 - cpy #3 - beq .9 - iny - sta CFG.StrBuf,y - inx - bra .11 - -.2 cmp #'.' - bne .9 - -.3 sty CFG.StrBuf - lda CFG.IP - cmp #4 - beq .9 - jsr CFG.Dec2Hex - bcs .9 - lda CFG.HexByte - inc CFG.IP - ldy CFG.IP - sta CFG.IP,y - inx - lda TmpBuffer256+1,x - bne .1 - clc - rts - -.9 sec - rts -*-------------------------------------- -CFG.Dec2Hex sec - ldy CFG.StrBuf - beq .9 - - lda CFG.StrBuf+1 - and #$0f - sta CFG.HexByte - - ldy #1 - -.1 cpy CFG.StrBuf - beq .8 - iny - lda CFG.HexByte - asl CFG.HexByte - bcs .9 - asl CFG.HexByte - bcs .9 - adc CFG.HexByte - bcs .9 - asl - bcs .9 - sta CFG.HexByte - lda CFG.StrBuf,y - and #$0f - adc CFG.HexByte - sta CFG.HexByte - bcc .1 -.9 rts - -.8 clc - rts -*-------------------------------------- A2CharAX pha lsr lsr @@ -511,6 +198,8 @@ A2CharAX pha .8 rts *-------------------------------------- pNetDevJmp jmp * +*-------------------------------------- + .INB SBIN/TCPIP.S.CFG *-------------------------------------- CS.END *-------------------------------------- diff --git a/SYS/KERNEL.S.BIN.txt b/SYS/KERNEL.S.BIN.txt index 7045fe89..7cb905a1 100644 --- a/SYS/KERNEL.S.BIN.txt +++ b/SYS/KERNEL.S.BIN.txt @@ -34,8 +34,11 @@ K.LoadBinYA >STYA K.LoadBin.Filename clc rts -.3 >LDYA K.LoadBin.Filename - jsr K.LoadFileYA +.3 >PUSHWI $2000 Aux type + >PUSHBI 6 S.FILEINFO.TYPE.BIN + >PUSHBI SYS.FOPEN.R + >PUSHW K.LoadBin.Filename + jsr K.LoadFile bcs .99 Error Loading file >STYA K.LoadBin.SegLen