From 73a49abf8b04ceac3d7043a99e841929ceb88c34 Mon Sep 17 00:00:00 2001 From: Giovanni Di Sirio Date: Sat, 29 Jan 2022 10:52:02 +0000 Subject: [PATCH] Reverted bug #1100. git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/stable_20.3.x@15420 27425a3e-05d8-49a3-a47f-9c15f0e5edd8 --- os/hal/ports/STM32/LLD/DACv1/hal_dac_lld.c | 8 ++++---- readme.txt | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/os/hal/ports/STM32/LLD/DACv1/hal_dac_lld.c b/os/hal/ports/STM32/LLD/DACv1/hal_dac_lld.c index b4180d36c..d9b9707b5 100644 --- a/os/hal/ports/STM32/LLD/DACv1/hal_dac_lld.c +++ b/os/hal/ports/STM32/LLD/DACv1/hal_dac_lld.c @@ -652,7 +652,7 @@ void dac_lld_start_conversion(DACDriver *dacp) { dmaStreamSetPeripheral(dacp->dma, &dacp->params->dac->DHR12R1 + dacp->params->dataoffset); dmamode = dacp->params->dmamode | - STM32_DMA_CR_PSIZE_HWORD | STM32_DMA_CR_MSIZE_HWORD; + STM32_DMA_CR_PSIZE_WORD | STM32_DMA_CR_MSIZE_HWORD; break; case DAC_DHRM_12BIT_LEFT: osalDbgAssert(dacp->grpp->num_channels == 1, "invalid number of channels"); @@ -660,7 +660,7 @@ void dac_lld_start_conversion(DACDriver *dacp) { dmaStreamSetPeripheral(dacp->dma, &dacp->params->dac->DHR12L1 + dacp->params->dataoffset); dmamode = dacp->params->dmamode | - STM32_DMA_CR_PSIZE_HWORD | STM32_DMA_CR_MSIZE_HWORD; + STM32_DMA_CR_PSIZE_WORD | STM32_DMA_CR_MSIZE_HWORD; break; case DAC_DHRM_8BIT_RIGHT: osalDbgAssert(dacp->grpp->num_channels == 1, "invalid number of channels"); @@ -668,7 +668,7 @@ void dac_lld_start_conversion(DACDriver *dacp) { dmaStreamSetPeripheral(dacp->dma, &dacp->params->dac->DHR8R1 + dacp->params->dataoffset); dmamode = dacp->params->dmamode | - STM32_DMA_CR_PSIZE_BYTE | STM32_DMA_CR_MSIZE_BYTE; + STM32_DMA_CR_PSIZE_WORD | STM32_DMA_CR_MSIZE_BYTE; /* In this mode the size of the buffer is halved because two samples packed in a single dacsample_t element.*/ @@ -696,7 +696,7 @@ void dac_lld_start_conversion(DACDriver *dacp) { dmaStreamSetPeripheral(dacp->dma, &dacp->params->dac->DHR8RD); dmamode = dacp->params->dmamode | - STM32_DMA_CR_PSIZE_HWORD | STM32_DMA_CR_MSIZE_HWORD; + STM32_DMA_CR_PSIZE_WORD | STM32_DMA_CR_MSIZE_HWORD; n /= 2; break; #endif diff --git a/readme.txt b/readme.txt index 448dce4d1..7b6afd46f 100644 --- a/readme.txt +++ b/readme.txt @@ -75,6 +75,7 @@ *** 20.3.5 *** - FIX: Some MISRA-related fixes. +- FIX: Reverted bug #1100. - FIX: Fixed Virtual Timers failure in a specific condition (bug #1215). - FIX: Fixed invalid state transition in SNOR flash driver (bug #1212). - FIX: Fixed missing check in chobjcaches.h (bug #1210).