zcy
/
tinySA
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6763 35acf78f-673a-0410-8e92-d51de3d6d3f4

master
gdisirio 2014-03-09 19:25:49 +00:00
parent 348784fdf2
commit c3f7c51a7d
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
os/hal/ports/STM32/LLD/DACv1/dac_lld.c
View File

@ -79,7 +79,6 @@ DACDriver DACD3;
/* Driver local functions. */ /* Driver local functions. */
/*===========================================================================*/ /*===========================================================================*/
/** /**
* @brief Shared end/half-of-tx service routine. * @brief Shared end/half-of-tx service routine.
* *
@ -87,6 +86,7 @@ DACDriver DACD3;
* @param[in] flags pre-shifted content of the ISR register * @param[in] flags pre-shifted content of the ISR register
*/ */
static void dac_lld_serve_tx_interrupt(DACDriver *dacp, uint32_t flags) { static void dac_lld_serve_tx_interrupt(DACDriver *dacp, uint32_t flags) {
#if defined(STM32_DAC_DMA_ERROR_HOOK) #if defined(STM32_DAC_DMA_ERROR_HOOK)
(void)dacp; (void)dacp;
if ((flags & (STM32_DMA_ISR_TEIF | STM32_DMA_ISR_DMEIF)) != 0) { if ((flags & (STM32_DMA_ISR_TEIF | STM32_DMA_ISR_DMEIF)) != 0) {

20
os/hal/ports/STM32/LLD/DACv1/dac_lld.h
View File

@ -265,7 +265,7 @@ typedef enum {
DAC_DHRM_12BIT_RIGHT = 0, DAC_DHRM_12BIT_RIGHT = 0,
DAC_DHRM_12BIT_LEFT = 1, DAC_DHRM_12BIT_LEFT = 1,
DAC_DHRM_8BIT_RIGHT = 2, DAC_DHRM_8BIT_RIGHT = 2,
#if defined(STM32_HAS_DAC_CHN2) && STM32_HAS_DAC_CHN2 && !defined(__DOXYGEN__) #if STM32_HAS_DAC_CHN2 && !defined(__DOXYGEN__)
DAC_DHRM_12BIT_RIGHT_DUAL = 3, DAC_DHRM_12BIT_RIGHT_DUAL = 3,
DAC_DHRM_12BIT_LEFT_DUAL = 4, DAC_DHRM_12BIT_LEFT_DUAL = 4,
DAC_DHRM_8BIT_RIGHT_DUAL = 5 DAC_DHRM_8BIT_RIGHT_DUAL = 5
@ -279,15 +279,15 @@ typedef struct {
/** /**
* @brief Number of DAC channels. * @brief Number of DAC channels.
*/ */
uint16_t num_channels; uint32_t num_channels;
/** /**
* @brief Operation complete callback or @p NULL. * @brief Operation complete callback or @p NULL.
*/ */
daccallback_t end_cb; daccallback_t end_cb;
/** /**
* @brief Error handling callback or @p NULL. * @brief Error handling callback or @p NULL.
*/ */
daccallback_t error_cb; daccallback_t error_cb;
} DACConversionGroup; } DACConversionGroup;
@ -303,7 +303,7 @@ typedef struct {
/** /**
* @brief DAC data holding register mode. * @brief DAC data holding register mode.
*/ */
dacdhrmode_t dhrm; dacdhrmode_t dhrm;
/** /**
* @brief DAC initialization data. * @brief DAC initialization data.
*/ */
@ -321,15 +321,15 @@ struct DACDriver {
/** /**
* @brief Conversion group. * @brief Conversion group.
*/ */
const DACConversionGroup *grpp; const DACConversionGroup *grpp;
/** /**
* @brief Samples buffer pointer. * @brief Samples buffer pointer.
*/ */
const dacsample_t *samples; const dacsample_t *samples;
/** /**
* @brief Samples buffer size. * @brief Samples buffer size.
*/ */
uint16_t depth; uint16_t depth;
/** /**
* @brief Current configuration data. * @brief Current configuration data.
*/ */
@ -338,13 +338,13 @@ struct DACDriver {
/** /**
* @brief Waiting thread. * @brief Waiting thread.
*/ */
thread_reference_t thread; thread_reference_t thread;
#endif /* DAC_USE_WAIT */ #endif /* DAC_USE_WAIT */
#if DAC_USE_MUTUAL_EXCLUSION || defined(__DOXYGEN__) #if DAC_USE_MUTUAL_EXCLUSION || defined(__DOXYGEN__)
/** /**
* @brief Mutex protecting the bus. * @brief Mutex protecting the bus.
*/ */
mutex_t mutex; mutex_t mutex;
#endif /* DAC_USE_MUTUAL_EXCLUSION */ #endif /* DAC_USE_MUTUAL_EXCLUSION */
#if defined(DAC_DRIVER_EXT_FIELDS) #if defined(DAC_DRIVER_EXT_FIELDS)
DAC_DRIVER_EXT_FIELDS DAC_DRIVER_EXT_FIELDS