arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-01-09 15:00:58 +00:00
Code Issues Releases Wiki Activity

trezorhal: use uint32_t* for sdcard_{read,write}_blocks

Browse Source
This commit is contained in:
Pavol Rusnak 2017-10-29 16:34:09 +01:00
parent fa802e9353
commit 69c17dae9b
No known key found for this signature in database
GPG Key ID: 91F3B339B9A02A3D
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
embed/boardloader/main.c
View File

@ -124,7 +124,7 @@ static secbool copy_sdcard(void)
uint32_t buf[SDCARD_BLOCK_SIZE / sizeof(uint32_t)]; uint32_t buf[SDCARD_BLOCK_SIZE / sizeof(uint32_t)];
for (int i = 0; i < (IMAGE_HEADER_SIZE + codelen) / SDCARD_BLOCK_SIZE; i++) { for (int i = 0; i < (IMAGE_HEADER_SIZE + codelen) / SDCARD_BLOCK_SIZE; i++) {
sdcard_read_blocks((uint8_t *)buf, i, 1); sdcard_read_blocks(buf, i, 1);
for (int j = 0; j < SDCARD_BLOCK_SIZE / sizeof(uint32_t); j++) { for (int j = 0; j < SDCARD_BLOCK_SIZE / sizeof(uint32_t); j++) {
if (sectrue != flash_write_word(BOOTLOADER_START + i * SDCARD_BLOCK_SIZE + j * sizeof(uint32_t), buf[j])) { if (sectrue != flash_write_word(BOOTLOADER_START + i * SDCARD_BLOCK_SIZE + j * sizeof(uint32_t), buf[j])) {
display_printf("copy failed\n"); display_printf("copy failed\n");

6
embed/trezorhal/sdcard.c
View File

@ -150,7 +150,7 @@ static HAL_StatusTypeDef sdcard_wait_finished(SD_HandleTypeDef *sd, uint32_t tim
return HAL_OK; return HAL_OK;
} }
secbool sdcard_read_blocks(void *dest, uint32_t block_num, uint32_t num_blocks) { secbool sdcard_read_blocks(uint32_t *dest, uint32_t block_num, uint32_t num_blocks) {
// check that SD card is initialised // check that SD card is initialised
if (sd_handle.Instance == NULL) { if (sd_handle.Instance == NULL) {
return secfalse; return secfalse;
@ -163,7 +163,7 @@ secbool sdcard_read_blocks(void *dest, uint32_t block_num, uint32_t num_blocks)
HAL_StatusTypeDef err = HAL_OK; HAL_StatusTypeDef err = HAL_OK;
err = HAL_SD_ReadBlocks(&sd_handle, dest, block_num, num_blocks, 60000); err = HAL_SD_ReadBlocks(&sd_handle, (uint8_t *)dest, block_num, num_blocks, 60000);
if (err == HAL_OK) { if (err == HAL_OK) {
err = sdcard_wait_finished(&sd_handle, 60000); err = sdcard_wait_finished(&sd_handle, 60000);
} }
@ -171,7 +171,7 @@ secbool sdcard_read_blocks(void *dest, uint32_t block_num, uint32_t num_blocks)
return sectrue * (err == HAL_OK); return sectrue * (err == HAL_OK);
} }
secbool sdcard_write_blocks(const void *src, uint32_t block_num, uint32_t num_blocks) { secbool sdcard_write_blocks(const uint32_t *src, uint32_t block_num, uint32_t num_blocks) {
// check that SD card is initialised // check that SD card is initialised
if (sd_handle.Instance == NULL) { if (sd_handle.Instance == NULL) {
return secfalse; return secfalse;

4
embed/trezorhal/sdcard.h
View File

@ -37,7 +37,7 @@ secbool sdcard_is_present(void);
secbool sdcard_power_on(void); secbool sdcard_power_on(void);
secbool sdcard_power_off(void); secbool sdcard_power_off(void);
uint64_t sdcard_get_capacity_in_bytes(void); uint64_t sdcard_get_capacity_in_bytes(void);
secbool sdcard_read_blocks(void *dest, uint32_t block_num, uint32_t num_blocks); secbool sdcard_read_blocks(uint32_t *dest, uint32_t block_num, uint32_t num_blocks);
secbool sdcard_write_blocks(const void *src, uint32_t block_num, uint32_t num_blocks); secbool sdcard_write_blocks(const uint32_t *src, uint32_t block_num, uint32_t num_blocks);
#endif #endif