From bfc2d0e4bb2a4a3c9c8ae3b8c49d7a99080ec4ec Mon Sep 17 00:00:00 2001 From: Giovanni Di Sirio Date: Sat, 23 Jan 2016 08:04:39 +0000 Subject: Fixed bug #696. git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@8795 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- os/various/lwip_bindings/arch/sys_arch.c | 2 +- readme.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/os/various/lwip_bindings/arch/sys_arch.c b/os/various/lwip_bindings/arch/sys_arch.c index e11d65c0e..6107de252 100644 --- a/os/various/lwip_bindings/arch/sys_arch.c +++ b/os/various/lwip_bindings/arch/sys_arch.c @@ -104,7 +104,7 @@ u32_t sys_arch_sem_wait(sys_sem_t *sem, u32_t timeout) { osalSysLock(); tmo = timeout > 0 ? MS2ST((systime_t)timeout) : TIME_INFINITE; - time = (u32_t)osalOsGetSystemTimeX(); + time = (u32_t)ST2MS(osalOsGetSystemTimeX()); if (chSemWaitTimeoutS(*sem, tmo) != MSG_OK) time = SYS_ARCH_TIMEOUT; else diff --git a/readme.txt b/readme.txt index 1332e2e00..7935dede6 100644 --- a/readme.txt +++ b/readme.txt @@ -77,7 +77,7 @@ msg_t-sized field from the structure. Messages now use a new field into the p_u union. Now synchronous messages are even faster. - VAR: Fixed missing time convesion in lwIP arch module (bug #696) - (backported to 3.0.5 and 16.1.2). + (backported to 2.6.10, 3.0.5 and 16.1.2). - HAL: Fixed incorrect handling of TIME_IMMEDIATE in the HAL buffer queues (bug #695)(backported to 16.1.2). - NIL: Fixed NIL_CFG_USE_EVENTS not properly checked in NIL (bug #694) -- cgit v1.2.3