pbio/drv/block_device_ev3: Fix RX DMA channel.

Fix a typo where the RX channel for the wrong SPI peripheral was
requested. Likely we didn't notice this because everything should
already be set up correctly by the bootloader since it also uses
this SPI for flash memory.

Author: dlech

lib/pbio/drv/block_device/block_device_ev3.c

@@ -24,7 +24,6 @@
 
 #include <pbdrv/block_device.h>
 #include <pbdrv/clock.h>
-#include <pbdrv/compiler.h>
 #include <pbdrv/gpio.h>
 
 #include <tiam1808/edma.h>
@@ -243,7 +242,7 @@ static void spi_bus_init(void) {
 
     // Request DMA channels. This only needs to be done for the initial events (and not for linked parameter sets)
     EDMA3RequestChannel(SOC_EDMA30CC_0_REGS, EDMA3_CHANNEL_TYPE_DMA, EDMA3_CHA_SPI0_TX, EDMA3_CHA_SPI0_TX, 0);
-    EDMA3RequestChannel(SOC_EDMA30CC_0_REGS, EDMA3_CHANNEL_TYPE_DMA, EDMA3_CHA_SPI1_RX, EDMA3_CHA_SPI1_RX, 0);
+    EDMA3RequestChannel(SOC_EDMA30CC_0_REGS, EDMA3_CHANNEL_TYPE_DMA, EDMA3_CHA_SPI0_RX, EDMA3_CHA_SPI0_RX, 0);
 
     // Enable!
     SPIEnable(SOC_SPI_0_REGS);
@@ -487,8 +486,8 @@ static pbio_error_t spi_begin_for_flash(
 
         spi_dev.status = SPI_STATUS_WAIT_TX | SPI_STATUS_WAIT_RX;
 
-        // TODO: eventually needs DMA cache management
-        pbdrv_compiler_memory_barrier();
+        // TODO: pbio probably needs a framework for memory barriers and DMA cache management
+        __asm__ volatile ("" ::: "memory");
 
         EDMA3EnableTransfer(SOC_EDMA30CC_0_REGS, EDMA3_CHA_SPI0_TX, EDMA3_TRIG_MODE_EVENT);
         EDMA3EnableTransfer(SOC_EDMA30CC_0_REGS, EDMA3_CHA_SPI0_RX, EDMA3_TRIG_MODE_EVENT);
@@ -806,8 +805,8 @@ static pbio_error_t pbdrv_block_device_ev3_spi_begin_for_adc(const uint32_t *cmd
 
     spi_dev.status = SPI_STATUS_WAIT_TX | SPI_STATUS_WAIT_RX;
 
-    // TODO: eventually needs DMA cache management
-    pbdrv_compiler_memory_barrier();
+    // TODO: pbio probably needs a framework for memory barriers and DMA cache management
+    __asm__ volatile ("" ::: "memory");
 
     EDMA3EnableTransfer(SOC_EDMA30CC_0_REGS, EDMA3_CHA_SPI0_TX, EDMA3_TRIG_MODE_EVENT);
     EDMA3EnableTransfer(SOC_EDMA30CC_0_REGS, EDMA3_CHA_SPI0_RX, EDMA3_TRIG_MODE_EVENT);