[PR 16] SMC91111: ERC32 was never supported by driver

[Joel Sherrill]

This looks OK to me.

Could someone please apply this?

Thanks.
________________________________________
From: rtems-devel-bounces at rtems.org [rtems-devel-bounces at rtems.org] On Behalf Of Daniel Hellstrom [daniel at gaisler.com]
Sent: Monday, February 06, 2012 8:15 AM
To: rtems-devel at rtems.org
Subject: [PR 16] SMC91111: ERC32 was never supported by driver

Moved the intelligence whether the driver is supported or not
completely to the BSP, now that bsp.h is included (even though it
is a driver... hmm). The ERC32 was never supported, so HAS_SMC91111
is not added to erc32/include/bsp.h.

Signed-off-by: Daniel Hellstrom <daniel at gaisler.com>
---
 c/src/lib/libbsp/sparc/leon2/include/bsp.h |    2 ++
 c/src/lib/libbsp/sparc/leon3/include/bsp.h |    2 ++
 c/src/libchip/network/smc91111.c           |    4 ++--
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/c/src/lib/libbsp/sparc/leon2/include/bsp.h b/c/src/lib/libbsp/sparc/leon2/include/bsp.h
index b0695cb..b855347 100644
--- a/c/src/lib/libbsp/sparc/leon2/include/bsp.h
+++ b/c/src/lib/libbsp/sparc/leon2/include/bsp.h
@@ -58,6 +58,8 @@ extern int rtems_smc91111_driver_attach_leon2(
 #define RTEMS_BSP_NETWORK_DRIVER_ATTACH_SMC91111 \
           rtems_smc91111_driver_attach_leon2

+#define HAS_SMC91111
+
 /*
  *  The synchronous trap is an arbitrarily chosen software trap.
  */
diff --git a/c/src/lib/libbsp/sparc/leon3/include/bsp.h b/c/src/lib/libbsp/sparc/leon3/include/bsp.h
index 70ab8b3..2286ad6 100644
--- a/c/src/lib/libbsp/sparc/leon3/include/bsp.h
+++ b/c/src/lib/libbsp/sparc/leon3/include/bsp.h
@@ -71,6 +71,8 @@ extern int rtems_leon_greth_driver_attach(
 #define RTEMS_BSP_NETWORK_DRIVER_ATTACH RTEMS_BSP_NETWORK_DRIVER_ATTACH_GRETH
 #endif

+#define HAS_SMC91111
+
 extern int   CPU_SPARC_HAS_SNOOPING;


diff --git a/c/src/libchip/network/smc91111.c b/c/src/libchip/network/smc91111.c
index 9313aa6..41961ae 100644
--- a/c/src/libchip/network/smc91111.c
+++ b/c/src/libchip/network/smc91111.c
@@ -15,11 +15,11 @@
  *
  */

-#if defined(__sparc__) || defined(HAS_SMC91111)
+#if defined(HAS_SMC91111)
   #define SMC91111_SUPPORTED
 #endif

-#if defined(SMC91111_SUPPORTED)
+#if defined(HAS_SMC91111)

 #include <stdlib.h>
 #include <stdio.h>
--
1.7.0.4

_______________________________________________
rtems-devel mailing list
rtems-devel at rtems.org
http://www.rtems.org/mailman/listinfo/rtems-devel