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

bsp/atsam: Remove duplicate SPI register field

Browse Source
This commit is contained in:
Sebastian Huber
2016-12-14 07:43:25 +01:00
parent 62e1e0ff03
commit 9035630f00
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -38,7 +38,6 @@
typedef struct { typedef struct {
spi_bus base; spi_bus base;
Spi *regs;
rtems_vector_number irq; rtems_vector_number irq;
uint32_t msg_todo; uint32_t msg_todo;
const spi_ioc_transfer *msgs; const spi_ioc_transfer *msgs;
@@ -168,7 +167,7 @@ static void atsam_configure_spi(atsam_spi_bus *bus)
SPID_Configure( SPID_Configure(
&bus->SpiDma, &bus->SpiDma,
bus->regs, bus->SpiDma.pSpiHw,
bus->SpiDma.spiId, bus->SpiDma.spiId,
(SPI_MR_DLYBCS(delay_cs) | (SPI_MR_DLYBCS(delay_cs) |
SPI_MR_MSTR | SPI_MR_MSTR |
@@ -185,7 +184,7 @@ static void atsam_configure_spi(atsam_spi_bus *bus)
atsam_set_phase_and_polarity(bus->base.mode, &csr); atsam_set_phase_and_polarity(bus->base.mode, &csr);
SPI_ConfigureNPCS(bus->regs, bus->base.cs, csr); SPI_ConfigureNPCS(bus->SpiDma.pSpiHw, bus->base.cs, csr);
} }
static uint8_t atsam_configure_dma_channels( static uint8_t atsam_configure_dma_channels(
@@ -531,9 +530,9 @@ int spi_bus_register_atsam(
bus->base.speed_hz = bus->base.max_speed_hz; bus->base.speed_hz = bus->base.max_speed_hz;
bus->base.delay_usecs = 1; bus->base.delay_usecs = 1;
bus->base.cs = 1; bus->base.cs = 1;
bus->regs = spi_regs;
bus->irq = ID_XDMAC; bus->irq = ID_XDMAC;
bus->SpiDma.spiId = spi_peripheral_id; bus->SpiDma.spiId = spi_peripheral_id;
bus->SpiDma.pSpiHw = spi_regs;
PIO_Configure(pins, pin_count); PIO_Configure(pins, pin_count);
PMC_EnablePeripheral(spi_peripheral_id); PMC_EnablePeripheral(spi_peripheral_id);