From dcffe7173f864155235d91767a07f7ef48622017 Mon Sep 17 00:00:00 2001 From: Michael Ossmann Date: Tue, 4 Nov 2014 23:25:55 -0700 Subject: [PATCH] Revert "Merge pull request #132 from bgamari/update-libopencm3" This reverts commit cbe69b3d0b0828e25850e9f3432848d99ec0865d, reversing changes made to 2f2ca2e630651d97d385d9044149f2f13dd28d05. I shouldn't have merged that ancient pull request that somehow was reopened. --- firmware/libopencm3 | 2 +- firmware/startup_systick/startup_systick.c | 2 +- firmware/startup_systick_perfo/startup_systick.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/firmware/libopencm3 b/firmware/libopencm3 index 8ceeebcc..854c112a 160000 --- a/firmware/libopencm3 +++ b/firmware/libopencm3 @@ -1 +1 @@ -Subproject commit 8ceeebcca993d4994522e9fdfc8ee85e363efadd +Subproject commit 854c112a0ea7b27e85a15345507c8a2e13e76607 diff --git a/firmware/startup_systick/startup_systick.c b/firmware/startup_systick/startup_systick.c index 25a85d65..d4c8517e 100644 --- a/firmware/startup_systick/startup_systick.c +++ b/firmware/startup_systick/startup_systick.c @@ -41,7 +41,7 @@ void systick_setup(void) __asm__("cpsid i"); /* Set processor Clock as Source Clock */ - systick_set_clocksource(STK_CSR_CLKSOURCE); + systick_set_clocksource(STK_CTRL_CLKSOURCE); /* Get SysTick calibration value to obtain by default 1 tick = 10ms */ systick_reload_val = systick_get_calib(); diff --git a/firmware/startup_systick_perfo/startup_systick.c b/firmware/startup_systick_perfo/startup_systick.c index 5271eff9..26c1fcc0 100644 --- a/firmware/startup_systick_perfo/startup_systick.c +++ b/firmware/startup_systick_perfo/startup_systick.c @@ -41,7 +41,7 @@ void systick_setup(void) __asm__("cpsid i"); /* Set processor Clock as Source Clock */ - systick_set_clocksource(STK_CSR_CLKSOURCE); + systick_set_clocksource(STK_CTRL_CLKSOURCE); /* Get SysTick calibration value to obtain by default 1 tick = 10ms */ systick_reload_val = systick_get_calib();