fixup! refactor(core): remove residual usage of old flash api

core/embed/trezorhal/flash.h

@@ -51,10 +51,6 @@
 
 void flash_init(void);
 
-secbool flash_write_byte(uint16_t sector, uint32_t offset, uint8_t data);
-
-secbool flash_write_word(uint16_t sector, uint32_t offset, uint32_t data);
-
 uint32_t flash_wait_and_clear_status_flags(void);
 
 secbool __wur flash_otp_read(uint8_t block, uint8_t offset, uint8_t *data,

legacy/flash.c

@@ -95,7 +95,7 @@ uint32_t flash_sector_size(uint16_t sector) {
   return FLASH_SECTOR_TABLE[sector + 1] - FLASH_SECTOR_TABLE[sector];
 }
 
-secbool flash_write_byte(uint8_t sector, uint32_t offset, uint8_t data) {
+secbool flash_write_byte(uint16_t sector, uint32_t offset, uint8_t data) {
   uint8_t *address = (uint8_t *)flash_get_address(sector, offset, 1);
   if (address == NULL) {
     return secfalse;
@@ -115,7 +115,7 @@ secbool flash_write_byte(uint8_t sector, uint32_t offset, uint8_t data) {
   return sectrue;
 }
 
-secbool flash_write_word(uint8_t sector, uint32_t offset, uint32_t data) {
+secbool flash_write_word(uint16_t sector, uint32_t offset, uint32_t data) {
   uint32_t *address = (uint32_t *)flash_get_address(sector, offset, 4);
   if (address == NULL) {
     return secfalse;

legacy/flash.h

@@ -39,7 +39,4 @@
   (FLASH_SR_RDERR | FLASH_SR_PGSERR | FLASH_SR_PGPERR | FLASH_SR_PGAERR | \
    FLASH_SR_WRPERR | FLASH_SR_SOP | FLASH_SR_EOP)
 
-secbool __wur flash_write_byte(uint8_t sector, uint32_t offset, uint8_t data);
-secbool __wur flash_write_word(uint8_t sector, uint32_t offset, uint32_t data);
-
 #endif  // FLASH_H

legacy/intermediate_fw/trezor.c

@@ -35,6 +35,8 @@
 #include "timer.h"
 #include "util.h"
 
+const void *flash_get_address(uint16_t sector, uint32_t offset, uint32_t size);
+
 // legacy storage magic
 #define LEGACY_STORAGE_SECTOR 2
 static const uint32_t META_MAGIC_V10 = 0x525a5254;  // 'TRZR'

legacy/memory.c

@@ -28,6 +28,8 @@
 #define FLASH_OPTION_BYTES_1 (*(const uint64_t *)0x1FFFC000)
 #define FLASH_OPTION_BYTES_2 (*(const uint64_t *)0x1FFFC008)
 
+const void *flash_get_address(uint16_t sector, uint32_t offset, uint32_t size);
+
 void memory_protect(void) {
 #if PRODUCTION
 #if BOOTLOADER_QA

storage/flash_common.c

@@ -1,5 +1,11 @@
 #include "flash.h"
 
+secbool flash_write_byte(uint16_t sector, uint32_t offset, uint8_t data);
+
+secbool flash_write_word(uint16_t sector, uint32_t offset, uint32_t data);
+
+const void *flash_get_address(uint16_t sector, uint32_t offset, uint32_t size);
+
 static uint32_t flash_subarea_get_size(const flash_subarea_t *subarea) {
   uint32_t size = 0;
   for (int s = 0; s < subarea->num_sectors; s++) {

storage/flash_common.h

@@ -19,7 +19,6 @@ void flash_init(void);
 secbool __wur flash_unlock_write(void);
 secbool __wur flash_lock_write(void);
 
-const void *flash_get_address(uint16_t sector, uint32_t offset, uint32_t size);
 uint32_t flash_sector_size(uint16_t sector);
 uint16_t flash_total_sectors(const flash_area_t *area);
 int32_t flash_get_sector_num(const flash_area_t *area,