diff options
| author | gdisirio <gdisirio@110e8d01-0319-4d1e-a829-52ad28d1bb01> | 2018-12-15 17:50:05 +0000 |
|---|---|---|
| committer | gdisirio <gdisirio@110e8d01-0319-4d1e-a829-52ad28d1bb01> | 2018-12-15 17:50:05 +0000 |
| commit | f20ecc78178fc8cdfa682e100398c240224dbb4a (patch) | |
| tree | 64272a45778baea1c1deed82d9223c3ddc87f6e7 /os/hal/ports | |
| parent | 984f865b45b110915616c3c9629fe47b064bed99 (diff) | |
| download | ChibiOS-f20ecc78178fc8cdfa682e100398c240224dbb4a.tar.gz ChibiOS-f20ecc78178fc8cdfa682e100398c240224dbb4a.tar.bz2 ChibiOS-f20ecc78178fc8cdfa682e100398c240224dbb4a.zip | |
HAL callbacks rework.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@12470 110e8d01-0319-4d1e-a829-52ad28d1bb01
Diffstat (limited to 'os/hal/ports')
| -rw-r--r-- | os/hal/ports/STM32/LLD/SPIv1/hal_spi_lld.c | 6 | ||||
| -rw-r--r-- | os/hal/ports/STM32/LLD/SPIv2/hal_i2s_lld.c | 4 | ||||
| -rw-r--r-- | os/hal/ports/STM32/LLD/SPIv2/hal_spi_lld.c | 6 | ||||
| -rw-r--r-- | os/hal/ports/STM32/LLD/SPIv3/hal_i2s_lld.c | 4 | ||||
| -rw-r--r-- | os/hal/ports/STM32/LLD/SPIv3/hal_spi_lld.c | 12 |
5 files changed, 16 insertions, 16 deletions
diff --git a/os/hal/ports/STM32/LLD/SPIv1/hal_spi_lld.c b/os/hal/ports/STM32/LLD/SPIv1/hal_spi_lld.c index b160433cd..7cfe5d9a1 100644 --- a/os/hal/ports/STM32/LLD/SPIv1/hal_spi_lld.c +++ b/os/hal/ports/STM32/LLD/SPIv1/hal_spi_lld.c @@ -143,11 +143,11 @@ static void spi_lld_serve_rx_interrupt(SPIDriver *spip, uint32_t flags) { if (spip->config->circular) {
if ((flags & STM32_DMA_ISR_HTIF) != 0U) {
/* Half buffer interrupt.*/
- _spi_isr_code_half1(spip);
+ _spi_isr_half_code(spip);
}
- else {
+ if ((flags & STM32_DMA_ISR_TCIF) != 0U) {
/* End buffer interrupt.*/
- _spi_isr_code_half2(spip);
+ _spi_isr_full_code(spip);
}
}
else {
diff --git a/os/hal/ports/STM32/LLD/SPIv2/hal_i2s_lld.c b/os/hal/ports/STM32/LLD/SPIv2/hal_i2s_lld.c index f425805a4..83258538e 100644 --- a/os/hal/ports/STM32/LLD/SPIv2/hal_i2s_lld.c +++ b/os/hal/ports/STM32/LLD/SPIv2/hal_i2s_lld.c @@ -198,11 +198,11 @@ static void i2s_lld_serve_tx_interrupt(I2SDriver *i2sp, uint32_t flags) { level driver.*/
if ((flags & STM32_DMA_ISR_TCIF) != 0) {
/* Transfer complete processing.*/
- _i2s_isr_full_code(i2sp);
+ _i2s_isr_code_half2(i2sp);
}
else if ((flags & STM32_DMA_ISR_HTIF) != 0) {
/* Half transfer processing.*/
- _i2s_isr_half_code(i2sp);
+ _i2s_isr_code_half1(i2sp);
}
}
#endif
diff --git a/os/hal/ports/STM32/LLD/SPIv2/hal_spi_lld.c b/os/hal/ports/STM32/LLD/SPIv2/hal_spi_lld.c index dd718d385..26e381c77 100644 --- a/os/hal/ports/STM32/LLD/SPIv2/hal_spi_lld.c +++ b/os/hal/ports/STM32/LLD/SPIv2/hal_spi_lld.c @@ -143,11 +143,11 @@ static void spi_lld_serve_rx_interrupt(SPIDriver *spip, uint32_t flags) { if (spip->config->circular) {
if ((flags & STM32_DMA_ISR_HTIF) != 0U) {
/* Half buffer interrupt.*/
- _spi_isr_code_half1(spip);
+ _spi_isr_half_code(spip);
}
- else {
+ if ((flags & STM32_DMA_ISR_TCIF) != 0U) {
/* End buffer interrupt.*/
- _spi_isr_code_half2(spip);
+ _spi_isr_full_code(spip);
}
}
else {
diff --git a/os/hal/ports/STM32/LLD/SPIv3/hal_i2s_lld.c b/os/hal/ports/STM32/LLD/SPIv3/hal_i2s_lld.c index f425805a4..83258538e 100644 --- a/os/hal/ports/STM32/LLD/SPIv3/hal_i2s_lld.c +++ b/os/hal/ports/STM32/LLD/SPIv3/hal_i2s_lld.c @@ -198,11 +198,11 @@ static void i2s_lld_serve_tx_interrupt(I2SDriver *i2sp, uint32_t flags) { level driver.*/
if ((flags & STM32_DMA_ISR_TCIF) != 0) {
/* Transfer complete processing.*/
- _i2s_isr_full_code(i2sp);
+ _i2s_isr_code_half2(i2sp);
}
else if ((flags & STM32_DMA_ISR_HTIF) != 0) {
/* Half transfer processing.*/
- _i2s_isr_half_code(i2sp);
+ _i2s_isr_code_half1(i2sp);
}
}
#endif
diff --git a/os/hal/ports/STM32/LLD/SPIv3/hal_spi_lld.c b/os/hal/ports/STM32/LLD/SPIv3/hal_spi_lld.c index 86c2440e9..994c31d14 100644 --- a/os/hal/ports/STM32/LLD/SPIv3/hal_spi_lld.c +++ b/os/hal/ports/STM32/LLD/SPIv3/hal_spi_lld.c @@ -96,11 +96,11 @@ static void spi_lld_serve_bdma_rx_interrupt(SPIDriver *spip, uint32_t flags) { if (spip->config->circular) {
if ((flags & STM32_BDMA_ISR_HTIF) != 0U) {
/* Half buffer interrupt.*/
- _spi_isr_code_half1(spip);
+ _spi_isr_half_code(spip);
}
- else {
+ if ((flags & STM32_BDMA_ISR_TCIF) != 0U) {
/* End buffer interrupt.*/
- _spi_isr_code_half2(spip);
+ _spi_isr_full_code(spip);
}
}
else {
@@ -159,11 +159,11 @@ static void spi_lld_serve_dma_rx_interrupt(SPIDriver *spip, uint32_t flags) { if (spip->config->circular) {
if ((flags & STM32_DMA_ISR_HTIF) != 0U) {
/* Half buffer interrupt.*/
- _spi_isr_code_half1(spip);
+ _spi_isr_half_code(spip);
}
- else {
+ if ((flags & STM32_DMA_ISR_TCIF) != 0U) {
/* End buffer interrupt.*/
- _spi_isr_code_half2(spip);
+ _spi_isr_full_code(spip);
}
}
else {
|