summaryrefslogtreecommitdiffstats
path: root/c/src/lib/libbsp/powerpc/gen83xx/spi/spi_init.c
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@oarcorp.com>2014-10-17 09:50:05 -0500
committerJoel Sherrill <joel.sherrill@oarcorp.com>2014-10-19 17:00:58 -0500
commitb5548e592b1c0f12d05562d3dcd432836ae47779 (patch)
tree50ae82cc3dd7e3d3121c1944e729f24cba3aad38 /c/src/lib/libbsp/powerpc/gen83xx/spi/spi_init.c
parentsparc/leon3/include/bsp.h: Fix warnings (diff)
downloadrtems-b5548e592b1c0f12d05562d3dcd432836ae47779.tar.bz2
powerpc/gen83xx: Fix warnings
Diffstat (limited to '')
-rw-r--r--c/src/lib/libbsp/powerpc/gen83xx/spi/spi_init.c30
1 files changed, 16 insertions, 14 deletions
diff --git a/c/src/lib/libbsp/powerpc/gen83xx/spi/spi_init.c b/c/src/lib/libbsp/powerpc/gen83xx/spi/spi_init.c
index 512db03f35..a2a2683d59 100644
--- a/c/src/lib/libbsp/powerpc/gen83xx/spi/spi_init.c
+++ b/c/src/lib/libbsp/powerpc/gen83xx/spi/spi_init.c
@@ -23,22 +23,18 @@
#include <bsp/irq.h>
#include <bsp.h>
-#if defined( MPC83XX_BOARD_MPC8313ERDB)
+#if defined(MPC83XX_BOARD_MPC8313ERDB)
#include <libchip/spi-sd-card.h>
-#elif defined( MPC83XX_BOARD_MPC8349EAMDS)
+#elif defined(MPC83XX_BOARD_MPC8349EAMDS)
#include <libchip/spi-flash-m25p40.h>
-#elif defined( MPC83XX_BOARD_HSC_CM01)
+#elif defined(MPC83XX_BOARD_HSC_CM01)
#include <libchip/spi-fram-fm25l256.h>
-#else
-
-#warning No SPI configuration available
-
#endif
/*=========================================================================*\
@@ -296,11 +292,11 @@ rtems_status_code bsp_register_spi
| 0 or error code |
\*=========================================================================*/
{
-#if defined(MPC83XX_BOARD_MPC8313ERDB)
- rtems_status_code sc = RTEMS_SUCCESSFUL;
-#endif
- int ret_code;
+ #if defined(MPC83XX_BOARD_MPC8313ERDB)
+ rtems_status_code sc = RTEMS_SUCCESSFUL;
+ #endif
unsigned spi_busno;
+ int ret_code;
/*
* init I2C library (if not already done)
@@ -311,7 +307,7 @@ rtems_status_code bsp_register_spi
* init port pins used to address/select SPI devices
*/
-#if defined( MPC83XX_BOARD_MPC8313ERDB)
+#if defined(MPC83XX_BOARD_MPC8313ERDB)
/*
* Configured as master (direct connection to SD card)
@@ -335,7 +331,7 @@ rtems_status_code bsp_register_spi
/* Open Drain */
/* mpc83xx.gpio [0].gpdr |= 0x0000000f; */
-#elif defined( MPC83XX_BOARD_MPC8349EAMDS)
+#elif defined(MPC83XX_BOARD_MPC8349EAMDS)
/*
* GPIO1[0] is nSEL_SPI for M25P40
@@ -345,7 +341,7 @@ rtems_status_code bsp_register_spi
mpc83xx.gpio[0].gpdir |= (1 << (31- 0));
mpc83xx.gpio[0].gpdr &= ~(1 << (31- 0));
-#elif defined( MPC83XX_BOARD_HSC_CM01)
+#elif defined(MPC83XX_BOARD_HSC_CM01)
/*
* GPIO1[24] is SPI_A0
@@ -358,6 +354,12 @@ rtems_status_code bsp_register_spi
mpc83xx.gpio[0].gpdir |= (0xf << (31-27));
mpc83xx.gpio[0].gpdr &= ~(0xf << (31-27));
+#else
+
+ /*
+ * There is no SPI configuration information for this variant.
+ */
+ (void) spi_busno; /* avoid set but not used warning */
#endif
/*