apache-mynewt-bot commented on issue #2186: [WIP] stm32: unify peripheral initialization URL: https://github.com/apache/mynewt-core/pull/2186#issuecomment-584700967 <!-- style-bot --> ## Style check summary ### Our coding style is [here!](https://github.com/apache/mynewt-core/blob/master/CODING_STANDARDS.md) #### hw/bsp/black_vet6/src/hal_bsp.c <details> ```diff @@ -66,46 +66,46 @@ /* * Helper macros to build ADC data structures */ -#define STM32F4_DEFAULT_DMA_HANDLE(instance, channel, parent) {\ - .Instance = (instance),\ - .Init.Channel = (channel),\ - .Init.Direction = DMA_PERIPH_TO_MEMORY,\ - .Init.PeriphInc = DMA_PINC_DISABLE,\ - .Init.MemInc = DMA_MINC_ENABLE,\ - .Init.PeriphDataAlignment = DMA_PDATAALIGN_WORD,\ - .Init.MemDataAlignment = DMA_MDATAALIGN_WORD,\ - .Init.Mode = DMA_CIRCULAR,\ - .Init.Priority = DMA_PRIORITY_HIGH,\ - .Init.FIFOMode = DMA_FIFOMODE_DISABLE,\ - .Init.FIFOThreshold = DMA_FIFO_THRESHOLD_HALFFULL,\ - .Init.MemBurst = DMA_MBURST_SINGLE,\ - .Init.PeriphBurst = DMA_PBURST_SINGLE,\ - .Parent = (parent),\ +#define STM32F4_DEFAULT_DMA_HANDLE(instance, channel, parent) { \ + .Instance = (instance), \ + .Init.Channel = (channel), \ + .Init.Direction = DMA_PERIPH_TO_MEMORY, \ + .Init.PeriphInc = DMA_PINC_DISABLE, \ + .Init.MemInc = DMA_MINC_ENABLE, \ + .Init.PeriphDataAlignment = DMA_PDATAALIGN_WORD, \ + .Init.MemDataAlignment = DMA_MDATAALIGN_WORD, \ + .Init.Mode = DMA_CIRCULAR, \ + .Init.Priority = DMA_PRIORITY_HIGH, \ + .Init.FIFOMode = DMA_FIFOMODE_DISABLE, \ + .Init.FIFOThreshold = DMA_FIFO_THRESHOLD_HALFFULL, \ + .Init.MemBurst = DMA_MBURST_SINGLE, \ + .Init.PeriphBurst = DMA_PBURST_SINGLE, \ + .Parent = (parent), \ } #define ADC_INIT_HANDLE(name, instance, dma_handle) \ - ADC_HandleTypeDef (name) = { \ - .Init = { \ - .ClockPrescaler = ADC_CLOCKPRESCALER_PCLK_DIV2, \ - .Resolution = ADC_RESOLUTION12b, \ - .DataAlign = ADC_DATAALIGN_RIGHT, \ - .ScanConvMode = DISABLE, \ - .EOCSelection = DISABLE, \ - .ContinuousConvMode = ENABLE, \ - .NbrOfConversion = 1, \ - .DiscontinuousConvMode = DISABLE, \ - .NbrOfDiscConversion = 0, \ - .ExternalTrigConv = ADC_SOFTWARE_START, \ - .ExternalTrigConvEdge = ADC_EXTERNALTRIGCONVEDGE_NONE, \ - .DMAContinuousRequests = ENABLE, \ - }, \ - .Instance = (instance), \ - .NbrOfCurrentConversionRank = 0, \ - .DMA_Handle = (dma_handle), \ - .Lock = HAL_UNLOCKED, \ - .State = 0, \ - .ErrorCode = 0, \ - } + ADC_HandleTypeDef (name) = { \ + .Init = { \ + .ClockPrescaler = ADC_CLOCKPRESCALER_PCLK_DIV2, \ + .Resolution = ADC_RESOLUTION12b, \ + .DataAlign = ADC_DATAALIGN_RIGHT, \ + .ScanConvMode = DISABLE, \ + .EOCSelection = DISABLE, \ + .ContinuousConvMode = ENABLE, \ + .NbrOfConversion = 1, \ + .DiscontinuousConvMode = DISABLE, \ + .NbrOfDiscConversion = 0, \ + .ExternalTrigConv = ADC_SOFTWARE_START, \ + .ExternalTrigConvEdge = ADC_EXTERNALTRIGCONVEDGE_NONE, \ + .DMAContinuousRequests = ENABLE, \ + }, \ + .Instance = (instance), \ + .NbrOfCurrentConversionRank = 0, \ + .DMA_Handle = (dma_handle), \ + .Lock = HAL_UNLOCKED, \ + .State = 0, \ + .ErrorCode = 0, \ + } #endif #if MYNEWT_VAL(ADC_0) @@ -118,7 +118,7 @@ struct stm32f4_adc_dev_cfg os_bsp_adc0_cfg = { .sac_chan_count = 16, - .sac_chans = (struct adc_chan_config [16]){ + .sac_chans = (struct adc_chan_config [16]) { [0] = { 0 }, [1] = { 0 }, [2] = { 0 }, @@ -150,7 +150,7 @@ struct stm32f4_adc_dev_cfg os_bsp_adc1_cfg = { .sac_chan_count = 16, - .sac_chans = (struct adc_chan_config [16]){ + .sac_chans = (struct adc_chan_config [16]) { [0] = { 0 }, [1] = { .c_refmv = 3300, @@ -173,7 +173,7 @@ struct stm32f4_adc_dev_cfg os_bsp_adc1_cfg = { .sac_chan_count = 16, - .sac_chans = (struct adc_chan_config [16]){ + .sac_chans = (struct adc_chan_config [16]) { [0] = { 0 }, [1] = { 0 }, [2] = { 0 }, ``` </details> #### hw/bsp/olimex_stm32-e407_devboard/src/hal_bsp.c <details> ```diff @@ -66,46 +66,46 @@ /* * Helper macros to build ADC data structures */ -#define STM32F4_DEFAULT_DMA_HANDLE(instance, channel, parent) {\ - .Instance = (instance),\ - .Init.Channel = (channel),\ - .Init.Direction = DMA_PERIPH_TO_MEMORY,\ - .Init.PeriphInc = DMA_PINC_DISABLE,\ - .Init.MemInc = DMA_MINC_ENABLE,\ - .Init.PeriphDataAlignment = DMA_PDATAALIGN_WORD,\ - .Init.MemDataAlignment = DMA_MDATAALIGN_WORD,\ - .Init.Mode = DMA_CIRCULAR,\ - .Init.Priority = DMA_PRIORITY_HIGH,\ - .Init.FIFOMode = DMA_FIFOMODE_DISABLE,\ - .Init.FIFOThreshold = DMA_FIFO_THRESHOLD_HALFFULL,\ - .Init.MemBurst = DMA_MBURST_SINGLE,\ - .Init.PeriphBurst = DMA_PBURST_SINGLE,\ - .Parent = (parent),\ +#define STM32F4_DEFAULT_DMA_HANDLE(instance, channel, parent) { \ + .Instance = (instance), \ + .Init.Channel = (channel), \ + .Init.Direction = DMA_PERIPH_TO_MEMORY, \ + .Init.PeriphInc = DMA_PINC_DISABLE, \ + .Init.MemInc = DMA_MINC_ENABLE, \ + .Init.PeriphDataAlignment = DMA_PDATAALIGN_WORD, \ + .Init.MemDataAlignment = DMA_MDATAALIGN_WORD, \ + .Init.Mode = DMA_CIRCULAR, \ + .Init.Priority = DMA_PRIORITY_HIGH, \ + .Init.FIFOMode = DMA_FIFOMODE_DISABLE, \ + .Init.FIFOThreshold = DMA_FIFO_THRESHOLD_HALFFULL, \ + .Init.MemBurst = DMA_MBURST_SINGLE, \ + .Init.PeriphBurst = DMA_PBURST_SINGLE, \ + .Parent = (parent), \ } #define ADC_INIT_HANDLE(name, instance, dma_handle) \ - ADC_HandleTypeDef (name) = { \ - .Init = { \ - .ClockPrescaler = ADC_CLOCKPRESCALER_PCLK_DIV2, \ - .Resolution = ADC_RESOLUTION12b, \ - .DataAlign = ADC_DATAALIGN_RIGHT, \ - .ScanConvMode = DISABLE, \ - .EOCSelection = DISABLE, \ - .ContinuousConvMode = ENABLE, \ - .NbrOfConversion = 1, \ - .DiscontinuousConvMode = DISABLE, \ - .NbrOfDiscConversion = 0, \ - .ExternalTrigConv = ADC_SOFTWARE_START, \ - .ExternalTrigConvEdge = ADC_EXTERNALTRIGCONVEDGE_NONE, \ - .DMAContinuousRequests = ENABLE, \ - }, \ - .Instance = (instance), \ - .NbrOfCurrentConversionRank = 0, \ - .DMA_Handle = (dma_handle), \ - .Lock = HAL_UNLOCKED, \ - .State = 0, \ - .ErrorCode = 0, \ - } + ADC_HandleTypeDef (name) = { \ + .Init = { \ + .ClockPrescaler = ADC_CLOCKPRESCALER_PCLK_DIV2, \ + .Resolution = ADC_RESOLUTION12b, \ + .DataAlign = ADC_DATAALIGN_RIGHT, \ + .ScanConvMode = DISABLE, \ + .EOCSelection = DISABLE, \ + .ContinuousConvMode = ENABLE, \ + .NbrOfConversion = 1, \ + .DiscontinuousConvMode = DISABLE, \ + .NbrOfDiscConversion = 0, \ + .ExternalTrigConv = ADC_SOFTWARE_START, \ + .ExternalTrigConvEdge = ADC_EXTERNALTRIGCONVEDGE_NONE, \ + .DMAContinuousRequests = ENABLE, \ + }, \ + .Instance = (instance), \ + .NbrOfCurrentConversionRank = 0, \ + .DMA_Handle = (dma_handle), \ + .Lock = HAL_UNLOCKED, \ + .State = 0, \ + .ErrorCode = 0, \ + } #endif #if MYNEWT_VAL(ADC_0) @@ -118,7 +118,7 @@ struct stm32f4_adc_dev_cfg os_bsp_adc0_cfg = { .sac_chan_count = 16, - .sac_chans = (struct adc_chan_config [16]){ + .sac_chans = (struct adc_chan_config [16]) { [0] = { 0 }, [1] = { 0 }, [2] = { 0 }, @@ -150,7 +150,7 @@ struct stm32f4_adc_dev_cfg os_bsp_adc1_cfg = { .sac_chan_count = 16, - .sac_chans = (struct adc_chan_config [16]){ + .sac_chans = (struct adc_chan_config [16]) { [0] = { 0 }, [1] = { .c_refmv = 3300, @@ -173,7 +173,7 @@ struct stm32f4_adc_dev_cfg os_bsp_adc1_cfg = { .sac_chan_count = 16, - .sac_chans = (struct adc_chan_config [16]){ + .sac_chans = (struct adc_chan_config [16]) { [0] = { 0 }, [1] = { 0 }, [2] = { 0 }, ``` </details>
---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services