You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by ma...@apache.org on 2016/10/10 19:06:29 UTC

[5/5] incubator-mynewt-core git commit: stm32f4xx hal; add HAL_GetTick() to support timeouts when using SDK calls.

stm32f4xx hal; add HAL_GetTick() to support timeouts when using SDK calls.


Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/commit/ec1af7e7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/ec1af7e7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/ec1af7e7

Branch: refs/heads/develop
Commit: ec1af7e766e23a1574feb248ce40ec721a5cda4c
Parents: df6e098
Author: Marko Kiiskila <ma...@runtime.io>
Authored: Mon Oct 10 12:03:25 2016 -0700
Committer: Marko Kiiskila <ma...@runtime.io>
Committed: Mon Oct 10 12:04:31 2016 -0700

----------------------------------------------------------------------
 hw/mcu/stm/stm32f4xx/src/hal_system.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/ec1af7e7/hw/mcu/stm/stm32f4xx/src/hal_system.c
----------------------------------------------------------------------
diff --git a/hw/mcu/stm/stm32f4xx/src/hal_system.c b/hw/mcu/stm/stm32f4xx/src/hal_system.c
index 8f6a876..68b1a76 100644
--- a/hw/mcu/stm/stm32f4xx/src/hal_system.c
+++ b/hw/mcu/stm/stm32f4xx/src/hal_system.c
@@ -18,6 +18,7 @@
  */
 
 #include <mcu/cortex_m4.h>
+#include <os/os.h>
 #include "hal/hal_system.h"
 #include "stm32f4xx_hal_def.h"
 
@@ -44,7 +45,7 @@ system_debugger_connected(void)
 uint32_t
 HAL_GetTick(void)
 {
-    return 0;
+    return os_time_get();
 }
 
 HAL_StatusTypeDef