Ver código fonte

Improve logging on Toolbox commands

Niels Martin Hansen 1 ano atrás
pai
commit
95ba953a31
2 arquivos alterados com 23 adições e 2 exclusões
  1. 12 0
      src/Toolbox.cpp
  2. 11 2
      src/ZuluSCSI_log_trace.cpp

+ 12 - 0
src/Toolbox.cpp

@@ -36,6 +36,7 @@ extern "C" int8_t scsiToolboxEnabled()
     if (enabled == -1)
     {
         enabled = ini_getbool("SCSI", "EnableToolbox", 0, CONFIGFILE);
+        logmsg("Toolbox enabled = ", enabled);
     }
     return enabled == 1;
 }
@@ -348,58 +349,69 @@ extern "C" int scsiToolboxCommand()
     if (unlikely(command == TOOLBOX_COUNT_FILES))
     {
         char img_dir[MAX_FILE_PATH];
+        dbgmsg("TOOLBOX_COUNT_FILES");
         getToolBoxSharedDir(img_dir);
         doCountFiles(img_dir);
     }
     else if (unlikely(command == TOOLBOX_LIST_FILES))
     {
         char img_dir[MAX_FILE_PATH];
+        dbgmsg("TOOLBOX_LIST_FILES");
         getToolBoxSharedDir(img_dir);
         onListFiles(img_dir);
     }
     else if (unlikely(command == TOOLBOX_GET_FILE))
     {
         char img_dir[MAX_FILE_PATH];
+        dbgmsg("TOOLBOX_GET_FILE");
         getToolBoxSharedDir(img_dir);
         onGetFile10(img_dir);
     }
     else if (unlikely(command == TOOLBOX_SEND_FILE_PREP))
     {
         char img_dir[MAX_FILE_PATH];
+        dbgmsg("TOOLBOX_SEND_FILE_PREP");
         getToolBoxSharedDir(img_dir);
         onSendFilePrep(img_dir);
     }
     else if (unlikely(command == TOOLBOX_SEND_FILE_10))
     {
+        dbgmsg("TOOLBOX_SEND_FILE_10");
         onSendFile10();
     }
     else if (unlikely(command == TOOLBOX_SEND_FILE_END))
     {
+        dbgmsg("TOOLBOX_SEND_FILE_END");
         onSendFileEnd();
     }
     else if(unlikely(command == TOOLBOX_TOGGLE_DEBUG))
     {
+        dbgmsg("TOOLBOX_TOGGLE_DEBUG");
         onToggleDebug();
     }
     else if(unlikely(command == TOOLBOX_LIST_CDS))
     {
         char img_dir[4];
+        dbgmsg("TOOLBOX_LIST_CDS");
         snprintf(img_dir, sizeof(img_dir), CD_IMG_DIR, (int)img.scsiId & S2S_CFG_TARGET_ID_BITS);
         onListFiles(img_dir, true);
     }
     else if(unlikely(command == TOOLBOX_SET_NEXT_CD))
     {
         char img_dir[4];
+        dbgmsg("TOOLBOX_SET_NEXT_CD");
         snprintf(img_dir, sizeof(img_dir), CD_IMG_DIR, (int)img.scsiId & S2S_CFG_TARGET_ID_BITS);
         onSetNextCD(img_dir);
     }
     else if(unlikely(command == TOOLBOX_LIST_DEVICES))
     {
+        dbgmsg("TOOLBOX_LIST_DEVICES");
         onListDevices();
     }
     else if (unlikely(command == TOOLBOX_COUNT_CDS))
     {
         char img_dir[4];
+        dbgmsg("TOOLBOX_COUNT_CDS");
         snprintf(img_dir, sizeof(img_dir), CD_IMG_DIR, (int)img.scsiId & S2S_CFG_TARGET_ID_BITS);
         doCountFiles(img_dir, true);
     }

+ 11 - 2
src/ZuluSCSI_log_trace.cpp

@@ -100,8 +100,17 @@ static const char *getCommandName(uint8_t cmd)
         case 0xA8: return "Read12";
         case 0xC0: return "OMTI-5204 DefineFlexibleDiskFormat";
         case 0xC2: return "OMTI-5204 AssignDiskParameters";
-        case 0xD8: return "Vendor 0xD8 Command";
-        case 0xD9: return "Vendor 0xD9 Command";
+        case 0xD0: return "Vendor 0xD0 Command (Toolbox list files)";
+        case 0xD1: return "Vendor 0xD1 Command (Toolbox get file)";
+        case 0xD2: return "Vendor 0xD2 Command (Toolbox count files)";
+        case 0xD3: return "Vendor 0xD3 Command (Toolbox send file prep)";
+        case 0xD4: return "Vendor 0xD4 Command (Toolbox send file 10)";
+        case 0xD5: return "Vendor 0xD5 Command (Toolbox send file end)";
+        case 0xD6: return "Vendor 0xD6 Command (Toolbox toggle debug)";
+        case 0xD7: return "Vendor 0xD7 Command (Toolbox list CDs)";
+        case 0xD8: return "Vendor 0xD8 Command (Toolbox set next CD/Apple/Plextor)";
+        case 0xD9: return "Vendor 0xD9 Command (Toolbox list devices/Apple)";
+        case 0xDA: return "Vendor 0xDA Command (Toolbox count CDs)";
         case 0xE0: return "Xebec RAM Diagnostic";
         case 0xE4: return "Xebec Drive Diagnostic";              
         default:   return "Unknown";