mirrors/hekate
1
0
Fork 0
mirror of https://github.com/CTCaer/hekate.git synced 2024-11-22 18:06:40 +00:00
Code Issues Releases Activity

Move display_end before secmon + add boolean supp.

Browse source 
Currently bpmp loses access to the relevant registers when secmon or exosphere is launched.

This change provides support for all firmwares and properly sanitizes the display.
This commit is contained in:
Kostas Missos 2018-08-13 12:12:53 +03:00
parent e5abdd938e
commit 6b8887b5d8
15 changed files with 83 additions and 86 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
bootloader/config/config.c
View file

@ -133,7 +133,7 @@ void config_autoboot()
LIST_INIT(ini_sections); LIST_INIT(ini_sections);
u8 max_entries = 29; u8 max_entries = 29;
int ini_freed = 1; bool ini_freed = true;
ment_t *ments = (ment_t *)malloc(sizeof(ment_t) * (max_entries + 3)); ment_t *ments = (ment_t *)malloc(sizeof(ment_t) * (max_entries + 3));
u32 *boot_values = (u32 *)malloc(sizeof(u32) * max_entries); u32 *boot_values = (u32 *)malloc(sizeof(u32) * max_entries);
@ -146,7 +146,7 @@ void config_autoboot()
{ {
if (ini_parse(&ini_sections, "hekate_ipl.ini")) if (ini_parse(&ini_sections, "hekate_ipl.ini"))
{ {
ini_freed = 0; ini_freed = false;
// Build configuration menu. // Build configuration menu.
ments[0].type = MENT_BACK; ments[0].type = MENT_BACK;

24
bootloader/gfx/di.c
View file

@ -137,18 +137,16 @@ void display_init()
exec_cfg((u32 *)DISPLAY_A_BASE, _display_config_11, 113); 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. gpio_write(GPIO_PORT_V, GPIO_PIN_0, enable ? GPIO_HIGH : GPIO_LOW); // Backlight PWM.
} }
void display_end() 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; DSI(_DSIREG(DSI_WR_DATA)) = 0x2805;
u32 end = HOST1X(0x30A4) + 5; u32 end = HOST1X(0x30A4) + 5;
@ -171,17 +169,17 @@ void display_end()
usleep(50000); 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. //Disable clocks.
CLOCK(CLK_RST_CONTROLLER_RST_DEV_H_SET) = 0x1010000; 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; 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_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. 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); usleep(35000);
display_backlight(1); display_backlight(true);
} }
u32 *display_init_framebuffer() u32 *display_init_framebuffer()

2
bootloader/gfx/di.h
View file

@ -345,7 +345,7 @@ void display_end();
void display_color_screen(u32 color); void display_color_screen(u32 color);
/*! Switches screen backlight ON/OFF. */ /*! 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). */ /*! Init display in full 1280x720 resolution (B8G8R8A8, line stride 768, framebuffer size = 1280*768*4 bytes). */
u32 *display_init_framebuffer(); u32 *display_init_framebuffer();

8
bootloader/gfx/tui.c
View file

@ -31,7 +31,7 @@ extern u8 *Kc_MENU_LOGO;
extern hekate_config h_cfg; 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; u32 timePassed = get_tmr_s() - h_cfg.sbar_time_keeping;
if (!force_update) 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); gfx_con_setpos(con, cx, cy);
// Update status bar. // Update status bar.
tui_sbar(con, 0); tui_sbar(con, false);
} }
void *tui_do_menu(gfx_con_t *con, menu_t *menu) 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; int idx = 0, prev_idx = 0, cnt = 0x7FFFFFFF;
gfx_clear_partial_grey(con->gfx_ctxt, 0x1B, 0, 1256); gfx_clear_partial_grey(con->gfx_ctxt, 0x1B, 0, 1256);
tui_sbar(con, 1); tui_sbar(con, true);
#ifdef MENU_LOGO_ENABLE #ifdef MENU_LOGO_ENABLE
gfx_set_rect_rgb(con->gfx_ctxt, Kc_MENU_LOGO, 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); X_MENU_LOGO, Y_MENU_LOGO, X_POS_MENU_LOGO, Y_POS_MENU_LOGO);
#endif //MENU_LOGO_ENABLE #endif //MENU_LOGO_ENABLE
} }
tui_sbar(con, 0); tui_sbar(con, false);
} }
return NULL; return NULL;

2
bootloader/gfx/tui.h
View file

@ -58,7 +58,7 @@ typedef struct _menu_t
#define MDEF_CAPTION(caption, color) { MENT_CAPTION, caption, color } #define MDEF_CAPTION(caption, color) { MENT_CAPTION, caption, color }
#define MDEF_CHGLINE() {MENT_CHGLINE} #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_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); void *tui_do_menu(gfx_con_t *con, menu_t *menu);

21
bootloader/hos/hos.c
View file

@ -67,9 +67,9 @@ typedef struct _launch_ctxt_t
link_t kip1_list; link_t kip1_list;
char* kip1_patches; char* kip1_patches;
int svcperm; bool svcperm;
int debugmode; bool debugmode;
int atmosphere; bool atmosphere;
} launch_ctxt_t; } launch_ctxt_t;
typedef struct _merge_kip_t typedef struct _merge_kip_t
@ -358,7 +358,7 @@ static int _config_svcperm(launch_ctxt_t *ctxt, const char *value)
if (*value == '1') if (*value == '1')
{ {
DPRINTF("Disabled SVC verification\n"); DPRINTF("Disabled SVC verification\n");
ctxt->svcperm = 1; ctxt->svcperm = true;
} }
return 1; return 1;
} }
@ -368,7 +368,7 @@ static int _config_debugmode(launch_ctxt_t *ctxt, const char *value)
if (*value == '1') if (*value == '1')
{ {
DPRINTF("Enabled Debug mode\n"); DPRINTF("Enabled Debug mode\n");
ctxt->debugmode = 1; ctxt->debugmode = true;
} }
return 1; return 1;
} }
@ -378,7 +378,7 @@ static int _config_atmosphere(launch_ctxt_t *ctxt, const char *value)
if (*value == '1') if (*value == '1')
{ {
DPRINTF("Enabled atmosphere patching\n"); DPRINTF("Enabled atmosphere patching\n");
ctxt->atmosphere = 1; ctxt->atmosphere = true;
} }
return 1; return 1;
} }
@ -457,7 +457,6 @@ int hos_launch(ini_sec_t *cfg)
int bootStateDramPkg2 = 0; int bootStateDramPkg2 = 0;
int bootStatePkg2Continue = 0; int bootStatePkg2Continue = 0;
int exoFwNumber = 0; int exoFwNumber = 0;
int end_di = 0;
launch_ctxt_t ctxt; launch_ctxt_t ctxt;
memset(&ctxt, 0, sizeof(launch_ctxt_t)); memset(&ctxt, 0, sizeof(launch_ctxt_t));
@ -611,7 +610,6 @@ int hos_launch(ini_sec_t *cfg)
se_key_acc_ctrl(13, 0xFF); se_key_acc_ctrl(13, 0xFF);
bootStateDramPkg2 = 2; bootStateDramPkg2 = 2;
bootStatePkg2Continue = 3; bootStatePkg2Continue = 3;
end_di = 1;
if (!exoFwNumber) if (!exoFwNumber)
exoFwNumber = 3; exoFwNumber = 3;
break; break;
@ -662,7 +660,8 @@ int hos_launch(ini_sec_t *cfg)
*mb_in = bootStateDramPkg2; *mb_in = bootStateDramPkg2;
*mb_out = 0; *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. // Wait for secmon to get ready.
cluster_boot_cpu0(ctxt.pkg1_id->secmon_base); cluster_boot_cpu0(ctxt.pkg1_id->secmon_base);
@ -679,10 +678,6 @@ int hos_launch(ini_sec_t *cfg)
PMC(0x5BC) = 0xFFFFFFFF; PMC(0x5BC) = 0xFFFFFFFF;
PMC(0x5C0) = 0xFFAAFFFF;*/ PMC(0x5C0) = 0xFFAAFFFF;*/
// Disable display.
if (end_di)
display_end();
// Signal pkg2 ready and continue boot. // Signal pkg2 ready and continue boot.
*mb_in = bootStatePkg2Continue; *mb_in = bootStatePkg2Continue;

12
bootloader/hos/pkg1.c
View file

@ -75,12 +75,12 @@ PATCHSET_DEF(_secmon_5_patchset,
*/ */
static const pkg1_id_t _pkg1_ids[] = { 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) { "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, 1, _secmon_2_patchset }, //2.0.0 - 2.3.0 { "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, 1, _secmon_3_patchset }, //3.0.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, 1, _secmon_3_patchset }, //3.0.1 - 3.0.2 { "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, 0, _secmon_4_patchset }, //4.0.0 - 4.1.0 { "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, 0, _secmon_5_patchset }, //5.0.0 - 5.1.0 { "20180220163747", 4, 0x1900, 0x3FE0, { 1, 2, 0 }, 0x4002B000, 0x4003B000, false, _secmon_5_patchset }, //5.0.0 - 5.1.0
{ NULL } //End. { NULL } //End.
}; };

2
bootloader/hos/pkg1.h
View file

@ -40,7 +40,7 @@ typedef struct _pkg1_id_t
u32 sec_map[3]; u32 sec_map[3];
u32 secmon_base; u32 secmon_base;
u32 warmboot_base; u32 warmboot_base;
int set_warmboot; bool set_warmboot;
patch_t *secmon_patchset; patch_t *secmon_patchset;
} pkg1_id_t; } pkg1_id_t;

50
bootloader/main.c
View file

@ -79,7 +79,7 @@ gfx_con_t gfx_con;
sdmmc_t sd_sdmmc; sdmmc_t sd_sdmmc;
sdmmc_storage_t sd_storage; sdmmc_storage_t sd_storage;
FATFS sd_fs; FATFS sd_fs;
int sd_mounted; bool sd_mounted;
#ifdef MENU_LOGO_ENABLE #ifdef MENU_LOGO_ENABLE
u8 *Kc_MENU_LOGO; u8 *Kc_MENU_LOGO;
@ -87,10 +87,10 @@ u8 *Kc_MENU_LOGO;
hekate_config h_cfg; hekate_config h_cfg;
int sd_mount() bool sd_mount()
{ {
if (sd_mounted) if (sd_mounted)
return 1; return true;
if (!sdmmc_storage_init_sd(&sd_storage, &sd_sdmmc, SDMMC_1, SDMMC_BUS_WIDTH_4, 11)) 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) if (res == FR_OK)
{ {
sd_mounted = 1; sd_mounted = 1;
return 1; return true;
} }
else else
{ {
@ -111,7 +111,7 @@ int sd_mount()
} }
} }
return 0; return false;
} }
void sd_unmount() void sd_unmount()
@ -120,7 +120,7 @@ void sd_unmount()
{ {
f_mount(NULL, "", 1); f_mount(NULL, "", 1);
sdmmc_storage_end(&sd_storage); 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_storage_t storage2;
sdmmc_t sdmmc; sdmmc_t sdmmc;
char emmcSN[9]; char emmcSN[9];
int init_done = 0; bool init_done = false;
memcpy(path, "Backup", 7); memcpy(path, "Backup", 7);
f_mkdir(path); 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); memcpy(emmcSN, "00000000", 9);
else else
{ {
init_done = 1; init_done = true;
itoa(storage2.cid.serial, emmcSN, 16); itoa(storage2.cid.serial, emmcSN, 16);
} }
} }
@ -401,7 +401,7 @@ void config_hw()
sdram_lp0_save_params(sdram_get_params()); 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. // Re-enable clocks to Audio Processing Engine as a workaround to hanging.
CLOCK(CLK_RST_CONTROLLER_CLK_OUT_ENB_V) |= 0x400; // Enable AHUB clock. CLOCK(CLK_RST_CONTROLLER_CLK_OUT_ENB_V) |= 0x400; // Enable AHUB clock.
@ -789,7 +789,7 @@ void reboot_rcm()
#endif //MENU_LOGO_ENABLE #endif //MENU_LOGO_ENABLE
PMC(APBDEV_PMC_SCRATCH0) = 2; // Reboot into rcm. PMC(APBDEV_PMC_SCRATCH0) = 2; // Reboot into rcm.
PMC(0) |= 0x10; PMC(0) |= 0x10;
while (1) while (true)
usleep(1); 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 currPartIdx = 0;
u32 numSplitParts = 0; u32 numSplitParts = 0;
u32 maxSplitParts = 0; u32 maxSplitParts = 0;
int isSmallSdCard = 0; bool isSmallSdCard = false;
int partialDumpInProgress = 0; bool partialDumpInProgress = false;
int res = 0; int res = 0;
char *outFilename = sd_path; char *outFilename = sd_path;
u32 sdPathLen = strlen(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. // Check if the USER partition or the RAW eMMC fits the sd card free space.
if (totalSectors > (sd_fs.free_clst * sd_fs.csize)) 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); 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); 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. // Force partial dumping, even if the card is larger.
isSmallSdCard = 1; isSmallSdCard = true;
f_read(&partialIdxFp, &currPartIdx, 4, NULL); f_read(&partialIdxFp, &currPartIdx, 4, NULL);
f_close(&partialIdxFp); f_close(&partialIdxFp);
@ -1215,7 +1215,7 @@ static void dump_emmc_selected(emmcPartType_t dumpType)
int res = 0; int res = 0;
u32 timer = 0; u32 timer = 0;
gfx_clear_partial_grey(&gfx_ctxt, 0x1B, 0, 1256); 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_con_setpos(&gfx_con, 0, 0);
if (!sd_mount()) if (!sd_mount())
@ -1455,7 +1455,7 @@ static void restore_emmc_selected(emmcPartType_t restoreType)
int res = 0; int res = 0;
u32 timer = 0; u32 timer = 0;
gfx_clear_partial_grey(&gfx_ctxt, 0x1B, 0, 1256); 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_con_setpos(&gfx_con, 0, 0);
gfx_printf(&gfx_con, "%kThis is a dangerous operation\nand may render your device inoperative!\n\n", 0xFFFFDD00); 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; struct _bmp_data bmpData;
int backlightEnabled = 0; bool backlightEnabled = false;
int bootlogoFound = 0; bool bootlogoFound = false;
char *bootlogoCustomEntry = NULL; char *bootlogoCustomEntry = NULL;
ini_sec_t *cfg_sec = NULL; ini_sec_t *cfg_sec = NULL;
LIST_INIT(ini_sections); LIST_INIT(ini_sections);
gfx_con.mute = 1; gfx_con.mute = true;
if (sd_mount()) if (sd_mount())
{ {
@ -2049,7 +2049,7 @@ void auto_launch_firmware()
if (bmpData.size_x < 720 || bmpData.size_y < 1280) if (bmpData.size_x < 720 || bmpData.size_y < 1280)
gfx_clear_color(&gfx_ctxt, *(u32 *)BOOTLOGO); gfx_clear_color(&gfx_ctxt, *(u32 *)BOOTLOGO);
bootlogoFound = 1; bootlogoFound = true;
} }
} }
else else
@ -2072,7 +2072,7 @@ void auto_launch_firmware()
} }
free(BOOTLOGO); free(BOOTLOGO);
display_backlight(1); display_backlight(true);
backlightEnabled = 1; backlightEnabled = 1;
// Wait before booting. If VOL- is pressed go into bootloader menu. // Wait before booting. If VOL- is pressed go into bootloader menu.
@ -2101,10 +2101,10 @@ out:
ini_free_section(cfg_sec); ini_free_section(cfg_sec);
sd_unmount(); sd_unmount();
gfx_con.mute = 0; gfx_con.mute = false;
if (!backlightEnabled) if (!backlightEnabled)
display_backlight(1); display_backlight(true);
} }
void toggle_autorcm() void toggle_autorcm()
@ -2741,7 +2741,7 @@ void ipl_main()
gfx_con_init(&gfx_con, &gfx_ctxt); gfx_con_init(&gfx_con, &gfx_ctxt);
// Enable backlight after initializing gfx // Enable backlight after initializing gfx
//display_backlight(1); //display_backlight(true);
set_default_configuration(); set_default_configuration();
// Load saved configuration and auto boot if enabled. // Load saved configuration and auto boot if enabled.
auto_launch_firmware(); auto_launch_firmware();

6
bootloader/mem/mc.c
View file

@ -3,7 +3,7 @@
#include "../soc/clock.h" #include "../soc/clock.h"
#include "../utils/util.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_BOM) = bom;
MC(MC_SEC_CARVEOUT_SIZE_MB) = size1mb; MC(MC_SEC_CARVEOUT_SIZE_MB) = size1mb;
@ -21,8 +21,8 @@ void mc_config_carveout()
MC(MC_VIDEO_PROTECT_REG_CTRL) = 1; MC(MC_VIDEO_PROTECT_REG_CTRL) = 1;
// Configure TSEC carveout @ 0x90000000, 1MB. // Configure TSEC carveout @ 0x90000000, 1MB.
//mc_config_tsec_carveout(0x90000000, 1, 0); //mc_config_tsec_carveout(0x90000000, 1, false);
mc_config_tsec_carveout(0, 0, 1); mc_config_tsec_carveout(0, 0, true);
MC(MC_MTS_CARVEOUT_BOM) = 0; MC(MC_MTS_CARVEOUT_BOM) = 0;
MC(MC_MTS_CARVEOUT_SIZE_MB) = 0; MC(MC_MTS_CARVEOUT_SIZE_MB) = 0;

2
bootloader/mem/mc.h
View file

@ -4,7 +4,7 @@
#include "../utils/types.h" #include "../utils/types.h"
#include "../mem/mc_t210.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();
void mc_config_carveout_finalize(); void mc_config_carveout_finalize();
void mc_enable_ahb_redirect(); void mc_enable_ahb_redirect();

24
bootloader/storage/sdmmc_driver.c
View file

@ -190,10 +190,10 @@ out:;
int sdmmc_setup_clock(sdmmc_t *sdmmc, u32 type) int sdmmc_setup_clock(sdmmc_t *sdmmc, u32 type)
{ {
//Disable the SD clock if it was enabled, and reenable it later. //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) 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; 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; 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; u16 cmdflags = 0;
@ -488,7 +488,7 @@ static void _sdmmc_parse_cmd_48(sdmmc_t *sdmmc, u32 cmd)
cmdbuf.arg = 0; cmdbuf.arg = 0;
cmdbuf.rsp_type = SDMMC_RSP_TYPE_1; cmdbuf.rsp_type = SDMMC_RSP_TYPE_1;
cmdbuf.check_busy = 0; 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) 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) 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) 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; 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.arg = 0;
cmd.rsp_type = SDMMC_RSP_TYPE_1; cmd.rsp_type = SDMMC_RSP_TYPE_1;
cmd.check_busy = 1; cmd.check_busy = 1;
_sdmmc_parse_cmdbuf(sdmmc, &cmd, 0); _sdmmc_parse_cmdbuf(sdmmc, &cmd, false);
int res = _sdmmc_wait_request(sdmmc); int res = _sdmmc_wait_request(sdmmc);
_sdmmc_mask_interrupts(sdmmc); _sdmmc_mask_interrupts(sdmmc);
@ -754,10 +754,10 @@ int sdmmc_stop_transmission(sdmmc_t *sdmmc, u32 *rsp)
if (!sdmmc->sd_clock_enabled) if (!sdmmc->sd_clock_enabled)
return 0; return 0;
int should_disable_sd_clock = 0; bool should_disable_sd_clock = false;
if (!(sdmmc->regs->clkcon & TEGRA_MMC_CLKCON_SD_CLOCK_ENABLE)) 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->regs->clkcon |= TEGRA_MMC_CLKCON_SD_CLOCK_ENABLE;
_sdmmc_get_clkcon(sdmmc); _sdmmc_get_clkcon(sdmmc);
usleep((8000 + sdmmc->divisor - 1) / sdmmc->divisor); 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; return 0;
u32 blkcnt = 0; u32 blkcnt = 0;
int is_data_present = 0; bool is_data_present = false;
if (req) if (req)
{ {
_sdmmc_config_dma(sdmmc, &blkcnt, req); _sdmmc_config_dma(sdmmc, &blkcnt, req);
_sdmmc_enable_interrupts(sdmmc); _sdmmc_enable_interrupts(sdmmc);
is_data_present = 1; is_data_present = true;
} }
else else
{ {
_sdmmc_enable_interrupts(sdmmc); _sdmmc_enable_interrupts(sdmmc);
is_data_present = 0; is_data_present = false;
} }
_sdmmc_parse_cmdbuf(sdmmc, cmd, is_data_present); _sdmmc_parse_cmdbuf(sdmmc, cmd, is_data_present);

6
bootloader/utils/btn.c
View file

@ -36,12 +36,12 @@ u32 btn_read()
u32 btn_wait() u32 btn_wait()
{ {
u32 res = 0, btn = btn_read(); u32 res = 0, btn = btn_read();
int pwr = 0; bool pwr = false;
//Power button down, raise a filter. //Power button down, raise a filter.
if (btn & BTN_POWER) if (btn & BTN_POWER)
{ {
pwr = 1; pwr = true;
btn &= ~BTN_POWER; btn &= ~BTN_POWER;
} }
@ -50,7 +50,7 @@ u32 btn_wait()
res = btn_read(); res = btn_read();
//Power button up, remove filter. //Power button up, remove filter.
if (!(res & BTN_POWER) && pwr) if (!(res & BTN_POWER) && pwr)
pwr = 0; pwr = false;
else if (pwr) //Power button still down. else if (pwr) //Power button still down.
res &= ~BTN_POWER; res &= ~BTN_POWER;
} while (btn == res); } while (btn == res);

4
bootloader/utils/types.h
View file

@ -47,4 +47,8 @@ typedef volatile unsigned char vu8;
typedef volatile unsigned short vu16; typedef volatile unsigned short vu16;
typedef volatile unsigned int vu32; typedef volatile unsigned int vu32;
typedef int bool;
#define true 1
#define false 0
#endif #endif

2
common/common_gfx.h
View file

@ -40,5 +40,5 @@ typedef struct _gfx_con_t
u32 fgcol; u32 fgcol;
int fillbg; int fillbg;
u32 bgcol; u32 bgcol;
int mute; bool mute;
} gfx_con_t; } gfx_con_t;