diff --git a/A2OSX.BOOT.po b/A2OSX.BOOT.po index e5329971..f0df2769 100644 Binary files a/A2OSX.BOOT.po and b/A2OSX.BOOT.po differ diff --git a/A2OSX.SRC.po b/A2OSX.SRC.po index 3d353d84..dde79672 100644 Binary files a/A2OSX.SRC.po and b/A2OSX.SRC.po differ diff --git a/BIN/LS.S.txt b/BIN/LS.S.txt index 9c1b7908..806cc441 100644 --- a/BIN/LS.S.txt +++ b/BIN/LS.S.txt @@ -35,7 +35,7 @@ CS.START cld .DA CS.RUN .DA CS.DOEVENT .DA CS.QUIT -L.MSG.DEV .DA MSG.DEV +L.MSG.DEVEXT .DA MSG.DEVEXT L.MSG.DIR .DA MSG.DIR L.MSG.ENTER .DA MSG.ENTER L.MSG.DIREXT .DA MSG.DIREXT @@ -159,7 +159,11 @@ CS.RUN ldy #bCANCEL sec rts *-------------------------------------- -CS.RUN.DEV ldy #S.STAT.PRODOS.DEVBLOCKS+1 +CS.RUN.DEV ldy #bLong + lda (pData),y + bpl CS.RUN.DIR + + ldy #S.STAT.PRODOS.DEVBLOCKS+1 >PUSHB (ZPPtr2),y dey >PUSHB (ZPPtr2),y @@ -174,9 +178,19 @@ CS.RUN.DEV ldy #S.STAT.PRODOS.DEVBLOCKS+1 >PUSHB (ZPPtr2),y >PUSHW ZPPtr1 - >LDYA L.MSG.DEV + >LDYA L.MSG.DEVEXT >SYSCALL PrintFYA - rts + bcs .9 + + ldy #bRecurse + lda (pData),y + bpl .8 + + >LDYA ZPPtr1 + jmp EnterSubDirYA + +.8 clc +.9 rts *-------------------------------------- CS.RUN.DIR ldy #bAllmostAll lda (pData),y @@ -430,7 +444,7 @@ CS.END OptionList >PSTR "ALR" OptionVars .DA #bAllmostAll,#bLong,#bRecurse *-------------------------------------- -MSG.DEV >CSTR "%15S S%d,D%d Blocks Used:%5D,Total:%5D\n" +MSG.DEVEXT >CSTR "%15S S%d,D%d Blocks Used:%5D,Total:%5D\n" MSG.DIR >CSTR "%S/" MSG.ENTER >CSTR "Directory:%S\n" MSG.DIREXT >CSTR "%16S %a %S %S\n" diff --git a/SYS/KERNEL.S.DIR.txt b/SYS/KERNEL.S.DIR.txt index 329beca3..154a0413 100644 --- a/SYS/KERNEL.S.DIR.txt +++ b/SYS/KERNEL.S.DIR.txt @@ -159,19 +159,15 @@ K.ReadDirA.ROOT stz MLICALL.PARAMS+1 All Volumes beq .88 tax - - >LDYA ZPQuickPtr4 Store actual PTR for MLIGETFILEINFO - >STYA MLICALL.PARAMS+1 - - txa + jsr K.ReadDirA.AddToBuf inc - jsr K.ReadDirA.AddToBuf + sta KrnOut256 lda #'/' - jsr K.ReadDirA.AddToBuf - + sta KrnOut256+1 ldy #1 .4 lda (ZPQuickPtr2),y + sta KrnOut256+1,y jsr K.ReadDirA.AddToBuf iny dex @@ -195,6 +191,9 @@ K.ReadDirA.ROOT stz MLICALL.PARAMS+1 All Volumes lsr sta KrnSTAT+S.STAT.PRODOS.SLOT + >LDYAI KrnOut256 + >STYA MLICALL.PARAMS+1 + >MLICALL MLIGETFILEINFO sta KrnSTAT+S.STAT.PRODOS.DEVSTATUS @@ -203,7 +202,6 @@ K.ReadDirA.ROOT stz MLICALL.PARAMS+1 All Volumes >STYA KrnSTAT+S.STAT.PRODOS.DEVBLOCKS >LDYA MLICALL.PARAMS+8 >STYA KrnSTAT+S.STAT.BLOCKS - .80 jsr K.ReadDirA.ADDSTAT