Kernel version 0.8 : Migration from LIBSTR/PStrOut to new Kernel Frintf

BIN/LS.S.txt

@@ -97,9 +97,10 @@ CS.RUN			ldy #bCANCEL
 .2				ldy #hDIR
 				lda (pData),y
 				>SYSCALL SYS.READDIRA
-				bcs .9
+				bcc .20
+				rts
 				
-				phx						Save hDIRENT
+.20				phx						Save hDIRENT
 				>STYA ZPPtr1
 				
 .3				lda (ZPPtr1)
@@ -119,32 +120,26 @@ CS.RUN			ldy #bCANCEL
 				cmp #$0F				Directory ?
 				bne .31
 
-				lda #'/'
+				>PUSHW ZPPtr1
-				>SYSCALL SYS.COutA
+				>LDYA L.MSG.DIR
+				>SYSCALL SYS.PrintFYA
+				bra .7
 				
-.31				>LDYA ZPPtr1
+.31				ldy #S.STAT.PRODOS.AUXTYPE+1
-				>SYSCALL SYS.PStrOutYA
-				
-				ldy #S.STAT.PRODOS.TYPE
 				lda (ZPPtr2),y
-				cmp #$0F				Directory ?
+				>PUSHA
-				beq .32
+				dey
+				lda (ZPPtr2),y
+				>PUSHA
 				
-				pha
+				dey
-				lda #'.'
+				lda (ZPPtr2),y
-				>SYSCALL SYS.COutA
-
-				pla
 				jsr FileType2PSTR
-				>SYSCALL SYS.PStrOutYA
+				>PUSHYA
 				
-				
+				>PUSHW ZPPtr1
-				
+				>LDYA L.MSG.FILE
-				
+				>SYSCALL SYS.PrintFYA
-.32
-				
-				lda #13
-				>SYSCALL SYS.COutA
 				
 .7				lda ZPPtr2
 				clc
@@ -158,7 +153,7 @@ CS.RUN			ldy #bCANCEL
 .8				pla
 				>SYSCALL SYS.FreeMemA
 				clc
-.9				rts
+				rts
 *--------------------------------------
 CS.DOEVENT		ldy #S.EVT.hDEV		is Event from active IN device?
 				lda (pEvent),y
@@ -250,8 +245,8 @@ FileType2PSTR	ldy #0
 CS.END
 LIBSTR			>PSTRING "libstr.o"
 MSG.VOL			>CSTRING "/%S\n"
-MSG.DIR			>CSTRING "/%15S  <dir>   %a          %T %t %T %t\n"
+MSG.DIR			>CSTRING "/%15S  <dir>\n"
-MSG.FILE		>CSTRING "%15S %S $%H %a %8L %T %t %T %t\n"
+MSG.FILE		>CSTRING "%15S %S $%H\n"
 *--------------------------------------
 PRODOS.FT.HEX	.HS 0406FAFCFDE2FF
 PRODOS.FT.TXT	>PSTRING "TXT"

SYS/KERNEL.S.CIO.txt

@@ -502,7 +502,7 @@ DEC2HEX			stz HEXBUF
 				pla
 .99				rts
 *--------------------------------------
-ACCESS			.AS "drwxrwxrwx"
+*ACCESS			.AS "drwxrwxrwx"
 HEXBUF			.BS 4					32 bits max
 BCDBUF			.BS 5					5, enough to handle 10 digits (32bits)
 ASCBUF			.BS 12					LEN + sign + 10 digits ($FFFFFFFF=4.294.967.295)

SYS/KERNEL.S.INIT3.txt

@@ -21,30 +21,30 @@ Kernel.Init3	jsr K.DevMgrInit
 				sta A2osX.ASCREEN
 
 				>LDYAI MSG.Init3
-				>SYSCALL SYS.PStrOutYA
+				>SYSCALL SYS.PrintFYA
 				
 				>LDYAI MSG.IRQ
-				>SYSCALL SYS.PStrOutYA
+				>SYSCALL SYS.PrintFYA
 				jsr K.IrqMgrInit
 				bcs *
 
 				>LDYAI MSG.MEM
-				>SYSCALL SYS.PStrOutYA
+				>SYSCALL SYS.PrintFYA
 				jsr K.MemMgrInit
 				bcs *
 
 				>LDYAI MSG.EVT
-				>SYSCALL SYS.PStrOutYA
+				>SYSCALL SYS.PrintFYA
 				jsr K.EvtMgrInit
 				bcs *
 
 				>LDYAI MSG.FLT
-				>SYSCALL SYS.PStrOutYA
+				>SYSCALL SYS.PrintFYA
 				jsr K.FltMgrInit
 				bcs *
 
 				>LDYAI MSG.TSK
-				>SYSCALL SYS.PStrOutYA
+				>SYSCALL SYS.PrintFYA
 				jsr K.TskMgrInit
 				bcs *
 
@@ -54,18 +54,18 @@ Kernel.Init3	jsr K.DevMgrInit
 				 
 				>PUSHYA
 				>LDYAI MSG.Prefix
-				>SYSCALL SYS.PStrOutYA
+				>SYSCALL SYS.PrintFYA
 
 				>PUSHWI STARTUP.CMDLINE
 				>LDYAI MSG.Startup
-				>SYSCALL SYS.PStrOutYA
+				>SYSCALL SYS.PrintFYA
 
 				>LDYAI STARTUP.CMDLINE
 				>SYSCALL SYS.CreateProcessYA
 				bcs .9
 				
 				>LDYAI MSG.Init3.OK
-				>SYSCALL SYS.PStrOutYA
+				>SYSCALL SYS.PrintFYA
 				
 				>LDYAI TskMgr.Table
 				>STYA pPs
@@ -77,7 +77,7 @@ Kernel.Init3	jsr K.DevMgrInit
 				
 .9				>PUSHA
 				>LDYAI MSG.StartupErr
-				>SYSCALL SYS.PStrOutYA
+				>SYSCALL SYS.PrintFYA
 				bra *				
 *--------------------------------------
 * K.DevMgrInit
@@ -274,20 +274,19 @@ I.ENV.A2osX		>PSTRING "A2OSX"
 I.ENV.PATH		>PSTRING "PATH=${A2OSX}SBIN/;${A2OSX}BIN/"
 I.ENV.LIB		>PSTRING "LIB=${A2OSX}LIB/"
 I.ENV.DRV		>PSTRING "DRV=${A2OSX}DRV/"
-*--------------------------------------
-MSG.Init3		>PSTRING "A2osX[Stage3]:Init\n"
-MSG.IRQ			>PSTRING " - Interrupt Manager...\n"
-MSG.MEM			>PSTRING " - Memory Manager...\n"
-MSG.EVT			>PSTRING " - Event Manager...\n"
-MSG.FLT			>PSTRING " - Path Filter...\n"
-MSG.TSK			>PSTRING " - Task Manager...\n"
-MSG.Prefix		>PSTRING "Prefix:%S\n"
-MSG.Startup		>PSTRING "Executing Kernel Startup Script...\nCmd:%S\n"
-MSG.StartupErr	>PSTRING "Failed : [$%h]\n"
-MSG.Init3.OK	>PSTRING "A2osX[Stage3]:Complete.\n"
-*--------------------------------------
 STARTUP.CMDLINE	>PSTRING "${A2OSX}SBIN/SHELL ${A2OSX}A2osX.STARTUP"
 *--------------------------------------
+MSG.Init3		>CSTRING "A2osX[Stage3]:Init\n"
+MSG.IRQ			>CSTRING " - Interrupt Manager...\n"
+MSG.MEM			>CSTRING " - Memory Manager...\n"
+MSG.EVT			>CSTRING " - Event Manager...\n"
+MSG.FLT			>CSTRING " - Path Filter...\n"
+MSG.TSK			>CSTRING " - Task Manager...\n"
+MSG.Prefix		>CSTRING "Prefix:%S\n"
+MSG.Startup		>CSTRING "Executing Kernel Startup Script...\nCmd:%S\n"
+MSG.StartupErr	>CSTRING "Failed : [$%h]\n"
+MSG.Init3.OK	>CSTRING "A2osX[Stage3]:Complete.\n"
+*--------------------------------------
 MAN
 SAVE SYS/KERNEL.S.INIT3
 LOAD SYS/KERNEL.S

SYS/KERNEL.S.MEM.txt

@@ -320,14 +320,14 @@ K.FreeMemA	    phy
 				>PUSHYA
 				
 				>LDYAI K.FreeMemA.ERR
-				jsr K.PStrOutYA
+				jsr K.PrintFYA
 				
 .91				ldx #$ff				
 				bit $C000,x
 				bit $C000,x
 				bra *
 *--------------------------------------
-K.FreeMemA.ERR	>PSTRING "***MemMgr:Attempt to Free an already freed hMem at $%H"
+K.FreeMemA.ERR	>CSTRING "***MemMgr:Attempt to Free an already freed hMem at $%H"
 *--------------------------------------
 * K.GetMemPtrA
 * In:

SYS/KERNEL.S.RUN.txt

@@ -31,7 +31,7 @@ K.KernelRun		jsr TSK.TskMgrRun
 				bpl .10
 				
 				>LDYAI MSG.DumpEvent
-				jsr K.PStrOutYA
+				jsr K.PrintFYA
 
 .2				jsr EVT.DestroyEvent
 
@@ -78,11 +78,11 @@ K.KernelRun		jsr TSK.TskMgrRun
 *--------------------------------------				
 .9				jsr DevMgr.SYS.Select
 				>LDYAI MSG.KRNLPANIC
-				jsr	K.PStrOutYA
+				jsr	K.PrintFYA
 				bra *
 *--------------------------------------
-MSG.DumpEvent	>PSTRING "!Unhandled Event:Flags=%h,DevID=%h,DATALO=%h,DATAHI=%h,W1=%H,W2=%H\n"
+MSG.DumpEvent	>CSTRING "!Unhandled Evt:F=%b,DevID=$%h,DATALO=$%h,DATAHI=$%h,W1=$%H,W2=$%H\n"
-MSG.KRNLPANIC	>PSTRING "\n!!!Kernel Panic!!!\n"
+MSG.KRNLPANIC	>CSTRING "\n!!!Kernel Panic!!!\n"
 *--------------------------------------
 MAN
 SAVE SYS/KERNEL.S.RUN