diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index f89f6123c..685cd5c6b 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -1069,7 +1069,12 @@ void UsbPacketReceived(uint8_t *packet, int len) {
 		case CMD_READ_MEM:
 			ReadMem(c->arg[0]);
 			break;
-
+		case CMD_READ_FLASH_MEM:
+		case CMD_WRITE_FLASH_MEM:
+		case CMD_UPLOAD_FLASH_MEM:
+		case CMD_DOWNLOAND_FLASH_MEM:
+			EXFLASH_TEST();
+			break;
 		case CMD_SET_LF_DIVISOR:
 		  	FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
 			FpgaSendCommand(FPGA_CMD_SET_DIVISOR, c->arg[0]);
@@ -1125,11 +1130,11 @@ void UsbPacketReceived(uint8_t *packet, int len) {
 
 		case CMD_DEVICE_INFO: {
 			uint32_t dev_info = DEVICE_INFO_FLAG_OSIMAGE_PRESENT | DEVICE_INFO_FLAG_CURRENT_MODE_OS;
-        if (common_area.flags.bootrom_present)
-            dev_info |= DEVICE_INFO_FLAG_BOOTROM_PRESENT;
-			cmd_send(CMD_DEVICE_INFO,dev_info,0,0,0,0);	
-			break;
-		}
+			if (common_area.flags.bootrom_present)
+				dev_info |= DEVICE_INFO_FLAG_BOOTROM_PRESENT;
+				cmd_send(CMD_DEVICE_INFO,dev_info,0,0,0,0);	
+				break;
+			}
 		default:
 			Dbprintf("%s: 0x%04x","unknown command:",c->cmd);
 			break;
diff --git a/client/hid-flasher/usb_cmd.h b/client/hid-flasher/usb_cmd.h
index f9c1d0509..3d358e80b 100644
--- a/client/hid-flasher/usb_cmd.h
+++ b/client/hid-flasher/usb_cmd.h
@@ -55,7 +55,13 @@ typedef struct {
 
 #define CMD_DOWNLOAD_EML_BIGBUF											  0x0110
 #define CMD_DOWNLOADED_EML_BIGBUF										  0x0111
- 
+
+// For Flash memory operations
+#define CMD_READ_FLASH_MEM												  0x0120
+#define CMD_WRITE_FLASH_MEM												  0x0121
+#define CMD_UPLOAD_FLASH_MEM											  0x0122
+#define CMD_DOWNLOAND_FLASH_MEM											  0x0123
+
 // For low-frequency tags
 #define CMD_READ_TI_TYPE                                                  0x0202
 #define CMD_WRITE_TI_TYPE                                                 0x0203
diff --git a/include/usb_cmd.h b/include/usb_cmd.h
index 761650da9..0f91178f2 100644
--- a/include/usb_cmd.h
+++ b/include/usb_cmd.h
@@ -67,6 +67,12 @@ typedef struct{
 #define CMD_DOWNLOAD_EML_BIGBUF											  0x0110
 #define CMD_DOWNLOADED_EML_BIGBUF										  0x0111
 
+// For Flash memory operations
+#define CMD_READ_FLASH_MEM												  0x0120
+#define CMD_WRITE_FLASH_MEM												  0x0121
+#define CMD_UPLOAD_FLASH_MEM											  0x0122
+#define CMD_DOWNLOAND_FLASH_MEM											  0x0123
+
 // For low-frequency tags
 #define CMD_READ_TI_TYPE                                                  0x0202
 #define CMD_WRITE_TI_TYPE                                                 0x0203