aboutsummaryrefslogtreecommitdiffstats
path: root/os/various
diff options
context:
space:
mode:
authorgdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2012-12-22 10:19:34 +0000
committergdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2012-12-22 10:19:34 +0000
commitdf51e160c1c3fbbb81ab4a96bec52076df758bee (patch)
treee66dc064a804d3d934eb9677830c8c6a9dbb989c /os/various
parent2aadbf711f1049a6ce013d5a6278e91c313030fa (diff)
downloadChibiOS-df51e160c1c3fbbb81ab4a96bec52076df758bee.tar.gz
ChibiOS-df51e160c1c3fbbb81ab4a96bec52076df758bee.tar.bz2
ChibiOS-df51e160c1c3fbbb81ab4a96bec52076df758bee.zip
Updated lwIP to 1.4.1.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@4949 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/various')
-rw-r--r--os/various/lwip_bindings/arch/sys_arch.c13
1 files changed, 13 insertions, 0 deletions
diff --git a/os/various/lwip_bindings/arch/sys_arch.c b/os/various/lwip_bindings/arch/sys_arch.c
index 0154e5fcc..c788a673b 100644
--- a/os/various/lwip_bindings/arch/sys_arch.c
+++ b/os/various/lwip_bindings/arch/sys_arch.c
@@ -216,3 +216,16 @@ void sys_arch_unprotect(sys_prot_t pval) {
(void)pval;
chSysUnlock();
}
+
+u32_t sys_now(void) {
+
+#if CH_FREQUENCY == 1000
+ return (u32_t)chTimeNow();
+#elif (CH_FREQUENCY / 1000) >= 1 && (CH_FREQUENCY % 1000) == 0
+ return ((u32_t)chTimeNow() - 1) / (CH_FREQUENCY / 1000) + 1;
+#elif (1000 / CH_FREQUENCY) >= 1 && (1000 % CH_FREQUENCY) == 0
+ return ((u32_t)chTimeNow() - 1) * (1000 / CH_FREQUENCY) + 1;
+#else
+ return (u32_t)(((u64_t)(chTimeNow() - 1) * 1000) / CH_FREQUENCY) + 1;
+#endif
+}