From 82e1ef05a20948935786f89e02871a8d5ce4ce8b Mon Sep 17 00:00:00 2001 From: Ein Terakawa Date: Sun, 14 Feb 2021 11:58:21 +0900 Subject: [PATCH] Remove MFP manipulation from hal_pal_lld.c --- os/hal/ports/NUMICRO/LLD/GPIOv1/hal_pal_lld.c | 8 -------- os/hal/ports/NUMICRO/LLD/SERIALv1/hal_serial_lld.c | 4 ++++ os/hal/ports/NUMICRO/NUC123/hal_lld.c | 1 + 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/os/hal/ports/NUMICRO/LLD/GPIOv1/hal_pal_lld.c b/os/hal/ports/NUMICRO/LLD/GPIOv1/hal_pal_lld.c index c6f221aa..dfdf4e56 100644 --- a/os/hal/ports/NUMICRO/LLD/GPIOv1/hal_pal_lld.c +++ b/os/hal/ports/NUMICRO/LLD/GPIOv1/hal_pal_lld.c @@ -143,14 +143,6 @@ void _pal_lld_init(const PALConfig *config) { /* Set DeBounce conditions */ GPIO->DBNCECON = 0x04u; - - /* Enable External Crystal Oscillator pins */ - SYS->GPF_MFP |= SYS_GPF_MFP_PF0_XT1_OUT | SYS_GPF_MFP_PF1_XT1_IN; - -/* SYS->GPD_MFP |= SYS_GPD_MFP_PD10_CLKO; */ - - /* Enable UART1 data pins */ - SYS->GPB_MFP |= SYS_GPB_MFP_PB1_UART0_TXD | SYS_GPB_MFP_PB0_UART0_RXD; } /** diff --git a/os/hal/ports/NUMICRO/LLD/SERIALv1/hal_serial_lld.c b/os/hal/ports/NUMICRO/LLD/SERIALv1/hal_serial_lld.c index 06225c81..6bcc1b27 100644 --- a/os/hal/ports/NUMICRO/LLD/SERIALv1/hal_serial_lld.c +++ b/os/hal/ports/NUMICRO/LLD/SERIALv1/hal_serial_lld.c @@ -311,6 +311,8 @@ void sd_lld_init(void) sdObjectInit(&SD0, NULL, notify0); /* Select UART0 Pins */ SYS->ALT_MFP &= ~(SYS_ALT_MFP_PB3_MFP1_Msk | SYS_ALT_MFP_PB3_MFP1_Msk); + /* SYS->GPB_MFP |= SYS_GPB_MFP_PB1_UART0_TXD | SYS_GPB_MFP_PB0_UART0_RXD | + SYS_GPB_MFP_PB3_UART0_nCTS | SYS_GPB_MFP_PB2_UART0_nRTS; */ SYS->GPB_MFP |= 0x0FUL; SD0.uart = UART0; #endif @@ -320,6 +322,8 @@ void sd_lld_init(void) /* Select UART1 Pins */ SYS->ALT_MFP &= ~(SYS_ALT_MFP_PB7_MFP1_Msk | SYS_ALT_MFP_PB6_MFP1_Msk | SYS_ALT_MFP_PB5_MFP1_Msk | SYS_ALT_MFP_PB4_MFP1_Msk); + /* SYS->GPB_MFP |= SYS_GPB_MFP_PB5_UART1_TXD | SYS_GPB_MFP_PB4_UART1_RXD | + SYS_GPB_MFP_PB7_UART1_nCTS | SYS_GPB_MFP_PB6_UART1_nRTS; */ SYS->GPB_MFP |= 0xF0UL; SD1.uart = UART1; #endif diff --git a/os/hal/ports/NUMICRO/NUC123/hal_lld.c b/os/hal/ports/NUMICRO/NUC123/hal_lld.c index bcd5419a..b9db628a 100644 --- a/os/hal/ports/NUMICRO/NUC123/hal_lld.c +++ b/os/hal/ports/NUMICRO/NUC123/hal_lld.c @@ -468,6 +468,7 @@ void NUC123_clock_init(void) set_HCLK(NUC123_HCLKSRC_HSI, CLK_CLKDIV_HCLK(1)); #if NUC123_HSE_ENABLED + /* SYS->GPF_MFP |= (SYS_GPF_MFP_PF0_XT1_OUT | SYS_GPF_MFP_PF1_XT1_IN); */ SYS->GPF_MFP |= (SYS_GPF_MFP_GPF_MFP0_Msk | SYS_GPF_MFP_GPF_MFP1_Msk); CLK->PWRCON |= CLK_PWRCON_XTL12M_EN_Msk;