diff --git a/bdk/mem/minerva.c b/bdk/mem/minerva.c index 66071940..7e9aa925 100644 --- a/bdk/mem/minerva.c +++ b/bdk/mem/minerva.c @@ -37,7 +37,7 @@ static bool no_table = false; static mtc_config_t *mtc_cfg = NULL; void (*mtc_call)(mtc_config_t *mtc_cfg, void *); -u32 minerva_init(minerva_str_t *mtc_str) +int minerva_init(minerva_str_t *mtc_str) { mtc_call = NULL; mtc_cfg = (mtc_config_t *)&mtc_str->mtc_cfg; diff --git a/bdk/mem/minerva.h b/bdk/mem/minerva.h index 96dfa689..a0611c18 100644 --- a/bdk/mem/minerva.h +++ b/bdk/mem/minerva.h @@ -72,7 +72,7 @@ typedef enum } minerva_freq_t; extern void (*minerva_cfg)(mtc_config_t *mtc_cfg, void *); -u32 minerva_init(minerva_str_t *mtc_str); +int minerva_init(minerva_str_t *mtc_str); void minerva_deinit(); void minerva_change_freq(minerva_freq_t freq); void minerva_sdmmc_la_program(void *table, bool t210b01); diff --git a/bdk/mem/sdram.c b/bdk/mem/sdram.c index 427f75ae..052beeaf 100644 --- a/bdk/mem/sdram.c +++ b/bdk/mem/sdram.c @@ -85,9 +85,9 @@ static const u8 dram_encoding_t210b01[] = { #include "sdram_config.inl" #include "sdram_config_t210b01.inl" -static bool _sdram_wait_emc_status(u32 reg_offset, u32 bit_mask, bool updated_state, s32 emc_channel) +static int _sdram_wait_emc_status(u32 reg_offset, u32 bit_mask, bool updated_state, s32 emc_channel) { - bool err = true; + int err = 1; for (s32 i = 0; i < EMC_STATUS_UPDATE_TIMEOUT; i++) { @@ -98,13 +98,13 @@ static bool _sdram_wait_emc_status(u32 reg_offset, u32 bit_mask, bool updated_st if (((EMC_CH1(reg_offset) & bit_mask) != 0) == updated_state) { - err = false; + err = 0; break; } } else if (((EMC(reg_offset) & bit_mask) != 0) == updated_state) { - err = false; + err = 0; break; } usleep(1);