Mercurial > nand-ecoscentric

changeset 2369:ad59d69732ff

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* src/spi_at91.c (spi_at91_transaction_begin): Don't use #ifdef inside a macro invocation. The compiler throws a wobbly.
author asl
date Mon, 05 Mar 2007 17:08:11 +0000
parents 0eea64dce153
children 71c351c1db84
files packages/devs/spi/arm/at91/current/ChangeLog packages/devs/spi/arm/at91/current/src/spi_at91.c
diffstat 2 files changed, 15 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/packages/devs/spi/arm/at91/current/ChangeLog
+++ b/packages/devs/spi/arm/at91/current/ChangeLog
@@ -1,3 +1,8 @@
+2006-09-27  Andrew Lunn  <andrew.lunn@ascom.ch>
+
+	* src/spi_at91.c (spi_at91_transaction_begin): Don't use #ifdef
+	inside a macro invocation. The compiler throws a wobbly.
+
 2006-09-07  John Eigelaar <jeigelaar@mweb.co.za>
 
 	* src/spi_at91.c: Fixed the chip select functions.
--- a/packages/devs/spi/arm/at91/current/src/spi_at91.c
+++ b/packages/devs/spi/arm/at91/current/src/spi_at91.c
@@ -342,7 +342,7 @@ spi_at91_set_npcs(cyg_spi_at91_bus_t *sp
    {
       if(spi_bus->cs_en[ctr])
       {
-         HAL_ARM_AT91_GPIO_PUT(spi_bus->cs_gpio[ctr], (val & (1<<ctr)));
+        HAL_ARM_AT91_GPIO_PUT(spi_bus->cs_gpio[ctr], (val & (1<<ctr)));
       }
    }
 }
@@ -545,19 +545,19 @@ spi_at91_transaction_begin(cyg_spi_devic
        cause havoc with the driver */ 
 
     // Put SPI bus into master mode
-    if (1 == at91_spi_dev->cl_div32)
-        HAL_WRITE_UINT32(spi_bus->base+AT91_SPI_MR, AT91_SPI_MR_MSTR | 
-                                               AT91_SPI_MR_DIV32
+    if (1 == at91_spi_dev->cl_div32) {
+      val = AT91_SPI_MR_MSTR | AT91_SPI_MR_DIV32;
 #ifdef AT91_SPI_MR_MODFDIS
-                                               | AT91_SPI_MR_MODFDIS
+      val |= AT91_SPI_MR_MODFDIS;
 #endif
-                                               );
-    else
-        HAL_WRITE_UINT32(spi_bus->base+AT91_SPI_MR, AT91_SPI_MR_MSTR 
+      HAL_WRITE_UINT32(spi_bus->base+AT91_SPI_MR, val);
+    } else {
+      val = AT91_SPI_MR_MSTR;
 #ifdef AT91_SPI_MR_MODFDIS
-                                                    | AT91_SPI_MR_MODFDIS
+      val |= AT91_SPI_MR_MODFDIS;
 #endif
-                                                    );
+      HAL_WRITE_UINT32(spi_bus->base+AT91_SPI_MR, val);
+    }
 }
 
 static void