aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2012-05-16 06:46:11 +0000
committergdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2012-05-16 06:46:11 +0000
commit63f071bb5945b01f653ccceda09e48376dbc2263 (patch)
tree8599a86542546abbf4fd30a9e8b65922e23a12ee
parente0b177423e1b14ab942fbf40b79d60d13ae02eb5 (diff)
downloadChibiOS-63f071bb5945b01f653ccceda09e48376dbc2263.tar.gz
ChibiOS-63f071bb5945b01f653ccceda09e48376dbc2263.tar.bz2
ChibiOS-63f071bb5945b01f653ccceda09e48376dbc2263.zip
Fixed bug 3527179.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@4200 35acf78f-673a-0410-8e92-d51de3d6d3f4
-rw-r--r--os/hal/platforms/STM32/mac_lld.h6
-rw-r--r--readme.txt2
2 files changed, 5 insertions, 3 deletions
diff --git a/os/hal/platforms/STM32/mac_lld.h b/os/hal/platforms/STM32/mac_lld.h
index 1cb28f79c..32ef3ba79 100644
--- a/os/hal/platforms/STM32/mac_lld.h
+++ b/os/hal/platforms/STM32/mac_lld.h
@@ -123,21 +123,21 @@
/**
* @brief Number of available transmit buffers.
*/
-#if !defined(MAC_TRANSMIT_BUFFERS) || defined(__DOXYGEN__)
+#if !defined(STM32_MAC_TRANSMIT_BUFFERS) || defined(__DOXYGEN__)
#define STM32_MAC_TRANSMIT_BUFFERS 2
#endif
/**
* @brief Number of available receive buffers.
*/
-#if !defined(MAC_RECEIVE_BUFFERS) || defined(__DOXYGEN__)
+#if !defined(STM32_MAC_RECEIVE_BUFFERS) || defined(__DOXYGEN__)
#define STM32_MAC_RECEIVE_BUFFERS 4
#endif
/**
* @brief Maximum supported frame size.
*/
-#if !defined(MAC_BUFFERS_SIZE) || defined(__DOXYGEN__)
+#if !defined(STM32_MAC_BUFFERS_SIZE) || defined(__DOXYGEN__)
#define STM32_MAC_BUFFERS_SIZE 1522
#endif
diff --git a/readme.txt b/readme.txt
index 9a5f075c2..9f958c8b7 100644
--- a/readme.txt
+++ b/readme.txt
@@ -79,6 +79,8 @@
*****************************************************************************
*** 2.5.0 ***
+- FIX: Fixed wrong macro check in STM32 MAC driver (bug 3527179 )(backported
+ to 2.4.2).
- FIX: Fixed error in STM32L-Discovery board.h file (bug 3526918)(backported
to 2.4.2).
- FIX: Fixed inconsistent LPCxxx Internal RC oscillator names (bug 3524138)