diff --git a/.Docs/KERNEL.md b/.Docs/KERNEL.md index 4bee6c7e..fc8decab 100644 --- a/.Docs/KERNEL.md +++ b/.Docs/KERNEL.md @@ -1327,40 +1327,14 @@ Get System Time in Buffer ## RETURN VALUE S.TIME filled with System date/time -# PTime2Time - Convert ProDOS Time To S.TIME - -## C -`int PTime2Time (long* ptime, S.TIME* timer);` - -## ASM -`>PUSHW ptime` -`>PUSHW timer` -`>SYSCALL PTime2Time` - -## RETURN VALUE - -# CTime2Time - Convert CTime Time To S.TIME - -## C -`int CTime2Time (long* ctime, S.TIME* timer);` - -## ASM -`>PUSHW timer` -`>LDYA ctime` -`>SYSCALL CTime2Time` - -## RETURN VALUE - # StrFTime ## C Convert S.TIME struct to CSTR -`void strftime (char* ptr, const char* format, const struct S.TIME* timeptr );` +`void strftime (char* str, const char* format, const struct S.TIME* timeptr );` ## ASM -`>PUSHW ptr` +`>PUSHW str` `>PUSHW format` + %a : Abbreviated weekday name : Thu + %A : Full weekday name : Thursday @@ -1383,6 +1357,32 @@ Convert S.TIME struct to CSTR ## RETURN VALUE none. always succeed. +# PTime2Time + Convert ProDOS Time To S.TIME + +## C +`int PTime2Time (long* ptime, S.TIME* timer);` + +## ASM +`>PUSHW ptime` +`>PUSHW timer` +`>SYSCALL PTime2Time` + +## RETURN VALUE + +# CTime2Time + Convert CTime Time To S.TIME + +## C +`int CTime2Time (long* ctime, S.TIME* timer);` + +## ASM +`>PUSHW ctime` +`>PUSHW timer` +`>SYSCALL CTime2Time` + +## RETURN VALUE + # open ## C diff --git a/.Floppies/A2OSX.BUILD.po b/.Floppies/A2OSX.BUILD.po index 0e62e2dc..b26ef0e9 100644 Binary files a/.Floppies/A2OSX.BUILD.po and b/.Floppies/A2OSX.BUILD.po differ diff --git a/SYS/KERNEL.S.ENV.txt b/SYS/KERNEL.S.ENV.txt index a059a6e6..a16ef22e 100644 --- a/SYS/KERNEL.S.ENV.txt +++ b/SYS/KERNEL.S.ENV.txt @@ -91,7 +91,7 @@ K.Expand jsr K.strdup .40 jsr ENV.ExpandStrVar bcc .70 -.50 jsr ENV.FindVarTXTPTR +.50 jsr ENV.FindVar bcs .70 jsr ENV.NextEnvP3Y Skip NAME= @@ -458,10 +458,10 @@ K.SetEnv.I jsr K.UnsetEnv.I K.GetEnv >PULLW FORPNT value >PULLW TXTPTR name - lda TXTPTR +K.GetEnv.I lda TXTPTR beq K.GetEnvDump - jsr ENV.FindVarTXTPTR + jsr ENV.FindVar bcs .9 jsr ENV.NextEnvP3Y Skip NAME= @@ -568,7 +568,7 @@ K.GetEnvDump ldy #S.PS.ENVPAGECNT *\-------------------------------------- K.UnsetEnv >PULLW TXTPTR name -K.UnsetEnv.I jsr ENV.FindVarTXTPTR +K.UnsetEnv.I jsr ENV.FindVar bcs K.UnsetEnv.I.8 not found, quit jsr ENV.DelVarP3 Ptr3 -> NAME=VALUE @@ -576,7 +576,7 @@ K.UnsetEnv.I.8 clc K.UnsetEnv.I.9 rts *-------------------------------------- -* ENV.FindVarTXTPTR +* ENV.FindVar * In: * TXTPTR -> NAME * Out: @@ -588,7 +588,7 @@ K.UnsetEnv.I.9 rts * TXTPTR -> NAME * ZPPtr3 -> PTR to Ending 0 *-------------------------------------- -ENV.FindVarTXTPTR +ENV.FindVar .DO AUXENV=1 sta SETREADAUX sta SETWRITEAUX diff --git a/SYS/KERNEL.S.GP.txt b/SYS/KERNEL.S.GP.txt index 63ed3549..0d9d59d6 100644 --- a/SYS/KERNEL.S.GP.txt +++ b/SYS/KERNEL.S.GP.txt @@ -77,7 +77,6 @@ GP.Sleep2 ldy #S.PS.PC tsx inx - beq * inx keep PC HI,LO from KERNEL jsr PSExec/PSResume inx Stack Ptr is $1ff if empty diff --git a/SYS/KERNEL.S.MD5X.txt b/SYS/KERNEL.S.MD5X.txt index e308c345..a00fd9e7 100644 --- a/SYS/KERNEL.S.MD5X.txt +++ b/SYS/KERNEL.S.MD5X.txt @@ -2,12 +2,16 @@ NEW AUTO 3,1 *-------------------------------------- .DUMMY - .OR ZPLIB + .OR ZPTMP 29 bytes ZS.START -ZPCtxPtr .BS 2 ZPDataPtr .BS 2 +ZPDataLen .BS 2 ZPHashPtr .BS 2 +ZPCtxPtr .BS 2 + +ZPChunkLen .BS 2 + ZS.END .ED *-------------------------------------- * DWORD Macros : Do NOT disturb carry with cpx, cpy... @@ -505,11 +509,8 @@ MD5.K .HS 78A46AD7.56B7C7E8.DB702024.EECEBDC1 .HS 4F7EA86F.E0E62CFE.144301A3.A111084E .HS 827E53F7.35F23ABD.BBD2D72A.91D386EB *-------------------------------------- -MD5.DIGITS .AS "0123456789ABCDEF" +MD5.DIGITS .AS "0123456789abcdef" *-------------------------------------- -ZPChunkLen .BS 2 -ZPDataLen .BS 2 - MD5.ABCD MD5.A .BS 4 Chunk Level,A,B,C,D MD5.B .BS 4