arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-11-14 03:30:02 +00:00
Code Issues Releases Wiki Activity

modtrezorconfig: use uint16_t for data length

Browse Source
This commit is contained in:
Pavol Rusnak 2017-03-30 21:40:36 +02:00
parent 607161a863
commit 722e71eb31
No known key found for this signature in database
GPG Key ID: 91F3B339B9A02A3D
5 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
micropython/extmod/modtrezorconfig/.gitignore vendored Normal file
View File

@ -0,0 +1,2 @@
*.o
norcow_test

3
micropython/extmod/modtrezorconfig/modtrezorconfig.c
View File

@ -37,9 +37,8 @@ STATIC mp_obj_t mod_TrezorConfig_Config_make_new(const mp_obj_type_t *type, size
STATIC mp_obj_t mod_TrezorConfig_Config_get(mp_obj_t self, mp_obj_t app, mp_obj_t key) {
uint8_t a = mp_obj_get_int(app);
uint8_t k = mp_obj_get_int(key);
uint16_t appkey = a << 8 | k;
uint16_t appkey = a << 8 | k, len;
const void *val;
uint32_t len;
bool r = norcow_get(appkey, &val, &len);
if (!r || len == 0) {
return mp_const_empty_bytes;

30
micropython/extmod/modtrezorconfig/norcow.c
View File

@ -59,9 +59,9 @@ static bool norcow_erase(uint8_t sector)
EraseInitStruct.TypeErase = TYPEERASE_SECTORS;
EraseInitStruct.VoltageRange = VOLTAGE_RANGE_3; // voltage range needs to be 2.7V to 3.6V
EraseInitStruct.NbSectors = 1;
uint32_t SectorError = 0;
EraseInitStruct.Sector = NORCOW_START_SECTOR + sector;
HAL_StatusTypeDef r;
uint32_t SectorError = 0;
r = HAL_FLASHEx_Erase(&EraseInitStruct, &SectorError);
HAL_FLASH_Lock();
return r == HAL_OK;
@ -93,7 +93,7 @@ static const void *norcow_ptr(uint8_t sector, uint32_t offset, uint32_t size)
/*
* Writes data to given sector, starting from offset
*/
static bool norcow_write(uint8_t sector, uint32_t offset, uint32_t prefix, const uint8_t *data, uint32_t len)
static bool norcow_write(uint8_t sector, uint32_t offset, uint32_t prefix, const uint8_t *data, uint16_t len)
{
if (offset % 4) { // we write only at 4-byte boundary
return false;
@ -108,7 +108,7 @@ static bool norcow_write(uint8_t sector, uint32_t offset, uint32_t prefix, const
if ((*(uint32_t *)ptr & prefix) != prefix) {
return false;
}
for (uint32_t i = 0; i < len; i++) {
for (uint16_t i = 0; i < len; i++) {
if ((ptr[sizeof(uint32_t) + i] & data[i]) != data[i]) {
return false;
}
@ -144,7 +144,7 @@ static inline void align4(uint32_t *pos)
/*
* Reads one item starting from offset
*/
static bool read_item(uint8_t sector, uint32_t offset, uint16_t *key, const void **val, uint32_t *len, uint32_t *pos)
static bool read_item(uint8_t sector, uint32_t offset, uint16_t *key, const void **val, uint16_t *len, uint32_t *pos)
{
*pos = offset;
@ -171,7 +171,7 @@ static bool read_item(uint8_t sector, uint32_t offset, uint16_t *key, const void
/*
* Writes one item starting from offset
*/
static bool write_item(uint8_t sector, uint32_t offset, uint16_t key, const void *val, uint32_t len, uint32_t *pos)
static bool write_item(uint8_t sector, uint32_t offset, uint16_t key, const void *val, uint16_t len, uint32_t *pos)
{
uint32_t prefix = (len << 16) | key;
*pos = offset + sizeof(uint32_t) + len;
@ -182,15 +182,15 @@ static bool write_item(uint8_t sector, uint32_t offset, uint16_t key, const void
/*
* Finds item in given sector
*/
static bool find_item(uint8_t sector, uint16_t key, const void **val, uint32_t *len)
static bool find_item(uint8_t sector, uint16_t key, const void **val, uint16_t *len)
{
*val = 0;
*len = 0;
uint32_t offset = 0;
for (;;) {
uint16_t k;
uint16_t k, l;
const void *v;
uint32_t l, pos;
uint32_t pos;
bool r = read_item(sector, offset, &k, &v, &l, &pos);
if (!r) break;
if (key == k) {
@ -209,9 +209,9 @@ static uint32_t find_free_offset(uint8_t sector)
{
uint32_t offset = 0;
for (;;) {
uint16_t key;
uint16_t key, len;
const void *val;
uint32_t len, pos;
uint32_t pos;
bool r = read_item(sector, offset, &key, &val, &len, &pos);
if (!r) break;
offset = pos;
@ -230,16 +230,16 @@ static void compact()
for (;;) {
// read item
uint16_t k;
uint16_t k, l;
const void *v;
uint32_t l, pos;
uint32_t pos;
bool r = read_item(norcow_active_sector, offset, &k, &v, &l, &pos);
if (!r) break;
offset = pos;
// check if not already saved
const void *v2;
uint32_t l2;
uint16_t l2;
r = find_item(norcow_next_sector, k, &v2, &l2);
if (r) {
continue;
@ -318,7 +318,7 @@ bool norcow_wipe(void)
/*
* Looks for the given key, returns status of the operation
*/
bool norcow_get(uint16_t key, const void **val, uint32_t *len)
bool norcow_get(uint16_t key, const void **val, uint16_t *len)
{
return find_item(norcow_active_sector, key, val, len);
}
@ -326,7 +326,7 @@ bool norcow_get(uint16_t key, const void **val, uint32_t *len)
/*
* Sets the given key, returns status of the operation
*/
bool norcow_set(uint16_t key, const void *val, uint32_t len)
bool norcow_set(uint16_t key, const void *val, uint16_t len)
{
// check whether there is enough free space
// and compact if full

4
micropython/extmod/modtrezorconfig/norcow.h
View File

@ -24,11 +24,11 @@ bool norcow_wipe(void);
/*
* Looks for the given key, returns status of the operation
*/
bool norcow_get(uint16_t key, const void **val, uint32_t *len);
bool norcow_get(uint16_t key, const void **val, uint16_t *len);
/*
* Sets the given key, returns status of the operation
*/
bool norcow_set(uint16_t key, const void *val, uint32_t len);
bool norcow_set(uint16_t key, const void *val, uint16_t len);
#endif

3
micropython/extmod/modtrezorconfig/norcow_test.c
View File

@ -9,8 +9,7 @@
#define MAXVALLEN 1024
uint8_t val[MAXVALLEN], *v;
uint16_t key;
uint32_t vallen, vlen;
uint16_t key, vallen, vlen;
int main()
{