diff options
| author | Giovanni Di Sirio <gdisirio@gmail.com> | 2016-12-19 10:05:14 +0000 |
|---|---|---|
| committer | Giovanni Di Sirio <gdisirio@gmail.com> | 2016-12-19 10:05:14 +0000 |
| commit | 459e31fac9f2c77284f59aa4cd107d95060d9ba8 (patch) | |
| tree | a9024ba12e1e9f44ec769a75ad820cf17a177dcd /os/hal | |
| parent | 20c2e7e4c4b48c1686f85482594d7a4ffedd570c (diff) | |
| download | ChibiOS-459e31fac9f2c77284f59aa4cd107d95060d9ba8.tar.gz ChibiOS-459e31fac9f2c77284f59aa4cd107d95060d9ba8.tar.bz2 ChibiOS-459e31fac9f2c77284f59aa4cd107d95060d9ba8.zip | |
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@9970 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/hal')
| -rw-r--r-- | os/hal/ports/STM32/LLD/MACv1/hal_mac_lld.c | 17 | ||||
| -rw-r--r-- | os/hal/ports/STM32/LLD/MACv1/hal_mac_lld.h | 4 |
2 files changed, 17 insertions, 4 deletions
diff --git a/os/hal/ports/STM32/LLD/MACv1/hal_mac_lld.c b/os/hal/ports/STM32/LLD/MACv1/hal_mac_lld.c index 773f805c8..637871255 100644 --- a/os/hal/ports/STM32/LLD/MACv1/hal_mac_lld.c +++ b/os/hal/ports/STM32/LLD/MACv1/hal_mac_lld.c @@ -36,6 +36,23 @@ #define BUFFER_SIZE ((((STM32_MAC_BUFFERS_SIZE - 1) | 3) + 1) / 4)
+/* Fixing inconsistencies in ST headers.*/
+#if !defined(ETH_MACMIIAR_CR_Div102) && defined(ETH_MACMIIAR_CR_DIV102)
+#define ETH_MACMIIAR_CR_Div102 ETH_MACMIIAR_CR_DIV102
+#endif
+#if !defined(ETH_MACMIIAR_CR_Div62) && defined(ETH_MACMIIAR_CR_DIV62)
+#define ETH_MACMIIAR_CR_Div62 ETH_MACMIIAR_CR_DIV62
+#endif
+#if !defined(ETH_MACMIIAR_CR_Div42) && defined(ETH_MACMIIAR_CR_DIV42)
+#define ETH_MACMIIAR_CR_Div42 ETH_MACMIIAR_CR_DIV42
+#endif
+#if !defined(ETH_MACMIIAR_CR_Div26) && defined(ETH_MACMIIAR_CR_DIV26)
+#define ETH_MACMIIAR_CR_Div26 ETH_MACMIIAR_CR_DIV26
+#endif
+#if !defined(ETH_MACMIIAR_CR_Div16) && defined(ETH_MACMIIAR_CR_DIV16)
+#define ETH_MACMIIAR_CR_Div16 ETH_MACMIIAR_CR_DIV16
+#endif
+
/* MII divider optimal value.*/
#if (STM32_HCLK >= 150000000)
#define MACMIIDR_CR ETH_MACMIIAR_CR_Div102
diff --git a/os/hal/ports/STM32/LLD/MACv1/hal_mac_lld.h b/os/hal/ports/STM32/LLD/MACv1/hal_mac_lld.h index 5c92b0c1b..b4acbb4b6 100644 --- a/os/hal/ports/STM32/LLD/MACv1/hal_mac_lld.h +++ b/os/hal/ports/STM32/LLD/MACv1/hal_mac_lld.h @@ -190,10 +190,6 @@ /* Derived constants and error checks. */
/*===========================================================================*/
-#if (STM32_MAC_PHY_TIMEOUT > 0) && !HAL_IMPLEMENTS_COUNTERS
-#error "STM32_MAC_PHY_TIMEOUT requires the realtime counter service"
-#endif
-
/*===========================================================================*/
/* Driver data structures and types. */
/*===========================================================================*/
|