From 96b27529e200345012e9f98985a872d1a42863bb Mon Sep 17 00:00:00 2001 From: gdisirio Date: Sun, 15 Nov 2009 15:58:08 +0000 Subject: [PATCH] git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@1307 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- os/io/platforms/STM32/adc_lld.h | 35 +++++++++++++++++++++++++++++---- os/io/templates/adc_lld.h | 6 +++--- 2 files changed, 34 insertions(+), 7 deletions(-) diff --git a/os/io/platforms/STM32/adc_lld.h b/os/io/platforms/STM32/adc_lld.h index 2dbfd82dd..e1aa82b54 100644 --- a/os/io/platforms/STM32/adc_lld.h +++ b/os/io/platforms/STM32/adc_lld.h @@ -72,7 +72,34 @@ typedef struct { * @brief Driver configuration structure. */ typedef struct { - + /** + * @brief ADC CR1 register initialization data. + */ + uint32_t ac_cr1; + /** + * @brief ADC CR2 register initialization data. + */ + uint32_t ac_cr2; + /** + * @brief ADC SMPR1 register initialization data. + */ + uint32_t ac_smpr1; + /** + * @brief ADC SMPR2 register initialization data. + */ + uint32_t ac_smpr2; + /** + * @brief ADC SQR1 register initialization data. + */ + uint32_t ac_sqr1; + /** + * @brief ADC SQR2 register initialization data. + */ + uint32_t ac_sqr2; + /** + * @brief ADC SQR3 register initialization data. + */ + uint32_t ac_sqr3; } ADCConfig; /** @@ -82,15 +109,15 @@ typedef struct { /** * @brief Driver state. */ - adcstate_t adc_state; + adcstate_t ad_state; /** * @brief Current configuration data. */ - const ADCConfig *adc_config; + const ADCConfig *ad_config; /** * @brief Semaphore for completion synchronization. */ - Semaphore adc_sem; + Semaphore ad_sem; /* End of the mandatory fields.*/ } ADCDriver; diff --git a/os/io/templates/adc_lld.h b/os/io/templates/adc_lld.h index 8ae29a521..897ebbf2e 100644 --- a/os/io/templates/adc_lld.h +++ b/os/io/templates/adc_lld.h @@ -82,15 +82,15 @@ typedef struct { /** * @brief Driver state. */ - adcstate_t adc_state; + adcstate_t ad_state; /** * @brief Current configuration data. */ - const ADCConfig *adc_config; + const ADCConfig *ad_config; /** * @brief Semaphore for completion synchronization. */ - Semaphore adc_sem; + Semaphore ac_sem; /* End of the mandatory fields.*/ } ADCDriver;