andreika-git
/
ChibiOS
mirror of https://github.com/andreika-git/ChibiOS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DAC merge and rework, part 3. 

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@5913 35acf78f-673a-0410-8e92-d51de3d6d3f4
This commit is contained in:
gdisirio 2013-06-30 10:31:56 +00:00
parent 0dc43f5c24
commit 1e412cad0d
4 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
os/hal/include/hal.h
View File

@ -47,6 +47,7 @@
#include "pal.h" #include "pal.h"
#include "adc.h" #include "adc.h"
#include "can.h" #include "can.h"
#include "dac.h"
#include "ext.h" #include "ext.h"
#include "gpt.h" #include "gpt.h"
#include "i2c.h" #include "i2c.h"

4
os/hal/src/dac.c
View File

@ -215,7 +215,7 @@ void dacStopConversion(DACDriver *dacp) {
(dacp->state == DAC_ACTIVE), (dacp->state == DAC_ACTIVE),
"dacStopConversion(), #1", "invalid state"); "dacStopConversion(), #1", "invalid state");
if (dacp->state != DAC_READY) { if (dacp->state != DAC_READY) {
adc_lld_stop_conversion(dacp); dac_lld_stop_conversion(dacp);
dacp->grpp = NULL; dacp->grpp = NULL;
dacp->state = DAC_READY; dacp->state = DAC_READY;
_dac_reset_s(dacp); _dac_reset_s(dacp);
@ -243,7 +243,7 @@ void dacStopConversionI(DACDriver *dacp) {
"dacStopConversionI(), #1", "invalid state"); "dacStopConversionI(), #1", "invalid state");
if (dacp->state != DAC_READY) { if (dacp->state != DAC_READY) {
adc_lld_stop_conversion(dacp); dac_lld_stop_conversion(dacp);
dacp->grpp = NULL; dacp->grpp = NULL;
dacp->state = DAC_READY; dacp->state = DAC_READY;
_dac_reset_i(dacp); _dac_reset_i(dacp);

2
os/hal/templates/dac_lld.h
View File

@ -154,7 +154,7 @@ struct DACDriver {
/** /**
* @brief Current samples buffer pointer or @p NULL. * @brief Current samples buffer pointer or @p NULL.
*/ */
dacsample_t *samples; const dacsample_t *samples;
/** /**
* @brief Current samples buffer depth or @p 0. * @brief Current samples buffer depth or @p 0.
*/ */

7
os/hal/templates/halconf.h
View File

@ -61,6 +61,13 @@
#define HAL_USE_CAN TRUE #define HAL_USE_CAN TRUE
#endif #endif
/**
* @brief Enables the DAC subsystem.
*/
#if !defined(HAL_USE_DAC) || defined(__DOXYGEN__)
#define HAL_USE_DAC TRUE
#endif
/** /**
* @brief Enables the EXT subsystem. * @brief Enables the EXT subsystem.
*/ */