diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2016-12-14 07:43:25 +0100 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2016-12-14 13:09:28 +0100 |
| commit | 9035630f00e8d90305efa08a14a25211b0682a87 (patch) | |
| tree | 7a6f896ed372cfe75dfc20787defe7f39f26ff60 | |
| parent | bsp/atsam: Simplify SPI initialization (diff) | |
| download | rtems-9035630f00e8d90305efa08a14a25211b0682a87.tar.bz2 | |
bsp/atsam: Remove duplicate SPI register field
| -rw-r--r-- | c/src/lib/libbsp/arm/atsam/spi/atsam_spi_bus.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/c/src/lib/libbsp/arm/atsam/spi/atsam_spi_bus.c b/c/src/lib/libbsp/arm/atsam/spi/atsam_spi_bus.c index 99df45e0f5..4c140cc1a6 100644 --- a/c/src/lib/libbsp/arm/atsam/spi/atsam_spi_bus.c +++ b/c/src/lib/libbsp/arm/atsam/spi/atsam_spi_bus.c @@ -38,7 +38,6 @@ typedef struct { spi_bus base; - Spi *regs; rtems_vector_number irq; uint32_t msg_todo; const spi_ioc_transfer *msgs; @@ -168,7 +167,7 @@ static void atsam_configure_spi(atsam_spi_bus *bus) SPID_Configure( &bus->SpiDma, - bus->regs, + bus->SpiDma.pSpiHw, bus->SpiDma.spiId, (SPI_MR_DLYBCS(delay_cs) | 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); - SPI_ConfigureNPCS(bus->regs, bus->base.cs, csr); + SPI_ConfigureNPCS(bus->SpiDma.pSpiHw, bus->base.cs, csr); } 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.delay_usecs = 1; bus->base.cs = 1; - bus->regs = spi_regs; bus->irq = ID_XDMAC; bus->SpiDma.spiId = spi_peripheral_id; + bus->SpiDma.pSpiHw = spi_regs; PIO_Configure(pins, pin_count); PMC_EnablePeripheral(spi_peripheral_id); |