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

5 files changed, 23 insertions, 9 deletions

diff --git a/demos/STM32/RT-STM32F107-OLIMEX_P107-LWIP/Makefile b/demos/STM32/RT-STM32F107-OLIMEX_P107-LWIP/Makefile
index bd6b03045..a70cbbe91 100644
--- a/demos/STM32/RT-STM32F107-OLIMEX_P107-LWIP/Makefile
+++ b/demos/STM32/RT-STM32F107-OLIMEX_P107-LWIP/Makefile
@@ -115,6 +115,7 @@ CSRC = $(STARTUPSRC) \
        $(BOARDSRC) \

        $(TESTSRC) \

        $(LWSRC) \

+       $(CHIBIOS)/os/various/evtimer.c \

        web/web.c main.c

 

 # C++ sources that can be compiled in ARM or THUMB mode depending on the global

diff --git a/demos/STM32/RT-STM32F107-OLIMEX_P107-LWIP/chconf.h b/demos/STM32/RT-STM32F107-OLIMEX_P107-LWIP/chconf.h
index ad6b53ade..0f3ef50d3 100644
--- a/demos/STM32/RT-STM32F107-OLIMEX_P107-LWIP/chconf.h
+++ b/demos/STM32/RT-STM32F107-OLIMEX_P107-LWIP/chconf.h
@@ -48,7 +48,7 @@
  * @details Frequency of the system timer that drives the system ticks. This

  *          setting also defines the system tick time unit.

  */

-#define CH_CFG_ST_FREQUENCY                 10000

+#define CH_CFG_ST_FREQUENCY                 1000

 

 /**

  * @brief   Time delta constant for the tick-less mode.

@@ -58,7 +58,7 @@
  *          The value one is not valid, timeouts are rounded up to

  *          this value.

  */

-#define CH_CFG_ST_TIMEDELTA                 2

+#define CH_CFG_ST_TIMEDELTA                 0

 

 /** @} */

 

diff --git a/demos/STM32/RT-STM32F107-OLIMEX_P107-LWIP/main.c b/demos/STM32/RT-STM32F107-OLIMEX_P107-LWIP/main.c
index f1896e953..e0524c8d9 100644
--- a/demos/STM32/RT-STM32F107-OLIMEX_P107-LWIP/main.c
+++ b/demos/STM32/RT-STM32F107-OLIMEX_P107-LWIP/main.c
@@ -25,8 +25,8 @@
 /*

  * Green LED blinker thread, times are in milliseconds.

  */

-static WORKING_AREA(waThread1, 128);

-static msg_t Thread1(void *arg) {

+static THD_WORKING_AREA(waThread1, 128);

+static THD_FUNCTION(Thread1, arg) {

 

   (void)arg;

   chRegSetThreadName("blinker");

@@ -76,7 +76,7 @@ int main(void) {
    */

   while (true) {

     if (palReadPad(GPIOC, GPIOC_SWITCH_TAMPER) == 0)

-      TestThread(&SD3);

+      test_execute((BaseSequentialStream *)&SD3);

     chThdSleepMilliseconds(500);

   }

 }

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.                                         */

 /*===========================================================================*/