diff --git a/BIN/RM.S.txt b/BIN/RM.S.txt index 1a89a366..204f86e0 100644 --- a/BIN/RM.S.txt +++ b/BIN/RM.S.txt @@ -11,7 +11,8 @@ AUTO 6 .INB INC/MACROS.I .INB INC/A2OSX.I *-------------------------------------- -ZPListDirPTR .EQ ZPBIN +ZPPtr1 .EQ ZPBIN +ZPPtr2 .EQ ZPBIN+2 *-------------------------------------- * File Header (16 Bytes) *-------------------------------------- @@ -26,11 +27,13 @@ CS.START cld .DA 0 *-------------------------------------- * Relocation Table -*-------------------------------------- +*-------------------------------------- .1 .DA CS.INIT .DA CS.RUN .DA CS.DOEVENT .DA CS.QUIT +L.MSG.OK .DA MSG.OK +L.MSG.ERR .DA MSG.ERR L.FullPath .DA FullPath .DA 0 *-------------------------------------- @@ -45,11 +48,11 @@ CS.INIT lda #0 beq .98 >SYSCALL SYS.GetMemPtrA - >STYA ZPQuickPtr1 - lda (ZPQuickPtr1) + >STYA ZPPtr1 + lda (ZPPtr1) beq .98 ldy #1 - lda (ZPQuickPtr1),y + lda (ZPPtr1),y cmp #'/' bne .10 @@ -101,12 +104,12 @@ CS.RUN ldy #bCANCEL pha >SYSCALL SYS.GetMemPtrA - >STYA ZPQuickPtr1 - lda (ZPQuickPtr1) + >STYA ZPPtr1 + lda (ZPPtr1) pha and #$0F - sta (ZPQuickPtr1) Adjust Filename len + sta (ZPPtr1) Adjust Filename len pla and #$F0 @@ -118,18 +121,18 @@ CS.RUN ldy #bCANCEL ldy #hS.LISTDIR lda (pData),y >SYSCALL SYS.GetMemPtrA - >STYA ZPQuickPtr2 + >STYA ZPPtr2 ldy #S.LISTDIR.hPATH - lda (ZPQuickPtr2),y + lda (ZPPtr2),y >SYSCALL SYS.GetMemPtrA - >STYA ZPQuickPtr2 + >STYA ZPPtr2 - lda (ZPQuickPtr2) + lda (ZPPtr2) tax tay -.2 lda (ZPQuickPtr2),y +.2 lda (ZPPtr2),y sta FullPath,y dey bne .2 @@ -137,33 +140,27 @@ CS.RUN ldy #bCANCEL ldy #0 .3 inx iny - lda (ZPQuickPtr1),y + lda (ZPPtr1),y sta FullPath,x tya - cmp (ZPQuickPtr1) + cmp (ZPPtr1) bne .3 stx FullPath - ldy #0 -.4 iny - lda FullPath,y - jsr COUT - cpy FullPath - bne .4 + >LDYA L.FullPath + >SYSCALL SYS.PSTRoutYA >LDYA L.FullPath >SYSCALL SYS.MLIDestroyYA - bcc .5 - pha - lda #"[" - jsr COUT - pla - jsr PRBYTE - lda #"]" - jsr COUT + bcs .5 + >LDYA L.MSG.OK + >SYSCALL SYS.PSTRoutYA + bra .8 -.5 jsr CROUT +.5 >PUSHA + >LDYA L.MSG.ERR + >SYSCALL SYS.PSTRoutYA .8 pla >SYSCALL SYS.FreeMemA @@ -221,36 +218,11 @@ CS.QUIT ldy #hS.LISTDIR .3 clc rts *-------------------------------------- -PRBYTE pha - lsr - lsr - lsr - lsr - ora #$B0 - cmp #$BA - bcc .1 - adc #6 -.1 jsr COUT - pla - and #$0F - ora #$B0 - cmp #$BA - bcc COUT - adc #6 - bra COUT -*-------------------------------------- -CROUT lda #13 -*-------------------------------------- -COUT phx - phy - ldx #DEVMGR.COUT - jsr pDevJmp - ply - plx - rts -*-------------------------------------- CS.END +MSG.OK >PSTRING " [Ok]\n" +MSG.ERR >PSTRING " [%h]\n" FullPath .BS 64 + *-------------------------------------- .DUMMY .OR 0