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

Fixed bug #817. 

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/stable_16.1.x@10091 35acf78f-673a-0410-8e92-d51de3d6d3f4
This commit is contained in:
Giovanni Di Sirio 2017-02-06 10:35:59 +00:00
parent 58df95525a
commit 024738d265
9 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
os/hal/include/dac.h
View File

@ -243,14 +243,14 @@ extern "C" {
dacchannel_t channel, dacchannel_t channel,
dacsample_t sample); dacsample_t sample);
void dacStartConversion(DACDriver *dacp, const DACConversionGroup *grpp, void dacStartConversion(DACDriver *dacp, const DACConversionGroup *grpp,
const dacsample_t *samples, size_t depth); dacsample_t *samples, size_t depth);
void dacStartConversionI(DACDriver *dacp, const DACConversionGroup *grpp, void dacStartConversionI(DACDriver *dacp, const DACConversionGroup *grpp,
const dacsample_t *samples, size_t depth); dacsample_t *samples, size_t depth);
void dacStopConversion(DACDriver *dacp); void dacStopConversion(DACDriver *dacp);
void dacStopConversionI(DACDriver *dacp); void dacStopConversionI(DACDriver *dacp);
#if DAC_USE_WAIT #if DAC_USE_WAIT
msg_t dacConvert(DACDriver *dacp, const DACConversionGroup *grpp, msg_t dacConvert(DACDriver *dacp, const DACConversionGroup *grpp,
const dacsample_t *samples, size_t depth); dacsample_t *samples, size_t depth);
#endif #endif
#if DAC_USE_MUTUAL_EXCLUSION #if DAC_USE_MUTUAL_EXCLUSION
void dacAcquireBus(DACDriver *dacp); void dacAcquireBus(DACDriver *dacp);

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

@ -305,9 +305,7 @@ typedef enum {
* @param[in] n number of buffer rows available starting from @p buffer * @param[in] n number of buffer rows available starting from @p buffer
* callback * callback
*/ */
typedef void (*daccallback_t)(DACDriver *dacp, typedef void (*daccallback_t)(DACDriver *dacp, dacsample_t *buffer, size_t n);
const dacsample_t *buffer,
size_t n);
/** /**
* @brief ADC error callback type. * @brief ADC error callback type.
@ -392,7 +390,7 @@ struct DACDriver {
/** /**
* @brief Samples buffer pointer. * @brief Samples buffer pointer.
*/ */
const dacsample_t *samples; dacsample_t *samples;
/** /**
* @brief Samples buffer size. * @brief Samples buffer size.
*/ */

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

@ -165,7 +165,7 @@ void dacPutChannelX(DACDriver *dacp, dacchannel_t channel, dacsample_t sample) {
*/ */
void dacStartConversion(DACDriver *dacp, void dacStartConversion(DACDriver *dacp,
const DACConversionGroup *grpp, const DACConversionGroup *grpp,
const dacsample_t *samples, dacsample_t *samples,
size_t depth) { size_t depth) {
osalSysLock(); osalSysLock();
@ -193,7 +193,7 @@ void dacStartConversion(DACDriver *dacp,
*/ */
void dacStartConversionI(DACDriver *dacp, void dacStartConversionI(DACDriver *dacp,
const DACConversionGroup *grpp, const DACConversionGroup *grpp,
const dacsample_t *samples, dacsample_t *samples,
size_t depth) { size_t depth) {
osalDbgCheckClassI(); osalDbgCheckClassI();
@ -294,7 +294,7 @@ void dacStopConversionI(DACDriver *dacp) {
*/ */
msg_t dacConvert(DACDriver *dacp, msg_t dacConvert(DACDriver *dacp,
const DACConversionGroup *grpp, const DACConversionGroup *grpp,
const dacsample_t *samples, dacsample_t *samples,
size_t depth) { size_t depth) {
msg_t msg; msg_t msg;

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

@ -95,9 +95,7 @@ typedef enum {
* @param[in] n number of buffer rows available starting from @p buffer * @param[in] n number of buffer rows available starting from @p buffer
* callback * callback
*/ */
typedef void (*daccallback_t)(DACDriver *dacp, typedef void (*daccallback_t)(DACDriver *dacp, dacsample_t *buffer, size_t n);
const dacsample_t *buffer,
size_t n);
/** /**
* @brief ADC error callback type. * @brief ADC error callback type.
@ -150,7 +148,7 @@ struct DACDriver {
/** /**
* @brief Samples buffer pointer. * @brief Samples buffer pointer.
*/ */
const dacsample_t *samples; dacsample_t *samples;
/** /**
* @brief Samples buffer size. * @brief Samples buffer size.
*/ */

1
readme.txt
View File

@ -73,6 +73,7 @@
***************************************************************************** *****************************************************************************
*** 16.1.8 *** *** 16.1.8 ***
- HAL: Fixed DAC driver problem with API signature (bug #817).
- HAL: Fixed STM32 OTGv1 driver not serving interrupts for endpoints > 5 - HAL: Fixed STM32 OTGv1 driver not serving interrupts for endpoints > 5
(bug #816). (bug #816).
- HAL: Fixed STM32 MAC driver needs __DSB() for STM32F7 when operating in - HAL: Fixed STM32 MAC driver needs __DSB() for STM32F7 when operating in

5
testhal/STM32/STM32F3xx/DAC/main.c
View File

@ -59,7 +59,7 @@ static const dacsample_t dac_buffer[DAC_BUFFER_SIZE] = {
* DAC streaming callback. * DAC streaming callback.
*/ */
size_t nx = 0, ny = 0, nz = 0; size_t nx = 0, ny = 0, nz = 0;
static void end_cb1(DACDriver *dacp, const dacsample_t *buffer, size_t n) { static void end_cb1(DACDriver *dacp, dacsample_t *buffer, size_t n) {
(void)dacp; (void)dacp;
@ -140,7 +140,8 @@ int main(void) {
/* /*
* Starting a continuous conversion. * Starting a continuous conversion.
*/ */
dacStartConversion(&DACD1, &dacgrpcfg1, dac_buffer, DAC_BUFFER_SIZE); dacStartConversion(&DACD1, &dacgrpcfg1,
(dacsample_t *)dac_buffer, DAC_BUFFER_SIZE);
gptStartContinuous(&GPTD6, 2U); gptStartContinuous(&GPTD6, 2U);
/* /*

5
testhal/STM32/STM32F4xx/DAC/main.c
View File

@ -59,7 +59,7 @@ static const dacsample_t dac_buffer[DAC_BUFFER_SIZE] = {
* DAC streaming callback. * DAC streaming callback.
*/ */
size_t nx = 0, ny = 0, nz = 0; size_t nx = 0, ny = 0, nz = 0;
static void end_cb1(DACDriver *dacp, const dacsample_t *buffer, size_t n) { static void end_cb1(DACDriver *dacp, dacsample_t *buffer, size_t n) {
(void)dacp; (void)dacp;
@ -140,7 +140,8 @@ int main(void) {
/* /*
* Starting a continuous conversion. * Starting a continuous conversion.
*/ */
dacStartConversion(&DACD1, &dacgrpcfg1, dac_buffer, DAC_BUFFER_SIZE); dacStartConversion(&DACD1, &dacgrpcfg1,
(dacsample_t *)dac_buffer, DAC_BUFFER_SIZE);
gptStartContinuous(&GPTD6, 2U); gptStartContinuous(&GPTD6, 2U);
/* /*

5
testhal/STM32/STM32F4xx/DAC_DUAL/main.c
View File

@ -59,7 +59,7 @@ static const dacsample_t dac_buffer[DAC_BUFFER_SIZE] = {
* DAC streaming callback. * DAC streaming callback.
*/ */
size_t nx = 0, ny = 0, nz = 0; size_t nx = 0, ny = 0, nz = 0;
static void end_cb1(DACDriver *dacp, const dacsample_t *buffer, size_t n) { static void end_cb1(DACDriver *dacp, dacsample_t *buffer, size_t n) {
(void)dacp; (void)dacp;
@ -143,7 +143,8 @@ int main(void) {
* Note, the buffer size is divided by two because two elements are fetched * Note, the buffer size is divided by two because two elements are fetched
* for each transfer. * for each transfer.
*/ */
dacStartConversion(&DACD1, &dacgrpcfg1, dac_buffer, DAC_BUFFER_SIZE / 2U); dacStartConversion(&DACD1, &dacgrpcfg1,
(dacsample_t *)dac_buffer, DAC_BUFFER_SIZE / 2U);
gptStartContinuous(&GPTD6, 2U); gptStartContinuous(&GPTD6, 2U);
/* /*

5
testhal/STM32/STM32L1xx/DAC/main.c
View File

@ -59,7 +59,7 @@ static const dacsample_t dac_buffer[DAC_BUFFER_SIZE] = {
* DAC streaming callback. * DAC streaming callback.
*/ */
size_t nx = 0, ny = 0, nz = 0; size_t nx = 0, ny = 0, nz = 0;
static void end_cb1(DACDriver *dacp, const dacsample_t *buffer, size_t n) { static void end_cb1(DACDriver *dacp, dacsample_t *buffer, size_t n) {
(void)dacp; (void)dacp;
@ -140,7 +140,8 @@ int main(void) {
/* /*
* Starting a continuous conversion. * Starting a continuous conversion.
*/ */
dacStartConversion(&DACD1, &dacgrpcfg1, dac_buffer, DAC_BUFFER_SIZE); dacStartConversion(&DACD1, &dacgrpcfg1,
(dacsample_t *)dac_buffer, DAC_BUFFER_SIZE);
gptStartContinuous(&GPTD6, 2U); gptStartContinuous(&GPTD6, 2U);
/* /*