sergiotarxz/nuttx
sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

stm32: nxstyle fixes

Browse Source 
arch/arm/src/stm32/stm32_gpio.c
arch/arm/src/stm32/stm32_rcc.c
arch/arm/src/stm32/stm32_rcc.h

    * nxstyle fixes, mostly long lines
This commit is contained in:
Nathan Hartman 2020-05-19 20:25:52 -04:00 committed by Xiang Xiao
parent 34286dfdac
commit 62c5593674
3 changed files with 69 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
arch/arm/src/stm32/stm32_gpio.c
View File

@ -341,8 +341,8 @@ int stm32_configgpio(uint32_t cfgset)
if (!input) if (!input)
{ {
/* It is an output or an alternate function. We have to look at the CNF /* It is an output or an alternate function. We have to look at
* bits to know which. * the CNF bits to know which.
*/ */
unsigned int cnf = (cfgset & GPIO_CNF_MASK); unsigned int cnf = (cfgset & GPIO_CNF_MASK);
@ -410,7 +410,8 @@ int stm32_configgpio(uint32_t cfgset)
#endif #endif
/**************************************************************************** /****************************************************************************
* Name: stm32_configgpio (for the STM32L15xxx, STM32F20xxx and STM32F40xxx family) * Name: stm32_configgpio (for the STM32L15xxx, STM32F20xxx and STM32F40xxx
* family)
****************************************************************************/ ****************************************************************************/
#if defined(CONFIG_STM32_STM32L15XX) || defined(CONFIG_STM32_STM32F20XX) || \ #if defined(CONFIG_STM32_STM32L15XX) || defined(CONFIG_STM32_STM32F20XX) || \
@ -456,7 +457,10 @@ int stm32_configgpio(uint32_t cfgset)
break; break;
case GPIO_OUTPUT: /* General purpose output mode */ case GPIO_OUTPUT: /* General purpose output mode */
stm32_gpiowrite(cfgset, (cfgset & GPIO_OUTPUT_SET) != 0); /* Set the initial output value */
/* Set the initial output value */
stm32_gpiowrite(cfgset, (cfgset & GPIO_OUTPUT_SET) != 0);
pinmode = GPIO_MODER_OUTPUT; pinmode = GPIO_MODER_OUTPUT;
break; break;
@ -608,18 +612,22 @@ int stm32_configgpio(uint32_t cfgset)
putreg32(regval, base + STM32_GPIO_OTYPER_OFFSET); putreg32(regval, base + STM32_GPIO_OTYPER_OFFSET);
/* Otherwise, it is an input pin. Should it configured as an EXTI interrupt? */ /* Otherwise, it is an input pin. Should it configured as an EXTI
* interrupt?
*/
if (pinmode != GPIO_MODER_OUTPUT && (cfgset & GPIO_EXTI) != 0) if (pinmode != GPIO_MODER_OUTPUT && (cfgset & GPIO_EXTI) != 0)
{ {
/* "In STM32 F1 the selection of the EXTI line source is performed through /* "In STM32 F1 the selection of the EXTI line source is performed
* the EXTIx bits in the AFIO_EXTICRx registers, while in F2 series this * through the EXTIx bits in the AFIO_EXTICRx registers, while in F2
* selection is done through the EXTIx bits in the SYSCFG_EXTICRx registers. * series this selection is done through the EXTIx bits in the
* SYSCFG_EXTICRx registers.
* *
* "Only the mapping of the EXTICRx registers has been changed, without any * "Only the mapping of the EXTICRx registers has been changed,
* changes to the meaning of the EXTIx bits. However, the range of EXTI * without any changes to the meaning of the EXTIx bits. However,
* bits values has been extended to 0b1000 to support the two ports added * the range of EXTI bits values has been extended to 0b1000 to
* in F2, port H and I (in F1 series the maximum value is 0b0110)." * support the two ports added in F2, port H and I (in F1 series
* the maximum value is 0b0110)."
*/ */
uint32_t regaddr; uint32_t regaddr;
@ -645,14 +653,15 @@ int stm32_configgpio(uint32_t cfgset)
* Name: stm32_unconfiggpio * Name: stm32_unconfiggpio
* *
* Description: * Description:
* Unconfigure a GPIO pin based on bit-encoded description of the pin, set it * Unconfigure a GPIO pin based on bit-encoded description of the pin, set
* into default HiZ state (and possibly mark it's unused) and unlock it whether * it into default HiZ state (and possibly mark it's unused) and unlock it
* it was previsouly selected as alternative function (GPIO_ALT|GPIO_CNF_AFPP|...). * whether it was previously selected as alternative function
* (GPIO_ALT|GPIO_CNF_AFPP|...).
* *
* This is a safety function and prevents hardware from schocks, as unexpected * This is a safety function and prevents hardware from schocks, as
* write to the Timer Channel Output GPIO to fixed '1' or '0' while it should * unexpected write to the Timer Channel Output GPIO to fixed '1' or '0'
* operate in PWM mode could produce excessive on-board currents and trigger * while it should operate in PWM mode could produce excessive on-board
* over-current/alarm function. * currents and trigger over-current/alarm function.
* *
* Returned Value: * Returned Value:
* OK on success * OK on success
@ -788,10 +797,11 @@ bool stm32_gpioread(uint32_t pinset)
* By default the I/O compensation cell is not used. However when the I/O * By default the I/O compensation cell is not used. However when the I/O
* output buffer speed is configured in 50 MHz or 100 MHz mode, it is * output buffer speed is configured in 50 MHz or 100 MHz mode, it is
* recommended to use the compensation cell for slew rate control on I/O * recommended to use the compensation cell for slew rate control on I/O
* tf(IO)out)/tr(IO)out commutation to reduce the I/O noise on power supply. * tf(IO)out)/tr(IO)out commutation to reduce the I/O noise on power
* supply.
* *
* The I/O compensation cell can be used only when the supply voltage ranges * The I/O compensation cell can be used only when the supply voltage
* from 2.4 to 3.6 V. * ranges from 2.4 to 3.6 V.
* *
* Input Parameters: * Input Parameters:
* None * None

46
arch/arm/src/stm32/stm32_rcc.c
View File

@ -70,7 +70,7 @@
#define HSERDY_TIMEOUT (100 * CONFIG_BOARD_LOOPSPERMSEC) #define HSERDY_TIMEOUT (100 * CONFIG_BOARD_LOOPSPERMSEC)
/**************************************************************************** /****************************************************************************
* Private Functions * Included Files
****************************************************************************/ ****************************************************************************/
/* Include chip-specific clocking initialization logic */ /* Include chip-specific clocking initialization logic */
@ -93,6 +93,10 @@
# error "Unsupported STM32 chip" # error "Unsupported STM32 chip"
#endif #endif
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
#if defined(CONFIG_STM32_STM32L15XX) #if defined(CONFIG_STM32_STM32L15XX)
# define STM32_RCC_XXX STM32_RCC_CSR # define STM32_RCC_XXX STM32_RCC_CSR
# define RCC_XXX_YYYRST RCC_CSR_RTCRST # define RCC_XXX_YYYRST RCC_CSR_RTCRST
@ -110,9 +114,9 @@
* *
* Description: * Description:
* The RTC needs to reset the Backup Domain to change RTCSEL and resetting * The RTC needs to reset the Backup Domain to change RTCSEL and resetting
* the Backup Domain renders to disabling the LSE as consequence. In order * the Backup Domain renders to disabling the LSE as consequence.
* to avoid resetting the Backup Domain when we already configured LSE we * In order to avoid resetting the Backup Domain when we already
* will reset the Backup Domain early (here). * configured LSE we will reset the Backup Domain early (here).
* *
* Input Parameters: * Input Parameters:
* None * None
@ -164,8 +168,8 @@ static inline void rcc_resetbkp(void)
* configuration file. * configuration file.
* *
* If CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG is defined, then clocking * If CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG is defined, then clocking
* will be enabled by an externally provided, board-specific function called * will be enabled by an externally provided, board-specific function
* stm32_board_clockconfig(). * called stm32_board_clockconfig().
* *
* Input Parameters: * Input Parameters:
* None * None
@ -193,7 +197,9 @@ void stm32_clockconfig(void)
#else #else
/* Invoke standard, fixed clock configuration based on definitions in board.h */ /* Invoke standard, fixed clock configuration based on definitions
* in board.h
*/
stm32_stdclockconfig(); stm32_stdclockconfig();
@ -210,22 +216,22 @@ void stm32_clockconfig(void)
rcc_enableperipherals(); rcc_enableperipherals();
} }
/************************************************************************************ /****************************************************************************
* Name: stm32_clockenable * Name: stm32_clockenable
* *
* Description: * Description:
* Re-enable the clock and restore the clock settings based on settings in board.h. * Re-enable the clock and restore the clock settings based on settings
* This function is only available to support low-power modes of operation: When * in board.h. This function is only available to support low-power
* re-awakening from deep-sleep modes, it is necessary to re-enable/re-start the * modes of operation: When re-awakening from deep-sleep modes, it is
* PLL * necessary to re-enable/re-start the PLL
* *
* This functional performs a subset of the operations performed by * This functional performs a subset of the operations performed by
* stm32_clockconfig(): It does not reset any devices, and it does not reset the * stm32_clockconfig(): It does not reset any devices, and it does not
* currently enabled peripheral clocks. * reset the currently enabled peripheral clocks.
* *
* If CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG is defined, then clocking will * If CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG is defined, then clocking
* be enabled by an externally provided, board-specific function called * will be enabled by an externally provided, board-specific function
* stm32_board_clockconfig(). * called stm32_board_clockconfig().
* *
* Input Parameters: * Input Parameters:
* None * None
@ -233,7 +239,7 @@ void stm32_clockconfig(void)
* Returned Value: * Returned Value:
* None * None
* *
************************************************************************************/ ****************************************************************************/
#ifdef CONFIG_PM #ifdef CONFIG_PM
void stm32_clockenable(void) void stm32_clockenable(void)
@ -246,7 +252,9 @@ void stm32_clockenable(void)
#else #else
/* Invoke standard, fixed clock configuration based on definitions in board.h */ /* Invoke standard, fixed clock configuration based on definitions
* in board.h
*/
stm32_stdclockconfig(); stm32_stdclockconfig();

20
arch/arm/src/stm32/stm32_rcc.h
View File

@ -103,8 +103,8 @@ extern uint32_t _vectors[];
* Name: stm32_mco1config * Name: stm32_mco1config
* *
* Description: * Description:
* Selects the clock source to output on MCO1 pin (PA8). PA8 should be configured in * Selects the clock source to output on MCO1 pin (PA8). PA8 should be
* alternate function mode. * configured in alternate function mode.
* *
* Input Parameters: * Input Parameters:
* source - One of the definitions for the RCC_CFGR_MCO1 definitions from * source - One of the definitions for the RCC_CFGR_MCO1 definitions from
@ -125,7 +125,7 @@ static inline void stm32_mco1config(uint32_t source, uint32_t div)
uint32_t regval; uint32_t regval;
regval = getreg32(STM32_RCC_CFGR); regval = getreg32(STM32_RCC_CFGR);
regval &= ~(RCC_CFGR_MCO1_MASK|RCC_CFGR_MCO1PRE_MASK); regval &= ~(RCC_CFGR_MCO1_MASK | RCC_CFGR_MCO1PRE_MASK);
regval |= (source | div); regval |= (source | div);
putreg32(regval, STM32_RCC_CFGR); putreg32(regval, STM32_RCC_CFGR);
} }
@ -204,8 +204,8 @@ static inline void stm32_mcodivconfig(uint32_t source, uint32_t divider)
* Name: stm32_mco2config * Name: stm32_mco2config
* *
* Description: * Description:
* Selects the clock source to output on MCO2 pin (PC9). PC9 should be configured in * Selects the clock source to output on MCO2 pin (PC9). PC9 should be
* alternate function mode. * configured in alternate function mode.
* *
* Input Parameters: * Input Parameters:
* source - One of the definitions for the RCC_CFGR_MCO2 definitions from * source - One of the definitions for the RCC_CFGR_MCO2 definitions from
@ -226,7 +226,7 @@ static inline void stm32_mco2config(uint32_t source, uint32_t div)
uint32_t regval; uint32_t regval;
regval = getreg32(STM32_RCC_CFGR); regval = getreg32(STM32_RCC_CFGR);
regval &= ~(RCC_CFGR_MCO2_MASK|RCC_CFGR_MCO2PRE_MASK); regval &= ~(RCC_CFGR_MCO2_MASK | RCC_CFGR_MCO2PRE_MASK);
regval |= (source | div); regval |= (source | div);
putreg32(regval, STM32_RCC_CFGR); putreg32(regval, STM32_RCC_CFGR);
} }
@ -317,23 +317,23 @@ void stm32_clockenable(void);
void stm32_rcc_enablelse(void); void stm32_rcc_enablelse(void);
/**************************************************************************** /************************************************************************************
* Name: stm32_rcc_enablelsi * Name: stm32_rcc_enablelsi
* *
* Description: * Description:
* Enable the Internal Low-Speed (LSI) RC Oscillator. * Enable the Internal Low-Speed (LSI) RC Oscillator.
* *
****************************************************************************/ ************************************************************************************/
void stm32_rcc_enablelsi(void); void stm32_rcc_enablelsi(void);
/**************************************************************************** /************************************************************************************
* Name: stm32_rcc_disablelsi * Name: stm32_rcc_disablelsi
* *
* Description: * Description:
* Disable the Internal Low-Speed (LSI) RC Oscillator. * Disable the Internal Low-Speed (LSI) RC Oscillator.
* *
****************************************************************************/ ************************************************************************************/
void stm32_rcc_disablelsi(void); void stm32_rcc_disablelsi(void);