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

fix(core): fix FMC initialization

Browse Source 
[no changelog]
This commit is contained in:
tychovrahe 2023-03-31 17:28:03 +02:00 committed by TychoVrahe
parent dcda5e0142
commit 6e0c2578f8
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/embed/trezorhal/displays/st7789v.c
View File

@ -520,8 +520,9 @@ void display_init_seq(void) {
void display_setup_fmc(void) { void display_setup_fmc(void) {
// Reference UM1725 "Description of STM32F4 HAL and LL drivers", // Reference UM1725 "Description of STM32F4 HAL and LL drivers",
// section 64.2.1 "How to use this driver" // section 64.2.1 "How to use this driver"
SRAM_HandleTypeDef external_display_data_sram; SRAM_HandleTypeDef external_display_data_sram = {0};
external_display_data_sram.Instance = FMC_NORSRAM_DEVICE; external_display_data_sram.Instance = FMC_NORSRAM_DEVICE;
external_display_data_sram.Extended = FMC_NORSRAM_EXTENDED_DEVICE;
external_display_data_sram.Init.NSBank = FMC_NORSRAM_BANK1; external_display_data_sram.Init.NSBank = FMC_NORSRAM_BANK1;
external_display_data_sram.Init.DataAddressMux = FMC_DATA_ADDRESS_MUX_DISABLE; external_display_data_sram.Init.DataAddressMux = FMC_DATA_ADDRESS_MUX_DISABLE;
external_display_data_sram.Init.MemoryType = FMC_MEMORY_TYPE_SRAM; external_display_data_sram.Init.MemoryType = FMC_MEMORY_TYPE_SRAM;
@ -543,7 +544,7 @@ void display_setup_fmc(void) {
external_display_data_sram.Init.PageSize = FMC_PAGE_SIZE_NONE; external_display_data_sram.Init.PageSize = FMC_PAGE_SIZE_NONE;
// reference RM0090 section 37.5 Table 259, 37.5.4, Mode 1 SRAM, and 37.5.6 // reference RM0090 section 37.5 Table 259, 37.5.4, Mode 1 SRAM, and 37.5.6
FMC_NORSRAM_TimingTypeDef normal_mode_timing; FMC_NORSRAM_TimingTypeDef normal_mode_timing = {0};
normal_mode_timing.AddressSetupTime = 5; normal_mode_timing.AddressSetupTime = 5;
normal_mode_timing.AddressHoldTime = 1; // don't care normal_mode_timing.AddressHoldTime = 1; // don't care
normal_mode_timing.DataSetupTime = 6; normal_mode_timing.DataSetupTime = 6;

5
core/embed/trezorhal/displays/ug-2828tswig01.c
View File

@ -317,8 +317,9 @@ void display_init(void) {
// Reference UM1725 "Description of STM32F4 HAL and LL drivers", // Reference UM1725 "Description of STM32F4 HAL and LL drivers",
// section 64.2.1 "How to use this driver" // section 64.2.1 "How to use this driver"
SRAM_HandleTypeDef external_display_data_sram; SRAM_HandleTypeDef external_display_data_sram = {0};
external_display_data_sram.Instance = FMC_NORSRAM_DEVICE; external_display_data_sram.Instance = FMC_NORSRAM_DEVICE;
external_display_data_sram.Extended = FMC_NORSRAM_EXTENDED_DEVICE;
external_display_data_sram.Init.NSBank = FMC_NORSRAM_BANK1; external_display_data_sram.Init.NSBank = FMC_NORSRAM_BANK1;
external_display_data_sram.Init.DataAddressMux = FMC_DATA_ADDRESS_MUX_DISABLE; external_display_data_sram.Init.DataAddressMux = FMC_DATA_ADDRESS_MUX_DISABLE;
external_display_data_sram.Init.MemoryType = FMC_MEMORY_TYPE_SRAM; external_display_data_sram.Init.MemoryType = FMC_MEMORY_TYPE_SRAM;
@ -340,7 +341,7 @@ void display_init(void) {
external_display_data_sram.Init.PageSize = FMC_PAGE_SIZE_NONE; external_display_data_sram.Init.PageSize = FMC_PAGE_SIZE_NONE;
// reference RM0090 section 37.5 Table 259, 37.5.4, Mode 1 SRAM, and 37.5.6 // reference RM0090 section 37.5 Table 259, 37.5.4, Mode 1 SRAM, and 37.5.6
FMC_NORSRAM_TimingTypeDef normal_mode_timing; FMC_NORSRAM_TimingTypeDef normal_mode_timing = {0};
normal_mode_timing.AddressSetupTime = 10; normal_mode_timing.AddressSetupTime = 10;
normal_mode_timing.AddressHoldTime = 10; normal_mode_timing.AddressHoldTime = 10;
normal_mode_timing.DataSetupTime = 10; normal_mode_timing.DataSetupTime = 10;