git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@1364 35acf78f-673a-0410-8e92-d51de3d6d3f4

2009-11-29 18:51:15 +00:00 · 2009-11-29 18:51:15 +00:00 · 3d87970a4d
parent 79c27fd17e
commit 3d87970a4d
9 changed files with 8 additions and 44 deletions
--- a/demos/ARM7-AT91SAM7X-GCC/halconf.h
+++ b/demos/ARM7-AT91SAM7X-GCC/halconf.h
@ -55,13 +55,6 @@
 #define CH_HAL_USE_MAC                  FALSE
 #endif

-/**
- * @brief Enables the MII subsystem.
- */
-#if !defined(CH_HAL_USE_MII) || defined(__DOXYGEN__)
-#define CH_HAL_USE_MII                  FALSE
-#endif
-
 /**
 * @brief Enables the SERIAL subsystem.
 */
--- a/demos/ARM7-AT91SAM7X-LWIP-GCC/halconf.h
+++ b/demos/ARM7-AT91SAM7X-LWIP-GCC/halconf.h
@ -55,13 +55,6 @@
 #define CH_HAL_USE_MAC                  TRUE
 #endif

-/**
- * @brief Enables the MII subsystem.
- */
-#if !defined(CH_HAL_USE_MII) || defined(__DOXYGEN__)
-#define CH_HAL_USE_MII                  TRUE
-#endif
-
 /**
 * @brief Enables the SERIAL subsystem.
 */
--- a/demos/ARM7-AT91SAM7X-UIP-GCC/halconf.h
+++ b/demos/ARM7-AT91SAM7X-UIP-GCC/halconf.h
@ -55,13 +55,6 @@
 #define CH_HAL_USE_MAC                  TRUE
 #endif

-/**
- * @brief Enables the MII subsystem.
- */
-#if !defined(CH_HAL_USE_MII) || defined(__DOXYGEN__)
-#define CH_HAL_USE_MII                  TRUE
-#endif
-
 /**
 * @brief Enables the SERIAL subsystem.
 */
--- a/demos/ARMCM3-STM32F103-FATFS-GCC/halconf.h
+++ b/demos/ARMCM3-STM32F103-FATFS-GCC/halconf.h
@ -55,13 +55,6 @@
 #define CH_HAL_USE_MAC                  FALSE
 #endif

-/**
- * @brief Enables the MII subsystem.
- */
-#if !defined(CH_HAL_USE_MII) || defined(__DOXYGEN__)
-#define CH_HAL_USE_MII                  FALSE
-#endif
-
 /**
 * @brief Enables the SERIAL subsystem.
 */
--- a/demos/ARMCM3-STM32F103-GCC/halconf.h
+++ b/demos/ARMCM3-STM32F103-GCC/halconf.h
@ -55,13 +55,6 @@
 #define CH_HAL_USE_MAC                  FALSE
 #endif

-/**
- * @brief Enables the MII subsystem.
- */
-#if !defined(CH_HAL_USE_MII) || defined(__DOXYGEN__)
-#define CH_HAL_USE_MII                  FALSE
-#endif
-
 /**
 * @brief Enables the SERIAL subsystem.
 */
--- a/os/hal/platforms/AT91SAM7/at91sam7_mii.c
+++ b/os/hal/platforms/AT91SAM7/at91sam7_mii.c
@ -26,9 +26,10 @@

 #include "ch.h"
 #include "hal.h"
-
 #include "at91sam7_mii.h"

+#if CH_HAL_USE_MAC || defined(__DOXYGEN__)
+
 /**
 * @brief Low level MII driver initialization.
 */
@ -112,4 +113,6 @@ void miiPut(MACDriver *macp, phyaddr_t addr, phyreg_t value) {
    ;
 }

+#endif /* CH_HAL_USE_MAC */
+
 /** @} */
--- a/os/hal/platforms/AT91SAM7/at91sam7_mii.h
+++ b/os/hal/platforms/AT91SAM7/at91sam7_mii.h
@ -27,6 +27,8 @@
 #ifndef _AT91SAM7_MII_H_
 #define _AT91SAM7_MII_H_

+#if CH_HAL_USE_MAC || defined(__DOXYGEN__)
+
 /*===========================================================================*/
 /* Driver pre-compile time settings.                                         */
 /*===========================================================================*/
@ -96,6 +98,8 @@ extern "C" {
 }
 #endif

+#endif /* CH_HAL_USE_MAC */
+
 #endif /* _AT91SAM7_MII_H_ */

 /** @} */
--- a/os/hal/platforms/AT91SAM7/mac_lld.c
+++ b/os/hal/platforms/AT91SAM7/mac_lld.c
@ -29,7 +29,6 @@
 #include "ch.h"
 #include "hal.h"
 #include "mii.h"
-
 #include "at91sam7_mii.h"

 #if CH_HAL_USE_MAC || defined(__DOXYGEN__)
--- a/os/hal/templates/halconf.h
+++ b/os/hal/templates/halconf.h
@ -55,13 +55,6 @@
 #define CH_HAL_USE_MAC                  TRUE
 #endif

-/**
- * @brief Enables the MII subsystem.
- */
-#if !defined(CH_HAL_USE_MII) || defined(__DOXYGEN__)
-#define CH_HAL_USE_MII                  TRUE
-#endif
-
 /**
 * @brief Enables the SERIAL subsystem.
 */