From f20ecc78178fc8cdfa682e100398c240224dbb4a Mon Sep 17 00:00:00 2001 From: gdisirio Date: Sat, 15 Dec 2018 17:50:05 +0000 Subject: HAL callbacks rework. git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@12470 110e8d01-0319-4d1e-a829-52ad28d1bb01 --- testhal/STM32/multi/DAC/main.c | 10 ++++------ testhal/STM32/multi/SPI/main.c | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) (limited to 'testhal/STM32/multi') diff --git a/testhal/STM32/multi/DAC/main.c b/testhal/STM32/multi/DAC/main.c index e8643c183..08786f002 100644 --- a/testhal/STM32/multi/DAC/main.c +++ b/testhal/STM32/multi/DAC/main.c @@ -61,16 +61,14 @@ static const dacsample_t dac_buffer[DAC_BUFFER_SIZE] = { * DAC streaming callback. */ size_t nx = 0, ny = 0, nz = 0; -static void end_cb1(DACDriver *dacp, dacsample_t *buffer, size_t n) { - - (void)dacp; +static void end_cb1(DACDriver *dacp) { nz++; - if (dac_buffer == buffer) { - nx += n; + if (dacIsBufferComplete(dacp)) { + nx += DAC_BUFFER_SIZE / 2; } else { - ny += n; + ny += DAC_BUFFER_SIZE / 2; } if ((nz % 1000) == 0) { diff --git a/testhal/STM32/multi/SPI/main.c b/testhal/STM32/multi/SPI/main.c index aa8d9bb33..96e2ee154 100755 --- a/testhal/STM32/multi/SPI/main.c +++ b/testhal/STM32/multi/SPI/main.c @@ -32,7 +32,7 @@ CC_ALIGN(32) static uint8_t rxbuf[512]; */ void spi_circular_cb(SPIDriver *spip) { - if(spip->state == SPI_COMPLETE) { + if (spiIsBufferComplete(spip)) { /* 2nd half.*/ palWriteLine(PORTAB_LINE_LED1, PORTAB_LED_OFF); } -- cgit v1.2.3