menu: INST/DEL deletes the highlighted file on SD or USB

There was no way to remove a file from the C64 side: a stray download,
a failed copy or a test image stayed on the card until it went back to
a PC. INST/DEL on a file in an SD or USB listing now shows its path and
asks "Delete this file? y/n"; y removes it, the folder reloads and the
cursor stays on the same row, or the last one if the file was the end
of the list. Any other key returns to the listing with no message.

The Teensy does the checking and the messaging, in two steps like the
NFC tag pair: rCtlDeleteFileCheckWAIT (61, rsDeleteFileCheck 0x23)
names the file and says in rwRegScratch whether it can go, the menu
asks, and rCtlDeleteFileWAIT (62, rsDeleteFile 0x24) removes it and
reports the same way. Refused, with the reason on screen: Teensy
Memory, a folder or the .. entry, <Empty>, and an entry inside a
mounted disk image. Folders are not deleted. A failed remove, such as
a write-protected card, says so and waits for a key.

The menu side is 57 bytes and still ends in page $71 ($71BB), so the
SID memory-conflict range is unchanged. The header text comes from the
Teensy rather than a menu string, as the REU header does, and all
seven of the feature's messages are PSTR(): a bare literal lands in
.rodata, which the linker script places in DTCM, and these stay in
flash (+196 bytes of flash data, RAM1 variables unchanged; the two
dispatch cases add 64 bytes of ITCM on TR+ and 128 on TR, absorbed by
padding).

Help page 2 lists the key, and General_Usage.md documents it as of
FW 0.9.1. Tested on a TR and a TR+: SD and USB deletes, cancel, each
refusal except on <Empty>, the last item on a page, a write-protected
card, the help page, and with the background SID playing. Not yet
tried: deleting the only file in a folder, DEL on <Empty>, and
removing a /VMS package on the TR+.

Author: SensoriumEmbedded

Source/C64/MainMenuCRT/source/MainMenu.asm

@@ -578,6 +578,30 @@ DirectRunFromTeensyMenu:
    jmp CtlWriteWaitDotsAnyKeyListMenuHighlightCur
 
 
++  cmp #ChrDelete ;Delete highlighted file
+   bne +
+   jsr PrintBanner ;SourcesColor
+   lda TblEscC+EscSourcesColor
+   sta $0286  ;set text color
+   ;header message comes from DeleteFileCheck()
+   lda #rCtlDeleteFileCheckWAIT ;shows the file, or why it can't go
+   sta wRegControl+IO1Port
+   jsr WaitForTRDots
+   lda rwRegScratch+IO1Port ;non-zero: it can, and the y/n prompt is up
+   beq ++
+-  jsr CheckForIRQGetIn
+   beq -
+   cmp #'y'
+   bne +++  ;anything else cancels, straight back to the list
+   lda #rCtlDeleteFileWAIT
+   sta wRegControl+IO1Port
+   jsr WaitForTRDots
+   lda rwRegScratch+IO1Port ;non-zero: deleted, listing reloaded
+   bne +++
+++ jsr AnyKeyMsgWait ;refused or failed, leave the message up
++++ jsr ListMenuItems ; reprint menu
+   jmp HighlightCurrent
+
 +  jmp WaitForJSorKey
 
 ; ******************************* Subroutines ******************************* 

Source/C64/MainMenuCRT/source/Menu_Regs.i

@@ -284,8 +284,10 @@
    rsMakeExtHostStr = 0x20
    rsUninstallExtHost = 0x21
    rsShowExtPackages = 0x22
+   rsDeleteFileCheck = 0x23 ;the highlighted SD/USB file: show it, and in rwRegScratch whether it can go
+   rsDeleteFile = 0x24 ;remove it and reload the listing; rwRegScratch reports success
 
-   rsNumStatusTypes = 0x23
+   rsNumStatusTypes = 0x25
 
    rsReady = 0x5a ;FW->64 (Rd) update finished (done, abort, or otherwise)
    rsC64Message = 0xa5 ;FW->64 (Rd) message for the C64, set to continue when finished
@@ -369,6 +371,8 @@
    rCtlBootComplete = 58 ; menu finished booting: sets BootComplete, reported by the version command
    rCtlBootInProgress = 59 ; clears BootComplete: a remote launch on reset returned and the menu is finishing its boot
    rCtlShowExtPackagesWAIT = 60 ; the /VMS packages on SD, sent as one message per row
+   rCtlDeleteFileCheckWAIT = 61 ; show the highlighted SD/USB file and, in rwRegScratch, whether it can be deleted
+   rCtlDeleteFileWAIT = 62 ; delete it and reload the listing; rwRegScratch reports success
 
 
 

Source/C64/MainMenuCRT/source/c64defs.i

@@ -106,6 +106,7 @@
    ChrUpArrow  = 94
    ChrLeftArrow= 95
    ChrHome     = 19
+   ChrDelete   = 20
    ChrFillLeft = 181
    ChrFillRight= 182
    ChrRun      = 131

Source/C64/TRHelpScreens/source/Pg_HelpInfo2.asm

@@ -40,6 +40,7 @@ MsgHelpMenu2:
    !tx EscC,EscArgSpaces+1, EscC,EscOptionColor, "<Sh>M",         EscC,EscNameColor, " *", EscC,EscSourcesColor, "Meatloaf: Mount/Launch Dxx", ChrReturn
    !tx EscC,EscArgSpaces+1, EscC,EscOptionColor, "<Sh>K",         EscC,EscNameColor, " +", EscC,EscSourcesColor, "Set as Kernal Replace File", ChrReturn
    !tx EscC,EscArgSpaces+1, EscC,EscOptionColor, "<Sh>R",         EscC,EscNameColor, " +", EscC,EscSourcesColor, "Set as REU Pre-load/save File", ChrReturn
+   !tx EscC,EscArgSpaces+1, EscC,EscOptionColor, "<Del>",                                  EscC,EscSourcesColor, "  Delete file (SD/USB)", ChrReturn
    !tx ChrReturn
    !tx EscC,EscNameColor, "   *:", EscC,EscSourcesColor, " External HW Required", ChrReturn
    !tx EscC,EscNameColor, "   +:", EscC,EscSourcesColor, " TeensyROM+ Only", ChrReturn

Source/Teensy/MinimalBoot/Common/IO_Handlers/IOH_TeensyROM.c

@@ -214,6 +214,7 @@ extern void MenuChange();
 extern void HandleExecution();
 extern bool PathIsRoot();
 extern void LoadDirectory(FS *sourceFS);
+extern void FullPathToSelected(char *Path, size_t Size, const char *Name);
 extern void FreeDriveDirMenu();
 extern void RedirectEmptyDriveDirMenu();
 extern void IOHandlerSelectInit();
@@ -977,6 +978,12 @@ void IO1Hndlr_TeensyROM(uint8_t Address, bool R_Wn)
                case rCtlShowExtPackagesWAIT:
                   IO1[rwRegStatus] = rsShowExtPackages; //work this in the main code
                   break;
+               case rCtlDeleteFileCheckWAIT:
+                  IO1[rwRegStatus] = rsDeleteFileCheck; //work this in the main code
+                  break;
+               case rCtlDeleteFileWAIT:
+                  IO1[rwRegStatus] = rsDeleteFile; //work this in the main code
+                  break;
                case rCtlMakeStrWAIT_First ... rCtlMakeStrWAIT_Last:
                   IO1[wRegControl] = Data; //preserve for later use
                   IO1[rwRegStatus] = rsMakeFilenameStr; //work this in the main code

Source/Teensy/MinimalBoot/Common/IO_Handlers/StatusFunctions.c

@@ -1384,6 +1384,81 @@ FLASHMEM void ShowExtPackages()
 #endif
 }
 
+// Delete the highlighted file, from the main menu's INST/DEL key. Two steps, like the NFC
+// tag pair: the check shows the file and answers in rwRegScratch whether it can go, the
+// C64 asks the user, and the delete runs only on a yes. rwRegScratch stays zero on a
+// refusal or a failure, and the message says which.
+// Every message here is PSTR(): a bare literal lands in .rodata, which the linker
+// script places in DTCM, and the menu's own messages already fill enough of it.
+FLASHMEM static bool DeletableSelection()
+{
+   if (IO1[rWRegCurrMenuWAIT] == rmtTeensy)
+   {
+      SendMsgPrintfln(PSTR("Select file from SD or USB only\r"));
+      return false;
+   }
+
+   const size_t PathLen = strlen(DriveDirPath);
+   if (PathLen && DriveDirPath[PathLen-1] == '*') //a disk image's entries, not files on the drive
+   {
+      SendMsgPrintfln(PSTR("Can't delete from inside a disk image\r"));
+      return false;
+   }
+
+   const uint8_t Type = MenuSource[SelItemFullIdx].ItemType;
+   if (Type == rtDirectory || Type == rtNone)
+   {
+      SendMsgPrintfln(PSTR("Only files can be deleted\r"));
+      return false;
+   }
+   return true;
+}
+
+FLASHMEM void DeleteFileCheck()
+{
+   char PathMsg[MaxPathLength];
+
+   SelItemFullIdx = MenuIdxFromRegs(IO1[rwRegCursorItemOnPg]);
+   IO1[rwRegScratch] = 0; //needed for GetCurrentFilePathName, and the answer until proven deletable
+   const bool PathFits = GetCurrentFilePathName(PathMsg, sizeof PathMsg);
+   SendMsgPrintfln(PSTR("Delete File:\r%s\r"), PathMsg);
+
+   if (!DeletableSelection()) return;
+
+   if (!PathFits)
+   {
+      SendMsgPrintfln(PSTR("Path incomplete or too long\r"));
+      return;
+   }
+
+   SendMsgPrintfln(PSTR("Delete this file? y/n"));
+   IO1[rwRegScratch] = 1;
+}
+
+FLASHMEM void DeleteSelectedFile()
+{
+   SelItemFullIdx = MenuIdxFromRegs(IO1[rwRegCursorItemOnPg]);
+   IO1[rwRegScratch] = 0;
+   if (!DeletableSelection()) return; //the cursor hasn't moved since the check, but it's cheap
+
+   FS *sourceFS = &firstPartition;
+   if (IO1[rWRegCurrMenuWAIT] == rmtSD) sourceFS = &SD;
+   char FullFilePath[MaxNamePathLength];
+
+   FullPathToSelected(FullFilePath, sizeof FullFilePath, MenuSource[SelItemFullIdx].Name);
+   if (!sourceFS->remove(FullFilePath))
+   {
+      SendMsgPrintfln(PSTR("Delete failed\r"));
+      return;
+   }
+
+   //LoadDirectory's SetMenu starts the page over; put the cursor back where the file was
+   const uint16_t Idx = SelItemFullIdx;
+   LoadDirectory(sourceFS);
+   SetCursorToItemNum(Idx < NumItemsFull ? Idx : NumItemsFull-1);
+   IO1[rwRegScratch] = 1;
+}
+
 //Unsized so the static_assert below can compare its length against rsNumStatusTypes
 void (*StatusFunction[])() = //match RegStatusTypes order
 {
@@ -1422,6 +1497,8 @@ void (*StatusFunction[])() = //match RegStatusTypes order
    &MakeExtHostStr,      // rsMakeExtHostStr
    &UninstallExtHost,    // rsUninstallExtHost
    &ShowExtPackages,     // rsShowExtPackages
+   &DeleteFileCheck,     // rsDeleteFileCheck
+   &DeleteSelectedFile,  // rsDeleteFile
 };
 static_assert(sizeof(StatusFunction) / sizeof(StatusFunction[0]) == rsNumStatusTypes,
               "StatusFunction[] / RegStatusTypes count mismatch");

Source/Teensy/MinimalBoot/Common/Menu_Regs.h

@@ -290,8 +290,10 @@ enum RegStatusTypes  //rwRegStatus, match StatusFunction order
    rsMakeExtHostStr     = 0x20,
    rsUninstallExtHost   = 0x21,
    rsShowExtPackages    = 0x22,
+   rsDeleteFileCheck    = 0x23, //the highlighted SD/USB file: show it, and in rwRegScratch whether it can go
+   rsDeleteFile         = 0x24, //remove it and reload the listing; rwRegScratch reports success
 
-   rsNumStatusTypes     = 0x23,
+   rsNumStatusTypes     = 0x25,
 
    rsReady              = 0x5a, //FW->64 (Rd) update finished (done, abort, or otherwise)
    rsC64Message         = 0xa5, //FW->64 (Rd) message for the C64, set to continue when finished
@@ -377,6 +379,8 @@ enum RegCtlCommands
    rCtlBootComplete         = 58, // menu finished booting: sets BootComplete, reported by the version command
    rCtlBootInProgress       = 59, // clears BootComplete: a remote launch on reset returned and the menu is finishing its boot
    rCtlShowExtPackagesWAIT  = 60, // the /VMS packages on SD, sent as one message per row
+   rCtlDeleteFileCheckWAIT  = 61, // show the highlighted SD/USB file and, in rwRegScratch, whether it can be deleted
+   rCtlDeleteFileWAIT       = 62, // delete it and reload the listing; rwRegScratch reports success
 
 };                               
 

Source/Teensy/TRMenuFiles/ROMs/TRHelpScreens.prg.h

@@ -153,18 +153,21 @@ PROGMEM static const unsigned char TRHelpScreens_prg[] = {
 	0x45, 0x0d, 0x01, 0x81, 0x01, 0x04, 0x3c, 0xd3, 0x48, 0x3e, 0xd2, 0x01,
 	0x06, 0x20, 0x2b, 0x01, 0x05, 0xd3, 0x45, 0x54, 0x20, 0x41, 0x53, 0x20,
 	0xd2, 0xc5, 0xd5, 0x20, 0xd0, 0x52, 0x45, 0x2d, 0x4c, 0x4f, 0x41, 0x44,
-	0x2f, 0x53, 0x41, 0x56, 0x45, 0x20, 0xc6, 0x49, 0x4c, 0x45, 0x0d, 0x0d,
-	0x01, 0x06, 0x20, 0x20, 0x20, 0x2a, 0x3a, 0x01, 0x05, 0x20, 0xc5, 0x58,
-	0x54, 0x45, 0x52, 0x4e, 0x41, 0x4c, 0x20, 0xc8, 0xd7, 0x20, 0xd2, 0x45,
-	0x51, 0x55, 0x49, 0x52, 0x45, 0x44, 0x0d, 0x01, 0x06, 0x20, 0x20, 0x20,
-	0x2b, 0x3a, 0x01, 0x05, 0x20, 0xd4, 0x45, 0x45, 0x4e, 0x53, 0x59, 0xd2,
-	0xcf, 0xcd, 0x2b, 0x20, 0xcf, 0x4e, 0x4c, 0x59, 0x0d, 0x0d, 0x01, 0x03,
-	0x20, 0xc6, 0x4f, 0x52, 0x20, 0x41, 0x44, 0x44, 0x49, 0x54, 0x49, 0x4f,
-	0x4e, 0x41, 0x4c, 0x20, 0x48, 0x45, 0x4c, 0x50, 0x2c, 0x20, 0x53, 0x45,
-	0x45, 0x3a, 0x0d, 0x01, 0x05, 0x20, 0x47, 0x49, 0x54, 0x48, 0x55, 0x42,
-	0x2e, 0x43, 0x4f, 0x4d, 0x2f, 0xd3, 0x45, 0x4e, 0x53, 0x4f, 0x52, 0x49,
-	0x55, 0x4d, 0xc5, 0x4d, 0x42, 0x45, 0x44, 0x44, 0x45, 0x44, 0x2f, 0xd4,
-	0x45, 0x45, 0x4e, 0x53, 0x59, 0xd2, 0xcf, 0xcd, 0x00, 0x00
+	0x2f, 0x53, 0x41, 0x56, 0x45, 0x20, 0xc6, 0x49, 0x4c, 0x45, 0x0d, 0x01,
+	0x81, 0x01, 0x04, 0x3c, 0xc4, 0x45, 0x4c, 0x3e, 0x01, 0x05, 0x20, 0x20,
+	0xc4, 0x45, 0x4c, 0x45, 0x54, 0x45, 0x20, 0x46, 0x49, 0x4c, 0x45, 0x20,
+	0x28, 0xd3, 0xc4, 0x2f, 0xd5, 0xd3, 0xc2, 0x29, 0x0d, 0x0d, 0x01, 0x06,
+	0x20, 0x20, 0x20, 0x2a, 0x3a, 0x01, 0x05, 0x20, 0xc5, 0x58, 0x54, 0x45,
+	0x52, 0x4e, 0x41, 0x4c, 0x20, 0xc8, 0xd7, 0x20, 0xd2, 0x45, 0x51, 0x55,
+	0x49, 0x52, 0x45, 0x44, 0x0d, 0x01, 0x06, 0x20, 0x20, 0x20, 0x2b, 0x3a,
+	0x01, 0x05, 0x20, 0xd4, 0x45, 0x45, 0x4e, 0x53, 0x59, 0xd2, 0xcf, 0xcd,
+	0x2b, 0x20, 0xcf, 0x4e, 0x4c, 0x59, 0x0d, 0x0d, 0x01, 0x03, 0x20, 0xc6,
+	0x4f, 0x52, 0x20, 0x41, 0x44, 0x44, 0x49, 0x54, 0x49, 0x4f, 0x4e, 0x41,
+	0x4c, 0x20, 0x48, 0x45, 0x4c, 0x50, 0x2c, 0x20, 0x53, 0x45, 0x45, 0x3a,
+	0x0d, 0x01, 0x05, 0x20, 0x47, 0x49, 0x54, 0x48, 0x55, 0x42, 0x2e, 0x43,
+	0x4f, 0x4d, 0x2f, 0xd3, 0x45, 0x4e, 0x53, 0x4f, 0x52, 0x49, 0x55, 0x4d,
+	0xc5, 0x4d, 0x42, 0x45, 0x44, 0x44, 0x45, 0x44, 0x2f, 0xd4, 0x45, 0x45,
+	0x4e, 0x53, 0x59, 0xd2, 0xcf, 0xcd, 0x00, 0x00
 };
 
 #endif /* TRHELPSCREENS_PRG_H */