diff --git a/bootloader/config/config.c b/bootloader/config/config.c index c4a28fa..3b0ee00 100644 --- a/bootloader/config/config.c +++ b/bootloader/config/config.c @@ -133,7 +133,7 @@ void config_autoboot() LIST_INIT(ini_sections); u8 max_entries = 29; - int ini_freed = 1; + bool ini_freed = true; ment_t *ments = (ment_t *)malloc(sizeof(ment_t) * (max_entries + 3)); u32 *boot_values = (u32 *)malloc(sizeof(u32) * max_entries); @@ -146,7 +146,7 @@ void config_autoboot() { if (ini_parse(&ini_sections, "hekate_ipl.ini")) { - ini_freed = 0; + ini_freed = false; // Build configuration menu. ments[0].type = MENT_BACK; diff --git a/bootloader/gfx/di.c b/bootloader/gfx/di.c index c7cd7d9..7cdee16 100644 --- a/bootloader/gfx/di.c +++ b/bootloader/gfx/di.c @@ -137,18 +137,16 @@ void display_init() exec_cfg((u32 *)DISPLAY_A_BASE, _display_config_11, 113); } -void display_backlight(u8 enable) +void display_backlight(bool enable) { gpio_write(GPIO_PORT_V, GPIO_PIN_0, enable ? GPIO_HIGH : GPIO_LOW); // Backlight PWM. } void display_end() { - display_backlight(0); + display_backlight(false); - //TODO: figure out why this freezes. - - /*DSI(_DSIREG(DSI_VIDEO_MODE_CONTROL)) = 1; + DSI(_DSIREG(DSI_VIDEO_MODE_CONTROL)) = 1; DSI(_DSIREG(DSI_WR_DATA)) = 0x2805; u32 end = HOST1X(0x30A4) + 5; @@ -171,17 +169,17 @@ void display_end() usleep(50000); - //gpio_write(GPIO_PORT_V, GPIO_PIN_2, GPIO_LOW); //Backlight Reset disable. + gpio_write(GPIO_PORT_V, GPIO_PIN_2, GPIO_LOW); //Backlight Reset disable. - //usleep(10000); + usleep(10000); - //gpio_write(GPIO_PORT_I, GPIO_PIN_1, GPIO_LOW); //Backlight -5V disable. + gpio_write(GPIO_PORT_I, GPIO_PIN_1, GPIO_LOW); //Backlight -5V disable. - //usleep(10000); + usleep(10000); - //gpio_write(GPIO_PORT_I, GPIO_PIN_0, GPIO_LOW); //Backlight +5V disable. + gpio_write(GPIO_PORT_I, GPIO_PIN_0, GPIO_LOW); //Backlight +5V disable. - //usleep(10000); + usleep(10000); //Disable clocks. CLOCK(CLK_RST_CONTROLLER_RST_DEV_H_SET) = 0x1010000; @@ -190,7 +188,7 @@ void display_end() CLOCK(CLK_RST_CONTROLLER_CLK_ENB_L_CLR) = 0x18000000; DSI(_DSIREG(DSI_PAD_CONTROL_0)) = DSI_PAD_CONTROL_VS1_PULLDN_CLK | DSI_PAD_CONTROL_VS1_PULLDN(0xF) | DSI_PAD_CONTROL_VS1_PDIO_CLK | DSI_PAD_CONTROL_VS1_PDIO(0xF); - DSI(_DSIREG(DSI_POWER_CONTROL)) = 0;*/ + DSI(_DSIREG(DSI_POWER_CONTROL)) = 0; gpio_config(GPIO_PORT_V, GPIO_PIN_0, GPIO_MODE_SPIO); // Backlight PWM. @@ -211,7 +209,7 @@ void display_color_screen(u32 color) usleep(35000); - display_backlight(1); + display_backlight(true); } u32 *display_init_framebuffer() diff --git a/bootloader/gfx/di.h b/bootloader/gfx/di.h index 45f8d4d..0e8b5e9 100644 --- a/bootloader/gfx/di.h +++ b/bootloader/gfx/di.h @@ -345,7 +345,7 @@ void display_end(); void display_color_screen(u32 color); /*! Switches screen backlight ON/OFF. */ -void display_backlight(u8 enable); +void display_backlight(bool enable); /*! Init display in full 1280x720 resolution (B8G8R8A8, line stride 768, framebuffer size = 1280*768*4 bytes). */ u32 *display_init_framebuffer(); diff --git a/bootloader/gfx/tui.c b/bootloader/gfx/tui.c index 364f436..250a657 100644 --- a/bootloader/gfx/tui.c +++ b/bootloader/gfx/tui.c @@ -31,7 +31,7 @@ extern u8 *Kc_MENU_LOGO; extern hekate_config h_cfg; -void tui_sbar(gfx_con_t *con, int force_update) +void tui_sbar(gfx_con_t *con, bool force_update) { u32 timePassed = get_tmr_s() - h_cfg.sbar_time_keeping; if (!force_update) @@ -90,7 +90,7 @@ void tui_pbar(gfx_con_t *con, int x, int y, u32 val, u32 fgcol, u32 bgcol) gfx_con_setpos(con, cx, cy); // Update status bar. - tui_sbar(con, 0); + tui_sbar(con, false); } void *tui_do_menu(gfx_con_t *con, menu_t *menu) @@ -98,7 +98,7 @@ void *tui_do_menu(gfx_con_t *con, menu_t *menu) int idx = 0, prev_idx = 0, cnt = 0x7FFFFFFF; gfx_clear_partial_grey(con->gfx_ctxt, 0x1B, 0, 1256); - tui_sbar(con, 1); + tui_sbar(con, true); #ifdef MENU_LOGO_ENABLE gfx_set_rect_rgb(con->gfx_ctxt, Kc_MENU_LOGO, @@ -197,7 +197,7 @@ void *tui_do_menu(gfx_con_t *con, menu_t *menu) X_MENU_LOGO, Y_MENU_LOGO, X_POS_MENU_LOGO, Y_POS_MENU_LOGO); #endif //MENU_LOGO_ENABLE } - tui_sbar(con, 0); + tui_sbar(con, false); } return NULL; diff --git a/bootloader/gfx/tui.h b/bootloader/gfx/tui.h index feb4c8f..306fedd 100644 --- a/bootloader/gfx/tui.h +++ b/bootloader/gfx/tui.h @@ -58,7 +58,7 @@ typedef struct _menu_t #define MDEF_CAPTION(caption, color) { MENT_CAPTION, caption, color } #define MDEF_CHGLINE() {MENT_CHGLINE} -void tui_sbar(gfx_con_t *con, int force_update); +void tui_sbar(gfx_con_t *con, bool force_update); void tui_pbar(gfx_con_t *con, int x, int y, u32 val, u32 fgcol, u32 bgcol); void *tui_do_menu(gfx_con_t *con, menu_t *menu); diff --git a/bootloader/hos/hos.c b/bootloader/hos/hos.c index 17b3986..38f2106 100644 --- a/bootloader/hos/hos.c +++ b/bootloader/hos/hos.c @@ -67,9 +67,9 @@ typedef struct _launch_ctxt_t link_t kip1_list; char* kip1_patches; - int svcperm; - int debugmode; - int atmosphere; + bool svcperm; + bool debugmode; + bool atmosphere; } launch_ctxt_t; typedef struct _merge_kip_t @@ -358,7 +358,7 @@ static int _config_svcperm(launch_ctxt_t *ctxt, const char *value) if (*value == '1') { DPRINTF("Disabled SVC verification\n"); - ctxt->svcperm = 1; + ctxt->svcperm = true; } return 1; } @@ -368,7 +368,7 @@ static int _config_debugmode(launch_ctxt_t *ctxt, const char *value) if (*value == '1') { DPRINTF("Enabled Debug mode\n"); - ctxt->debugmode = 1; + ctxt->debugmode = true; } return 1; } @@ -378,7 +378,7 @@ static int _config_atmosphere(launch_ctxt_t *ctxt, const char *value) if (*value == '1') { DPRINTF("Enabled atmosphere patching\n"); - ctxt->atmosphere = 1; + ctxt->atmosphere = true; } return 1; } @@ -457,7 +457,6 @@ int hos_launch(ini_sec_t *cfg) int bootStateDramPkg2 = 0; int bootStatePkg2Continue = 0; int exoFwNumber = 0; - int end_di = 0; launch_ctxt_t ctxt; memset(&ctxt, 0, sizeof(launch_ctxt_t)); @@ -611,7 +610,6 @@ int hos_launch(ini_sec_t *cfg) se_key_acc_ctrl(13, 0xFF); bootStateDramPkg2 = 2; bootStatePkg2Continue = 3; - end_di = 1; if (!exoFwNumber) exoFwNumber = 3; break; @@ -662,7 +660,8 @@ int hos_launch(ini_sec_t *cfg) *mb_in = bootStateDramPkg2; *mb_out = 0; - display_backlight(0); + // Disable display. This must be executed before secmon to provide support for all fw versions. + display_end(); // Wait for secmon to get ready. cluster_boot_cpu0(ctxt.pkg1_id->secmon_base); @@ -679,10 +678,6 @@ int hos_launch(ini_sec_t *cfg) PMC(0x5BC) = 0xFFFFFFFF; PMC(0x5C0) = 0xFFAAFFFF;*/ - // Disable display. - if (end_di) - display_end(); - // Signal pkg2 ready and continue boot. *mb_in = bootStatePkg2Continue; diff --git a/bootloader/hos/pkg1.c b/bootloader/hos/pkg1.c index 07d71a7..9cd4e6f 100644 --- a/bootloader/hos/pkg1.c +++ b/bootloader/hos/pkg1.c @@ -75,12 +75,12 @@ PATCHSET_DEF(_secmon_5_patchset, */ static const pkg1_id_t _pkg1_ids[] = { - { "20161121183008", 0, 0x1900, 0x3FE0, { 2, 1, 0 }, SM_100_ADR, 0x8000D000, 1, _secmon_1_patchset }, //1.0.0 (Patched relocator) - { "20170210155124", 0, 0x1900, 0x3FE0, { 0, 1, 2 }, 0x4002D000, 0x8000D000, 1, _secmon_2_patchset }, //2.0.0 - 2.3.0 - { "20170519101410", 1, 0x1A00, 0x3FE0, { 0, 1, 2 }, 0x4002D000, 0x8000D000, 1, _secmon_3_patchset }, //3.0.0 - { "20170710161758", 2, 0x1A00, 0x3FE0, { 0, 1, 2 }, 0x4002D000, 0x8000D000, 1, _secmon_3_patchset }, //3.0.1 - 3.0.2 - { "20170921172629", 3, 0x1800, 0x3FE0, { 1, 2, 0 }, 0x4002B000, 0x4003B000, 0, _secmon_4_patchset }, //4.0.0 - 4.1.0 - { "20180220163747", 4, 0x1900, 0x3FE0, { 1, 2, 0 }, 0x4002B000, 0x4003B000, 0, _secmon_5_patchset }, //5.0.0 - 5.1.0 + { "20161121183008", 0, 0x1900, 0x3FE0, { 2, 1, 0 }, SM_100_ADR, 0x8000D000, true, _secmon_1_patchset }, //1.0.0 (Patched relocator) + { "20170210155124", 0, 0x1900, 0x3FE0, { 0, 1, 2 }, 0x4002D000, 0x8000D000, true, _secmon_2_patchset }, //2.0.0 - 2.3.0 + { "20170519101410", 1, 0x1A00, 0x3FE0, { 0, 1, 2 }, 0x4002D000, 0x8000D000, true, _secmon_3_patchset }, //3.0.0 + { "20170710161758", 2, 0x1A00, 0x3FE0, { 0, 1, 2 }, 0x4002D000, 0x8000D000, true, _secmon_3_patchset }, //3.0.1 - 3.0.2 + { "20170921172629", 3, 0x1800, 0x3FE0, { 1, 2, 0 }, 0x4002B000, 0x4003B000, false, _secmon_4_patchset }, //4.0.0 - 4.1.0 + { "20180220163747", 4, 0x1900, 0x3FE0, { 1, 2, 0 }, 0x4002B000, 0x4003B000, false, _secmon_5_patchset }, //5.0.0 - 5.1.0 { NULL } //End. }; diff --git a/bootloader/hos/pkg1.h b/bootloader/hos/pkg1.h index 9e84f3f..7d477f6 100644 --- a/bootloader/hos/pkg1.h +++ b/bootloader/hos/pkg1.h @@ -40,7 +40,7 @@ typedef struct _pkg1_id_t u32 sec_map[3]; u32 secmon_base; u32 warmboot_base; - int set_warmboot; + bool set_warmboot; patch_t *secmon_patchset; } pkg1_id_t; diff --git a/bootloader/main.c b/bootloader/main.c index 9dc8a1e..14ab035 100644 --- a/bootloader/main.c +++ b/bootloader/main.c @@ -79,7 +79,7 @@ gfx_con_t gfx_con; sdmmc_t sd_sdmmc; sdmmc_storage_t sd_storage; FATFS sd_fs; -int sd_mounted; +bool sd_mounted; #ifdef MENU_LOGO_ENABLE u8 *Kc_MENU_LOGO; @@ -87,10 +87,10 @@ u8 *Kc_MENU_LOGO; hekate_config h_cfg; -int sd_mount() +bool sd_mount() { if (sd_mounted) - return 1; + return true; if (!sdmmc_storage_init_sd(&sd_storage, &sd_sdmmc, SDMMC_1, SDMMC_BUS_WIDTH_4, 11)) { @@ -103,7 +103,7 @@ int sd_mount() if (res == FR_OK) { sd_mounted = 1; - return 1; + return true; } else { @@ -111,7 +111,7 @@ int sd_mount() } } - return 0; + return false; } void sd_unmount() @@ -120,7 +120,7 @@ void sd_unmount() { f_mount(NULL, "", 1); sdmmc_storage_end(&sd_storage); - sd_mounted = 0; + sd_mounted = false; } } @@ -175,7 +175,7 @@ void emmcsn_path_impl(char *path, char *sub_dir, char *filename, sdmmc_storage_t sdmmc_storage_t storage2; sdmmc_t sdmmc; char emmcSN[9]; - int init_done = 0; + bool init_done = false; memcpy(path, "Backup", 7); f_mkdir(path); @@ -186,7 +186,7 @@ void emmcsn_path_impl(char *path, char *sub_dir, char *filename, sdmmc_storage_t memcpy(emmcSN, "00000000", 9); else { - init_done = 1; + init_done = true; itoa(storage2.cid.serial, emmcSN, 16); } } @@ -401,7 +401,7 @@ void config_hw() sdram_lp0_save_params(sdram_get_params()); } -void reconfig_hw_workaround(int extra_reconfig) +void reconfig_hw_workaround(bool extra_reconfig) { // Re-enable clocks to Audio Processing Engine as a workaround to hanging. CLOCK(CLK_RST_CONTROLLER_CLK_OUT_ENB_V) |= 0x400; // Enable AHUB clock. @@ -789,7 +789,7 @@ void reboot_rcm() #endif //MENU_LOGO_ENABLE PMC(APBDEV_PMC_SCRATCH0) = 2; // Reboot into rcm. PMC(0) |= 0x10; - while (1) + while (true) usleep(1); } @@ -914,8 +914,8 @@ int dump_emmc_part(char *sd_path, sdmmc_storage_t *storage, emmc_part_t *part) u32 currPartIdx = 0; u32 numSplitParts = 0; u32 maxSplitParts = 0; - int isSmallSdCard = 0; - int partialDumpInProgress = 0; + bool isSmallSdCard = false; + bool partialDumpInProgress = false; int res = 0; char *outFilename = sd_path; u32 sdPathLen = strlen(sd_path); @@ -938,7 +938,7 @@ int dump_emmc_part(char *sd_path, sdmmc_storage_t *storage, emmc_part_t *part) // Check if the USER partition or the RAW eMMC fits the sd card free space. if (totalSectors > (sd_fs.free_clst * sd_fs.csize)) { - isSmallSdCard = 1; + isSmallSdCard = true; gfx_printf(&gfx_con, "%k\nSD card free space is smaller than total backup size.%k\n", 0xFFFFBA00, 0xFFCCCCCC); @@ -955,9 +955,9 @@ int dump_emmc_part(char *sd_path, sdmmc_storage_t *storage, emmc_part_t *part) { gfx_printf(&gfx_con, "%kFound Partial Backup in progress. Continuing...%k\n\n", 0xFFAEFD14, 0xFFCCCCCC); - partialDumpInProgress = 1; + partialDumpInProgress = true; // Force partial dumping, even if the card is larger. - isSmallSdCard = 1; + isSmallSdCard = true; f_read(&partialIdxFp, &currPartIdx, 4, NULL); f_close(&partialIdxFp); @@ -1215,7 +1215,7 @@ static void dump_emmc_selected(emmcPartType_t dumpType) int res = 0; u32 timer = 0; gfx_clear_partial_grey(&gfx_ctxt, 0x1B, 0, 1256); - tui_sbar(&gfx_con, 1); + tui_sbar(&gfx_con, true); gfx_con_setpos(&gfx_con, 0, 0); if (!sd_mount()) @@ -1455,7 +1455,7 @@ static void restore_emmc_selected(emmcPartType_t restoreType) int res = 0; u32 timer = 0; gfx_clear_partial_grey(&gfx_ctxt, 0x1B, 0, 1256); - tui_sbar(&gfx_con, 1); + tui_sbar(&gfx_con, true); gfx_con_setpos(&gfx_con, 0, 0); gfx_printf(&gfx_con, "%kThis is a dangerous operation\nand may render your device inoperative!\n\n", 0xFFFFDD00); @@ -1936,14 +1936,14 @@ void auto_launch_firmware() }; struct _bmp_data bmpData; - int backlightEnabled = 0; - int bootlogoFound = 0; + bool backlightEnabled = false; + bool bootlogoFound = false; char *bootlogoCustomEntry = NULL; ini_sec_t *cfg_sec = NULL; LIST_INIT(ini_sections); - gfx_con.mute = 1; + gfx_con.mute = true; if (sd_mount()) { @@ -2049,7 +2049,7 @@ void auto_launch_firmware() if (bmpData.size_x < 720 || bmpData.size_y < 1280) gfx_clear_color(&gfx_ctxt, *(u32 *)BOOTLOGO); - bootlogoFound = 1; + bootlogoFound = true; } } else @@ -2072,7 +2072,7 @@ void auto_launch_firmware() } free(BOOTLOGO); - display_backlight(1); + display_backlight(true); backlightEnabled = 1; // Wait before booting. If VOL- is pressed go into bootloader menu. @@ -2101,10 +2101,10 @@ out: ini_free_section(cfg_sec); sd_unmount(); - gfx_con.mute = 0; + gfx_con.mute = false; if (!backlightEnabled) - display_backlight(1); + display_backlight(true); } void toggle_autorcm() @@ -2741,7 +2741,7 @@ void ipl_main() gfx_con_init(&gfx_con, &gfx_ctxt); // Enable backlight after initializing gfx - //display_backlight(1); + //display_backlight(true); set_default_configuration(); // Load saved configuration and auto boot if enabled. auto_launch_firmware(); diff --git a/bootloader/mem/mc.c b/bootloader/mem/mc.c index ed2f6f2..1e8d1c9 100644 --- a/bootloader/mem/mc.c +++ b/bootloader/mem/mc.c @@ -3,7 +3,7 @@ #include "../soc/clock.h" #include "../utils/util.h" -void mc_config_tsec_carveout(u32 bom, u32 size1mb, int lock) +void mc_config_tsec_carveout(u32 bom, u32 size1mb, bool lock) { MC(MC_SEC_CARVEOUT_BOM) = bom; MC(MC_SEC_CARVEOUT_SIZE_MB) = size1mb; @@ -21,8 +21,8 @@ void mc_config_carveout() MC(MC_VIDEO_PROTECT_REG_CTRL) = 1; // Configure TSEC carveout @ 0x90000000, 1MB. - //mc_config_tsec_carveout(0x90000000, 1, 0); - mc_config_tsec_carveout(0, 0, 1); + //mc_config_tsec_carveout(0x90000000, 1, false); + mc_config_tsec_carveout(0, 0, true); MC(MC_MTS_CARVEOUT_BOM) = 0; MC(MC_MTS_CARVEOUT_SIZE_MB) = 0; diff --git a/bootloader/mem/mc.h b/bootloader/mem/mc.h index c1a7197..6a28bde 100644 --- a/bootloader/mem/mc.h +++ b/bootloader/mem/mc.h @@ -4,7 +4,7 @@ #include "../utils/types.h" #include "../mem/mc_t210.h" -void mc_config_tsec_carveout(u32 bom, u32 size1mb, int lock); +void mc_config_tsec_carveout(u32 bom, u32 size1mb, bool lock); void mc_config_carveout(); void mc_config_carveout_finalize(); void mc_enable_ahb_redirect(); diff --git a/bootloader/storage/sdmmc_driver.c b/bootloader/storage/sdmmc_driver.c index 92d0829..8415537 100644 --- a/bootloader/storage/sdmmc_driver.c +++ b/bootloader/storage/sdmmc_driver.c @@ -190,10 +190,10 @@ out:; int sdmmc_setup_clock(sdmmc_t *sdmmc, u32 type) { //Disable the SD clock if it was enabled, and reenable it later. - int should_enable_sd_clock = 0; + bool should_enable_sd_clock = false; if (sdmmc->regs->clkcon & TEGRA_MMC_CLKCON_SD_CLOCK_ENABLE) { - should_enable_sd_clock = 1; + should_enable_sd_clock = true; sdmmc->regs->clkcon &= ~TEGRA_MMC_CLKCON_SD_CLOCK_ENABLE; } @@ -441,7 +441,7 @@ static int _sdmmc_setup_read_small_block(sdmmc_t *sdmmc) return 1; } -static int _sdmmc_parse_cmdbuf(sdmmc_t *sdmmc, sdmmc_cmd_t *cmd, int is_data_present) +static int _sdmmc_parse_cmdbuf(sdmmc_t *sdmmc, sdmmc_cmd_t *cmd, bool is_data_present) { u16 cmdflags = 0; @@ -488,7 +488,7 @@ static void _sdmmc_parse_cmd_48(sdmmc_t *sdmmc, u32 cmd) cmdbuf.arg = 0; cmdbuf.rsp_type = SDMMC_RSP_TYPE_1; cmdbuf.check_busy = 0; - _sdmmc_parse_cmdbuf(sdmmc, &cmdbuf, 1); + _sdmmc_parse_cmdbuf(sdmmc, &cmdbuf, true); } static int _sdmmc_config_tuning_once(sdmmc_t *sdmmc, u32 cmd) @@ -631,10 +631,10 @@ static int _sdmmc_autocal_config_offset(sdmmc_t *sdmmc, u32 power) static void _sdmmc_autocal_execute(sdmmc_t *sdmmc, u32 power) { - int should_enable_sd_clock = 0; + bool should_enable_sd_clock = false; if (sdmmc->regs->clkcon & TEGRA_MMC_CLKCON_SD_CLOCK_ENABLE) { - should_enable_sd_clock = 1; + should_enable_sd_clock = true; sdmmc->regs->clkcon &= ~TEGRA_MMC_CLKCON_SD_CLOCK_ENABLE; } @@ -738,7 +738,7 @@ static int _sdmmc_stop_transmission_inner(sdmmc_t *sdmmc, u32 *rsp) cmd.arg = 0; cmd.rsp_type = SDMMC_RSP_TYPE_1; cmd.check_busy = 1; - _sdmmc_parse_cmdbuf(sdmmc, &cmd, 0); + _sdmmc_parse_cmdbuf(sdmmc, &cmd, false); int res = _sdmmc_wait_request(sdmmc); _sdmmc_mask_interrupts(sdmmc); @@ -754,10 +754,10 @@ int sdmmc_stop_transmission(sdmmc_t *sdmmc, u32 *rsp) if (!sdmmc->sd_clock_enabled) return 0; - int should_disable_sd_clock = 0; + bool should_disable_sd_clock = false; if (!(sdmmc->regs->clkcon & TEGRA_MMC_CLKCON_SD_CLOCK_ENABLE)) { - should_disable_sd_clock = 1; + should_disable_sd_clock = true; sdmmc->regs->clkcon |= TEGRA_MMC_CLKCON_SD_CLOCK_ENABLE; _sdmmc_get_clkcon(sdmmc); usleep((8000 + sdmmc->divisor - 1) / sdmmc->divisor); @@ -857,17 +857,17 @@ static int _sdmmc_execute_cmd_inner(sdmmc_t *sdmmc, sdmmc_cmd_t *cmd, sdmmc_req_ return 0; u32 blkcnt = 0; - int is_data_present = 0; + bool is_data_present = false; if (req) { _sdmmc_config_dma(sdmmc, &blkcnt, req); _sdmmc_enable_interrupts(sdmmc); - is_data_present = 1; + is_data_present = true; } else { _sdmmc_enable_interrupts(sdmmc); - is_data_present = 0; + is_data_present = false; } _sdmmc_parse_cmdbuf(sdmmc, cmd, is_data_present); diff --git a/bootloader/utils/btn.c b/bootloader/utils/btn.c index 6fb3c61..b29f036 100644 --- a/bootloader/utils/btn.c +++ b/bootloader/utils/btn.c @@ -36,12 +36,12 @@ u32 btn_read() u32 btn_wait() { u32 res = 0, btn = btn_read(); - int pwr = 0; + bool pwr = false; //Power button down, raise a filter. if (btn & BTN_POWER) { - pwr = 1; + pwr = true; btn &= ~BTN_POWER; } @@ -50,7 +50,7 @@ u32 btn_wait() res = btn_read(); //Power button up, remove filter. if (!(res & BTN_POWER) && pwr) - pwr = 0; + pwr = false; else if (pwr) //Power button still down. res &= ~BTN_POWER; } while (btn == res); diff --git a/bootloader/utils/types.h b/bootloader/utils/types.h index df32624..9a4d414 100644 --- a/bootloader/utils/types.h +++ b/bootloader/utils/types.h @@ -47,4 +47,8 @@ typedef volatile unsigned char vu8; typedef volatile unsigned short vu16; typedef volatile unsigned int vu32; +typedef int bool; +#define true 1 +#define false 0 + #endif diff --git a/common/common_gfx.h b/common/common_gfx.h index 2e3a6d6..f0b978d 100644 --- a/common/common_gfx.h +++ b/common/common_gfx.h @@ -40,5 +40,5 @@ typedef struct _gfx_con_t u32 fgcol; int fillbg; u32 bgcol; - int mute; + bool mute; } gfx_con_t;