From: mahi Date: Sun, 1 Apr 2012 18:20:32 +0000 (+0200) Subject: Spi had DMA types when it shouldn't have X-Git-Url: http://rtime.felk.cvut.cz/gitweb/arc.git/commitdiff_plain/be7b98ae8736fa5936c927e1535891f7ae9736ab Spi had DMA types when it shouldn't have --- diff --git a/arch/ppc/mpc55xx/drivers/Spi.c b/arch/ppc/mpc55xx/drivers/Spi.c index e9666d81..5beb230b 100644 --- a/arch/ppc/mpc55xx/drivers/Spi.c +++ b/arch/ppc/mpc55xx/drivers/Spi.c @@ -1332,9 +1332,9 @@ void Spi_Init(const Spi_ConfigType *ConfigPtr) { uPtr->hwUnit = ctrlNr; Spi_InitController(uPtr); Spi_SetHWUnitStatus(uPtr, SPI_IDLE); +#if (SPI_IMPLEMENTATION == SPI_DMA ) unitNr = Spi_CtrlToUnit[ctrlNr]; -#if (SPI_IMPLEMENTATION == SPI_DMA ) // DMA init... // unitNr = Spi_CtrlToUnit[ctrlNr]; diff --git a/include/Spi.h b/include/Spi.h index f85e9078..75f2398f 100644 --- a/include/Spi.h +++ b/include/Spi.h @@ -362,7 +362,7 @@ typedef struct Spi_HwConfig uint8 Activated; /* Receive DMA channel. */ -#ifdef USE_DMA +#if (SPI_IMPLEMENTATION==SPI_DMA) Dma_ChannelType RxDmaChannel; /* Transmit DMA channel. */