aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2009-11-15 15:58:08 +0000
committergdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2009-11-15 15:58:08 +0000
commit96b27529e200345012e9f98985a872d1a42863bb (patch)
treeddb0e75abcb952db564b40d16d70c1ab40fbf237
parent89a9bbf48fe87a6d76226e80723930617380c369 (diff)
downloadChibiOS-96b27529e200345012e9f98985a872d1a42863bb.tar.gz
ChibiOS-96b27529e200345012e9f98985a872d1a42863bb.tar.bz2
ChibiOS-96b27529e200345012e9f98985a872d1a42863bb.zip
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@1307 35acf78f-673a-0410-8e92-d51de3d6d3f4
-rw-r--r--os/io/platforms/STM32/adc_lld.h35
-rw-r--r--os/io/templates/adc_lld.h6
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;