From b3e668db8b513ceb8237caaed76b8b8d09f214b5 Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <stick@gk2.sk>
Date: Wed, 14 Nov 2018 16:25:36 +0100
Subject: [PATCH] embed/extmod/modtrezorconfig: small refactor to storage

---
 embed/extmod/modtrezorconfig/storage.c | 6 +++---
 embed/extmod/modtrezorconfig/storage.h | 6 +++---
 embed/trezorhal/flash.c                | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/embed/extmod/modtrezorconfig/storage.c b/embed/extmod/modtrezorconfig/storage.c
index 39f6753c5..5e0f8343b 100644
--- a/embed/extmod/modtrezorconfig/storage.c
+++ b/embed/extmod/modtrezorconfig/storage.c
@@ -129,7 +129,7 @@ static secbool pin_get_fails(const uint32_t **pinfail, uint32_t *pofs)
     return sectrue;
 }
 
-secbool storage_check_pin(uint32_t pin)
+secbool storage_check_pin(const uint32_t pin)
 {
     const uint32_t *pinfail = NULL;
     uint32_t ofs;
@@ -189,7 +189,7 @@ secbool storage_unlock(const uint32_t pin)
     return unlocked;
 }
 
-secbool storage_get(uint16_t key, const void **val, uint16_t *len)
+secbool storage_get(const uint16_t key, const void **val, uint16_t *len)
 {
     const uint8_t app = key >> 8;
     // APP == 0 is reserved for PIN related values
@@ -203,7 +203,7 @@ secbool storage_get(uint16_t key, const void **val, uint16_t *len)
     return norcow_get(key, val, len);
 }
 
-secbool storage_set(uint16_t key, const void *val, uint16_t len)
+secbool storage_set(const uint16_t key, const void *val, uint16_t len)
 {
     const uint8_t app = key >> 8;
     // APP == 0 is reserved for PIN related values
diff --git a/embed/extmod/modtrezorconfig/storage.h b/embed/extmod/modtrezorconfig/storage.h
index 0a8944186..797528175 100644
--- a/embed/extmod/modtrezorconfig/storage.h
+++ b/embed/extmod/modtrezorconfig/storage.h
@@ -28,11 +28,11 @@ typedef void (*PIN_UI_WAIT_CALLBACK)(uint32_t wait, uint32_t progress);
 
 void storage_init(PIN_UI_WAIT_CALLBACK callback);
 void storage_wipe(void);
-secbool storage_check_pin(uint32_t pin);
+secbool storage_check_pin(const uint32_t pin);
 secbool storage_unlock(const uint32_t pin);
 secbool storage_has_pin(void);
 secbool storage_change_pin(const uint32_t oldpin, const uint32_t newpin);
-secbool storage_get(uint16_t key, const void **val, uint16_t *len);
-secbool storage_set(uint16_t key, const void *val, uint16_t len);
+secbool storage_get(const uint16_t key, const void **val, uint16_t *len);
+secbool storage_set(const uint16_t key, const void *val, uint16_t len);
 
 #endif
diff --git a/embed/trezorhal/flash.c b/embed/trezorhal/flash.c
index 92d8c0729..f6f971930 100644
--- a/embed/trezorhal/flash.c
+++ b/embed/trezorhal/flash.c
@@ -81,7 +81,7 @@ const void *flash_get_address(uint8_t sector, uint32_t offset, uint32_t size)
     if (addr + size > next) {
         return NULL;
     }
-    return addr;
+    return (const void *)addr;
 }
 
 secbool flash_erase_sectors(const uint8_t *sectors, int len, void (*progress)(int pos, int len))