diff options
-rw-r--r-- | os/various/lwip_bindings/arch/sys_arch.c | 2 | ||||
-rw-r--r-- | 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)
|