1
0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-11-23 07:58:09 +00:00

SDIO: remove SDIO_IRQHandler and interrupt config (#53)

This commit is contained in:
mcudev 2017-10-16 18:43:47 -04:00 committed by Pavol Rusnak
parent 6ea9b105e5
commit ac89203e7c

View File

@ -30,9 +30,6 @@
#include "sdcard.h" #include "sdcard.h"
#define IRQ_PRI_SDIO 4
#define IRQ_SUBPRI_SDIO 0
static SD_HandleTypeDef sd_handle; static SD_HandleTypeDef sd_handle;
int sdcard_init(void) { int sdcard_init(void) {
@ -64,16 +61,10 @@ int sdcard_init(void) {
void HAL_SD_MspInit(SD_HandleTypeDef *hsd) { void HAL_SD_MspInit(SD_HandleTypeDef *hsd) {
// enable SDIO clock // enable SDIO clock
__HAL_RCC_SDIO_CLK_ENABLE(); __HAL_RCC_SDIO_CLK_ENABLE();
// NVIC configuration for SDIO interrupts
HAL_NVIC_SetPriority(SDIO_IRQn, IRQ_PRI_SDIO, IRQ_SUBPRI_SDIO);
HAL_NVIC_EnableIRQ(SDIO_IRQn);
// GPIO have already been initialised by sdcard_init // GPIO have already been initialised by sdcard_init
} }
void HAL_SD_MspDeInit(SD_HandleTypeDef *hsd) { void HAL_SD_MspDeInit(SD_HandleTypeDef *hsd) {
HAL_NVIC_DisableIRQ(SDIO_IRQn);
__HAL_RCC_SDIO_CLK_DISABLE(); __HAL_RCC_SDIO_CLK_DISABLE();
} }
@ -137,10 +128,6 @@ uint64_t sdcard_get_capacity_in_bytes(void) {
return (uint64_t)cardinfo.LogBlockNbr * (uint64_t)cardinfo.LogBlockSize; return (uint64_t)cardinfo.LogBlockNbr * (uint64_t)cardinfo.LogBlockSize;
} }
void SDIO_IRQHandler(void) {
HAL_SD_IRQHandler(&sd_handle);
}
static HAL_StatusTypeDef sdcard_wait_finished(SD_HandleTypeDef *sd, uint32_t timeout) { static HAL_StatusTypeDef sdcard_wait_finished(SD_HandleTypeDef *sd, uint32_t timeout) {
// Wait for HAL driver to be ready (eg for DMA to finish) // Wait for HAL driver to be ready (eg for DMA to finish)
uint32_t start = HAL_GetTick(); uint32_t start = HAL_GetTick();