diff options
author | barthess <barthess@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2011-08-28 13:39:56 +0000 |
---|---|---|
committer | barthess <barthess@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2011-08-28 13:39:56 +0000 |
commit | fc492c6d190610cc9537360edf44d6dc5d072a2c (patch) | |
tree | 53fb1786e058f872671fb3adca4e73c708716d54 /os/hal/platforms/STM32F1xx/adc_lld.h | |
parent | da23780899ae4b9ce1bbe0cb9109da1c87fe0fa1 (diff) | |
parent | 663214d0e6728d153fd4118324e69c75c574327c (diff) | |
download | ChibiOS-fc492c6d190610cc9537360edf44d6dc5d072a2c.tar.gz ChibiOS-fc492c6d190610cc9537360edf44d6dc5d072a2c.tar.bz2 ChibiOS-fc492c6d190610cc9537360edf44d6dc5d072a2c.zip |
I2C. Merge code from trunk.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/i2c_dev@3263 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/hal/platforms/STM32F1xx/adc_lld.h')
-rw-r--r-- | os/hal/platforms/STM32F1xx/adc_lld.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/os/hal/platforms/STM32F1xx/adc_lld.h b/os/hal/platforms/STM32F1xx/adc_lld.h index ce93e60ed..43b16b738 100644 --- a/os/hal/platforms/STM32F1xx/adc_lld.h +++ b/os/hal/platforms/STM32F1xx/adc_lld.h @@ -268,13 +268,13 @@ struct ADCDriver { */
ADC_TypeDef *adc;
/**
- * @brief Pointer to the DMA registers block.
+ * @brief Pointer to associated SMA channel.
*/
- stm32_dma_channel_t *dmachp;
+ const stm32_dma_stream_t *dmastp;
/**
- * @brief DMA CCR register bit mask.
+ * @brief DMA mode bit mask.
*/
- uint32_t dmaccr;
+ uint32_t dmamode;
};
/*===========================================================================*/
|