From 96ed9076050d9af2edb087aeab3136e72b0875f9 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Fri, 2 Aug 2019 20:48:38 +0200
Subject: [PATCH] Fix momentarily flash read/write of dicts
---
CHANGELOG.md | 1 +
armsrc/appmain.c | 51 ++++++++++-------------------------------------
armsrc/flashmem.c | 3 +++
3 files changed, 15 insertions(+), 40 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 986105bff..f7aad9983 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@ All notable changes to this project will be documented in this file.
This project uses the changelog in accordance with [keepchangelog](http://keepachangelog.com/). Please use this to write notable changes, which is not the same as git commit log...
## [unreleased][unreleased]
+ - Fix momentarily flash read/write of dicts (@doegox/@cjbrigato)
- Add some more default keys (@anon)
- Add 'hf thinfilm sim' simulating Thinfilm NFC barcode tags (@doegox)
- Add 'hf thinfilm list' specific trace decoding (Thinfilm NFC barcode tags) (@doegox)
diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index b980a3456..f08229783 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -1740,58 +1740,29 @@ static void PacketReceived(PacketCommandNG *packet) {
uint16_t len = packet->oldarg[1];
uint8_t *data = packet->data.asBytes;
- uint32_t tmp = startidx + len;
-
if (!FlashInit()) {
break;
}
- Flash_CheckBusy(BUSY_TIMEOUT);
- Flash_WriteEnable();
-
if (startidx == DEFAULT_T55XX_KEYS_OFFSET) {
+ Flash_CheckBusy(BUSY_TIMEOUT);
+ Flash_WriteEnable();
Flash_Erase4k(3, 0xC);
} else if (startidx == DEFAULT_MF_KEYS_OFFSET) {
+ Flash_CheckBusy(BUSY_TIMEOUT);
+ Flash_WriteEnable();
Flash_Erase4k(3, 0x9);
+ Flash_CheckBusy(BUSY_TIMEOUT);
+ Flash_WriteEnable();
Flash_Erase4k(3, 0xA);
} else if (startidx == DEFAULT_ICLASS_KEYS_OFFSET) {
+ Flash_CheckBusy(BUSY_TIMEOUT);
+ Flash_WriteEnable();
Flash_Erase4k(3, 0xB);
}
- Flash_CheckBusy(BUSY_TIMEOUT);
- Flash_WriteEnable();
-
- // inside 256b page?
- if ((tmp & 0xFF) != 0) {
-
- // is offset+len larger than a page
- tmp = (startidx & 0xFF) + len;
- if (tmp > 0xFF) {
-
- // data spread over two pages.
-
- // offset xxxx10,
- uint8_t first_len = (~startidx & 0xFF) + 1;
-
- // first mem page
- res = Flash_WriteDataCont(startidx, data, first_len);
-
- isok = (res == first_len) ? 1 : 0;
-
- // second mem page
- res = Flash_WriteDataCont(startidx + first_len, data + first_len, len - first_len);
-
- isok &= (res == (len - first_len)) ? 1 : 0;
-
- } else {
- res = Flash_WriteDataCont(startidx, data, len);
- isok = (res == len) ? 1 : 0;
- }
- } else {
- res = Flash_WriteDataCont(startidx, data, len);
- isok = (res == len) ? 1 : 0;
- }
- FlashStop();
+ res = Flash_Write(startidx, data, len);
+ isok = (res == len) ? 1 : 0;
reply_old(CMD_ACK, isok, 0, 0, 0, 0);
LED_B_OFF();
@@ -1831,7 +1802,7 @@ static void PacketReceived(PacketCommandNG *packet) {
for (size_t i = 0; i < numofbytes; i += PM3_CMD_DATA_SIZE) {
size_t len = MIN((numofbytes - i), PM3_CMD_DATA_SIZE);
-
+ Flash_CheckBusy(BUSY_TIMEOUT);
bool isok = Flash_ReadDataCont(startidx + i, mem, len);
if (!isok)
Dbprintf("reading flash memory failed :: | bytes between %d - %d", i, len);
diff --git a/armsrc/flashmem.c b/armsrc/flashmem.c
index 7bca9ddf9..81e5f767d 100644
--- a/armsrc/flashmem.c
+++ b/armsrc/flashmem.c
@@ -563,6 +563,7 @@ void Flashmem_print_info(void) {
uint8_t keysum[2];
uint16_t num;
+ Flash_CheckBusy(BUSY_TIMEOUT);
uint16_t isok = Flash_ReadDataCont(DEFAULT_MF_KEYS_OFFSET, keysum, 2);
if (isok == 2) {
num = ((keysum[1] << 8) | keysum[0]);
@@ -570,6 +571,7 @@ void Flashmem_print_info(void) {
Dbprintf(" Mifare.................."_YELLOW_("%d")"keys", num);
}
+ Flash_CheckBusy(BUSY_TIMEOUT);
isok = Flash_ReadDataCont(DEFAULT_T55XX_KEYS_OFFSET, keysum, 2);
if (isok == 2) {
num = ((keysum[1] << 8) | keysum[0]);
@@ -577,6 +579,7 @@ void Flashmem_print_info(void) {
Dbprintf(" T55x7..................."_YELLOW_("%d")"keys", num);
}
+ Flash_CheckBusy(BUSY_TIMEOUT);
isok = Flash_ReadDataCont(DEFAULT_ICLASS_KEYS_OFFSET, keysum, 2);
if (isok == 2) {
num = ((keysum[1] << 8) | keysum[0]);