]> rtime.felk.cvut.cz Git - arc.git/commitdiff
Spi had DMA types when it shouldn't have
authormahi <devnull@localhost>
Sun, 1 Apr 2012 18:20:32 +0000 (20:20 +0200)
committermahi <devnull@localhost>
Sun, 1 Apr 2012 18:20:32 +0000 (20:20 +0200)
arch/ppc/mpc55xx/drivers/Spi.c
include/Spi.h

index e9666d81113bd5ed3b5bc0cdd2be11053f632d52..5beb230b5fb16b7b9d3faeb06210718d41c8525e 100644 (file)
@@ -1332,9 +1332,9 @@ void Spi_Init(const Spi_ConfigType *ConfigPtr) {
                uPtr->hwUnit = ctrlNr;\r
                Spi_InitController(uPtr);\r
                Spi_SetHWUnitStatus(uPtr, SPI_IDLE);\r
+#if (SPI_IMPLEMENTATION == SPI_DMA )\r
                unitNr = Spi_CtrlToUnit[ctrlNr];\r
 \r
-#if (SPI_IMPLEMENTATION == SPI_DMA )\r
                // DMA init...\r
                //\r
                unitNr = Spi_CtrlToUnit[ctrlNr];\r
index f85e907880d4c72d70a7757c479691b4c075ddd0..75f2398f91197ecc02fd1e976323da301c262759 100644 (file)
@@ -362,7 +362,7 @@ typedef struct Spi_HwConfig
   uint8 Activated;\r
 \r
   /* Receive DMA channel. */\r
-#ifdef USE_DMA\r
+#if (SPI_IMPLEMENTATION==SPI_DMA)\r
   Dma_ChannelType RxDmaChannel;\r
 \r
   /* Transmit DMA channel. */\r