From 3560cf5466f6ac5cae2b7749eaba005479e9cd86 Mon Sep 17 00:00:00 2001 From: Philippe Teuwen Date: Sat, 5 Oct 2019 18:42:32 +0200 Subject: [PATCH] bootrom: remove deprecated CMD_SETUP_WRITE --- armsrc/appmain.c | 1 - bootrom/bootrom.c | 9 --------- doc/new_frame_format.md | 2 +- include/pm3_cmd.h | 2 +- 4 files changed, 2 insertions(+), 12 deletions(-) diff --git a/armsrc/appmain.c b/armsrc/appmain.c index 9be4443ed..2f6697429 100644 --- a/armsrc/appmain.c +++ b/armsrc/appmain.c @@ -1895,7 +1895,6 @@ static void PacketReceived(PacketCommandNG *packet) { break; } #endif - case CMD_SETUP_WRITE: case CMD_FINISH_WRITE: case CMD_HARDWARE_RESET: { usb_disable(); diff --git a/bootrom/bootrom.c b/bootrom/bootrom.c index 1b45f4534..4b255536f 100644 --- a/bootrom/bootrom.c +++ b/bootrom/bootrom.c @@ -150,15 +150,6 @@ void UsbPacketReceived(uint8_t *packet, int len) { } break; - case CMD_SETUP_WRITE: { - /* The temporary write buffer of the embedded flash controller is mapped to the - * whole memory region, only the last 8 bits are decoded. - */ - for (i = 0; i < 12; i++) - _flash_start[i + arg0] = c->d.asDwords[i]; - } - break; - case CMD_FINISH_WRITE: { for (int j = 0; j < 2; j++) { uint32_t flash_address = arg0 + (0x100 * j); diff --git a/doc/new_frame_format.md b/doc/new_frame_format.md index 17c94120a..c16aee939 100644 --- a/doc/new_frame_format.md +++ b/doc/new_frame_format.md @@ -200,7 +200,7 @@ Bootrom code will still use the old frame format to remain compatible with other (`bootrom/bootrom.c`) usb_read (common/usb_cdc.c) ⇒ UsbPacketReceived (bootrom.c) - ⇒ CMD_DEVICE_INFO / CMD_START_FLASH / CMD_FINISH_WRITE / CMD_HARDWARE_RESET / CMD_SETUP_WRITE + ⇒ CMD_DEVICE_INFO / CMD_START_FLASH / CMD_FINISH_WRITE / CMD_HARDWARE_RESET also `usb_enable`, `usb_disable` (`common/usb_cdc.c`) diff --git a/include/pm3_cmd.h b/include/pm3_cmd.h index 108e3ba1f..ca778a495 100644 --- a/include/pm3_cmd.h +++ b/include/pm3_cmd.h @@ -253,7 +253,7 @@ typedef struct { // For the bootloader #define CMD_DEVICE_INFO 0x0000 -#define CMD_SETUP_WRITE 0x0001 +//#define CMD_SETUP_WRITE 0x0001 #define CMD_FINISH_WRITE 0x0003 #define CMD_HARDWARE_RESET 0x0004 #define CMD_START_FLASH 0x0005