RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

atsam: multiple messages on one cs low level

Browse Source
This commit is contained in:
Alexander Krutwig
2016-10-17 14:36:49 +02:00
committed by Sebastian Huber
parent dfcec5595f
commit 24fe2130d7
2 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
c/src/lib/libbsp/arm/atsam/include/atsam-spi.h
View File

@@ -44,6 +44,7 @@ typedef struct {
uint32_t dma_rx_channel; uint32_t dma_rx_channel;
bool rx_transfer_done; bool rx_transfer_done;
bool tx_transfer_done; bool tx_transfer_done;
bool spi_switched_on;
} atsam_spi_bus; } atsam_spi_bus;
int spi_bus_register_atsam( int spi_bus_register_atsam(

21
c/src/lib/libbsp/arm/atsam/spi/atsam_spi_bus.c
View File

@@ -97,7 +97,6 @@ static void atsam_interrupt_handler(void *arg)
} else { } else {
/* Block end interrupt for LLI dma mode */ /* Block end interrupt for LLI dma mode */
if (XDMAC_GetChannelIsr(xdmac, channel) & XDMAC_CIS_BIS) { if (XDMAC_GetChannelIsr(xdmac, channel) & XDMAC_CIS_BIS) {
atsam_finish_command(spid);
} }
} }
@@ -110,7 +109,6 @@ static void atsam_interrupt_handler(void *arg)
} }
if (bus->rx_transfer_done && bus->tx_transfer_done) { if (bus->rx_transfer_done && bus->tx_transfer_done) {
atsam_finish_command(spid);
sc = rtems_event_transient_send(bus->task_id); sc = rtems_event_transient_send(bus->task_id);
assert(sc == RTEMS_SUCCESSFUL); assert(sc == RTEMS_SUCCESSFUL);
} }
@@ -149,6 +147,7 @@ static void atsam_set_phase_and_polarity(uint32_t mode, uint32_t *csr)
*csr |= SPI_CSR_CPOL; *csr |= SPI_CSR_CPOL;
break; break;
} }
*csr |= SPI_CSR_CSAAT;
} }
static void atsam_configure_spi(atsam_spi_bus *bus) static void atsam_configure_spi(atsam_spi_bus *bus)
@@ -370,14 +369,18 @@ static uint32_t atsam_send_command(
return SPID_ERROR_LOCK; return SPID_ERROR_LOCK;
} }
/* Enable the SPI Peripheral */ if(!bus->spi_switched_on){
PMC_EnablePeripheral(spid->spiId); /* Enable the SPI Peripheral */
PMC_EnablePeripheral(spid->spiId);
/* SPI chip select */ /* SPI chip select */
SPI_ChipSelect(pSpiHw, 1 << msg->cs); SPI_ChipSelect(pSpiHw, 1 << msg->cs);
/* Enables the SPI to transfer and receive data. */ /* Enables the SPI to transfer and receive data. */
SPI_Enable (pSpiHw); SPI_Enable (pSpiHw);
}
bus->spi_switched_on = true;
/* Start DMA 0(RX) && 1(TX) */ /* Start DMA 0(RX) && 1(TX) */
if (XDMAD_StartTransfer(spid->pXdmad, bus->dma_rx_channel)) { if (XDMAD_StartTransfer(spid->pXdmad, bus->dma_rx_channel)) {
@@ -453,6 +456,8 @@ static int atsam_spi_setup_transfer(atsam_spi_bus *bus)
bus->tx_transfer_done = false; bus->tx_transfer_done = false;
if (msgs[i].cs_change > 0) { if (msgs[i].cs_change > 0) {
SPI_ReleaseCS(bus->SpiDma.pSpiHw); SPI_ReleaseCS(bus->SpiDma.pSpiHw);
atsam_finish_command(&bus->SpiDma);
bus->spi_switched_on = false;
} }
} }
return rv; return rv;