From d9a9844f8e43b725f3bbe53f1d97e6435065adcc Mon Sep 17 00:00:00 2001 From: Giovanni Di Sirio Date: Sat, 29 Dec 2018 17:18:43 +0000 Subject: Template fixes. git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@12491 110e8d01-0319-4d1e-a829-52ad28d1bb01 --- demos/STM32/RT-STM32H743I-NUCLEO144/cfg/mcuconf.h | 2 +- os/hal/ports/STM32/LLD/ADCv3/hal_adc_lld.h | 7 +---- testhal/STM32/STM32L4xx/GPT-ADC/main.c | 8 ++--- testhal/STM32/multi/DAC/.cproject | 35 ++++++++++++++++++++++ .../multi/DAC/cfg/stm32h743_nucleo144/mcuconf.h | 2 +- .../multi/SPI/cfg/stm32h743_nucleo144/mcuconf.h | 2 +- .../USB_CDC/cfg/stm32h743_nucleo144/mcuconf.h | 2 +- .../conf/mcuconf_stm32h743xx/mcuconf.h.ftl | 2 +- 8 files changed, 45 insertions(+), 15 deletions(-) diff --git a/demos/STM32/RT-STM32H743I-NUCLEO144/cfg/mcuconf.h b/demos/STM32/RT-STM32H743I-NUCLEO144/cfg/mcuconf.h index 510f9a325..d2e259388 100644 --- a/demos/STM32/RT-STM32H743I-NUCLEO144/cfg/mcuconf.h +++ b/demos/STM32/RT-STM32H743I-NUCLEO144/cfg/mcuconf.h @@ -186,7 +186,7 @@ #define STM32_ADC_USE_ADC12 FALSE #define STM32_ADC_USE_ADC3 FALSE #define STM32_ADC_ADC12_DMA_CHANNEL STM32_DMA_STREAM_ID_ANY -#define STM32_ADC_ADC3_DMA_CHANNEL STM32_DMA_STREAM_ID_ANY +#define STM32_ADC_ADC3_BDMA_CHANNEL STM32_BDMA_STREAM_ID_ANY #define STM32_ADC_ADC12_DMA_PRIORITY 2 #define STM32_ADC_ADC3_DMA_PRIORITY 2 #define STM32_ADC_ADC12_IRQ_PRIORITY 5 diff --git a/os/hal/ports/STM32/LLD/ADCv3/hal_adc_lld.h b/os/hal/ports/STM32/LLD/ADCv3/hal_adc_lld.h index 341fb7687..2417533f9 100644 --- a/os/hal/ports/STM32/LLD/ADCv3/hal_adc_lld.h +++ b/os/hal/ports/STM32/LLD/ADCv3/hal_adc_lld.h @@ -710,12 +710,7 @@ typedef enum { specified in continuous mode or if the buffer depth is \ greater than one.*/ \ uint32_t cfgr; \ - /* ADC CFGR2 register initialization data. \ - NOTE: The bits DMAEN and DMACFG are enforced internally \ - to the driver, keep them to zero. \ - NOTE: The bits @p ADC_CFGR_CONT or @p ADC_CFGR_DISCEN must be \ - specified in continuous mode or if the buffer depth is \ - greater than one.*/ \ + /* ADC CFGR2 register initialization data.*/ \ uint32_t cfgr2; \ /* ADC TR1 register initialization data.*/ \ uint32_t tr1; \ diff --git a/testhal/STM32/STM32L4xx/GPT-ADC/main.c b/testhal/STM32/STM32L4xx/GPT-ADC/main.c index b7212a962..b7d0875f8 100644 --- a/testhal/STM32/STM32L4xx/GPT-ADC/main.c +++ b/testhal/STM32/STM32L4xx/GPT-ADC/main.c @@ -44,16 +44,16 @@ adcsample_t samples1[ADC_GRP1_NUM_CHANNELS * ADC_GRP1_BUF_DEPTH]; * ADC streaming callback. */ size_t nx = 0, ny = 0; -static void adccallback(ADCDriver *adcp, adcsample_t *buffer, size_t n) { +static void adccallback(ADCDriver *adcp) { (void)adcp; /* Updating counters.*/ - if (samples1 == buffer) { - nx += n; + if (adcIsBufferComplete(adcp)) { + nx += 1; } else { - ny += n; + ny += 1; } } diff --git a/testhal/STM32/multi/DAC/.cproject b/testhal/STM32/multi/DAC/.cproject index 46aeabc75..f9265dc46 100644 --- a/testhal/STM32/multi/DAC/.cproject +++ b/testhal/STM32/multi/DAC/.cproject @@ -103,12 +103,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/testhal/STM32/multi/DAC/cfg/stm32h743_nucleo144/mcuconf.h b/testhal/STM32/multi/DAC/cfg/stm32h743_nucleo144/mcuconf.h index 69f4e7c09..5f1c781a7 100644 --- a/testhal/STM32/multi/DAC/cfg/stm32h743_nucleo144/mcuconf.h +++ b/testhal/STM32/multi/DAC/cfg/stm32h743_nucleo144/mcuconf.h @@ -186,7 +186,7 @@ #define STM32_ADC_USE_ADC12 FALSE #define STM32_ADC_USE_ADC3 FALSE #define STM32_ADC_ADC12_DMA_CHANNEL STM32_DMA_STREAM_ID_ANY -#define STM32_ADC_ADC3_DMA_CHANNEL STM32_DMA_STREAM_ID_ANY +#define STM32_ADC_ADC3_BDMA_CHANNEL STM32_BDMA_STREAM_ID_ANY #define STM32_ADC_ADC12_DMA_PRIORITY 2 #define STM32_ADC_ADC3_DMA_PRIORITY 2 #define STM32_ADC_ADC12_IRQ_PRIORITY 5 diff --git a/testhal/STM32/multi/SPI/cfg/stm32h743_nucleo144/mcuconf.h b/testhal/STM32/multi/SPI/cfg/stm32h743_nucleo144/mcuconf.h index 95eafdbe8..e22dd7fe7 100644 --- a/testhal/STM32/multi/SPI/cfg/stm32h743_nucleo144/mcuconf.h +++ b/testhal/STM32/multi/SPI/cfg/stm32h743_nucleo144/mcuconf.h @@ -186,7 +186,7 @@ #define STM32_ADC_USE_ADC12 TRUE #define STM32_ADC_USE_ADC3 FALSE #define STM32_ADC_ADC12_DMA_CHANNEL STM32_DMA_STREAM_ID_ANY -#define STM32_ADC_ADC3_DMA_CHANNEL STM32_DMA_STREAM_ID_ANY +#define STM32_ADC_ADC3_BDMA_CHANNEL STM32_BDMA_STREAM_ID_ANY #define STM32_ADC_ADC12_DMA_PRIORITY 2 #define STM32_ADC_ADC3_DMA_PRIORITY 2 #define STM32_ADC_ADC12_IRQ_PRIORITY 5 diff --git a/testhal/STM32/multi/USB_CDC/cfg/stm32h743_nucleo144/mcuconf.h b/testhal/STM32/multi/USB_CDC/cfg/stm32h743_nucleo144/mcuconf.h index e60573aa9..e642c6301 100644 --- a/testhal/STM32/multi/USB_CDC/cfg/stm32h743_nucleo144/mcuconf.h +++ b/testhal/STM32/multi/USB_CDC/cfg/stm32h743_nucleo144/mcuconf.h @@ -186,7 +186,7 @@ #define STM32_ADC_USE_ADC12 TRUE #define STM32_ADC_USE_ADC3 FALSE #define STM32_ADC_ADC12_DMA_CHANNEL STM32_DMA_STREAM_ID_ANY -#define STM32_ADC_ADC3_DMA_CHANNEL STM32_DMA_STREAM_ID_ANY +#define STM32_ADC_ADC3_BDMA_CHANNEL STM32_BDMA_STREAM_ID_ANY #define STM32_ADC_ADC12_DMA_PRIORITY 2 #define STM32_ADC_ADC3_DMA_PRIORITY 2 #define STM32_ADC_ADC12_IRQ_PRIORITY 5 diff --git a/tools/ftl/processors/conf/mcuconf_stm32h743xx/mcuconf.h.ftl b/tools/ftl/processors/conf/mcuconf_stm32h743xx/mcuconf.h.ftl index 02fce1508..134d1894a 100644 --- a/tools/ftl/processors/conf/mcuconf_stm32h743xx/mcuconf.h.ftl +++ b/tools/ftl/processors/conf/mcuconf_stm32h743xx/mcuconf.h.ftl @@ -197,7 +197,7 @@ #define STM32_ADC_USE_ADC12 ${doc.STM32_ADC_USE_ADC12!"TRUE"} #define STM32_ADC_USE_ADC3 ${doc.STM32_ADC_USE_ADC3!"FALSE"} #define STM32_ADC_ADC12_DMA_CHANNEL ${doc.STM32_ADC_ADC12_DMA_CHANNEL!"STM32_DMA_STREAM_ID_ANY"} -#define STM32_ADC_ADC3_DMA_CHANNEL ${doc.STM32_ADC_ADC3_DMA_CHANNEL!"STM32_DMA_STREAM_ID_ANY"} +#define STM32_ADC_ADC3_BDMA_CHANNEL ${doc.STM32_ADC_ADC3_BDMA_CHANNEL!"STM32_BDMA_STREAM_ID_ANY"} #define STM32_ADC_ADC12_DMA_PRIORITY ${doc.STM32_ADC_ADC12_DMA_PRIORITY!"2"} #define STM32_ADC_ADC3_DMA_PRIORITY ${doc.STM32_ADC_ADC3_DMA_PRIORITY!"2"} #define STM32_ADC_ADC12_IRQ_PRIORITY ${doc.STM32_ADC_ADC12_IRQ_PRIORITY!"5"} -- cgit v1.2.3