From 0532be7a66f865d80cbd381968f71b9329417d63 Mon Sep 17 00:00:00 2001
From: Giovanni Di Sirio <gdisirio@gmail.com>
Date: Sun, 28 Feb 2016 08:53:06 +0000
Subject: [PATCH] Fixed bug #715.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/stable_16.1.x@8977 35acf78f-673a-0410-8e92-d51de3d6d3f4
---
 demos/various/NIL-ARMCM0-GENERIC/main.c | 2 +-
 demos/various/NIL-ARMCM4-GENERIC/main.c | 2 +-
 demos/various/RT-ARMCM0-GENERIC/main.c  | 2 +-
 demos/various/RT-ARMCM4-GENERIC/main.c  | 2 +-
 readme.txt                              | 2 ++
 5 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/demos/various/NIL-ARMCM0-GENERIC/main.c b/demos/various/NIL-ARMCM0-GENERIC/main.c
index 023db0b8c..a233632ff 100644
--- a/demos/various/NIL-ARMCM0-GENERIC/main.c
+++ b/demos/various/NIL-ARMCM0-GENERIC/main.c
@@ -86,7 +86,7 @@ int main(void) {
   SysTick->LOAD = SYSTEM_CLOCK / NIL_CFG_ST_FREQUENCY - (systime_t)1;
   SysTick->VAL = (uint32_t)0;
   SysTick->CTRL = SysTick_CTRL_CLKSOURCE_Msk | SysTick_CTRL_ENABLE_Msk |
-                  SysTick_CTRL_ENABLE_Msk;
+                  SysTick_CTRL_TICKINT_Msk;
 
   /*
    * System initializations.
diff --git a/demos/various/NIL-ARMCM4-GENERIC/main.c b/demos/various/NIL-ARMCM4-GENERIC/main.c
index 023db0b8c..a233632ff 100644
--- a/demos/various/NIL-ARMCM4-GENERIC/main.c
+++ b/demos/various/NIL-ARMCM4-GENERIC/main.c
@@ -86,7 +86,7 @@ int main(void) {
   SysTick->LOAD = SYSTEM_CLOCK / NIL_CFG_ST_FREQUENCY - (systime_t)1;
   SysTick->VAL = (uint32_t)0;
   SysTick->CTRL = SysTick_CTRL_CLKSOURCE_Msk | SysTick_CTRL_ENABLE_Msk |
-                  SysTick_CTRL_ENABLE_Msk;
+                  SysTick_CTRL_TICKINT_Msk;
 
   /*
    * System initializations.
diff --git a/demos/various/RT-ARMCM0-GENERIC/main.c b/demos/various/RT-ARMCM0-GENERIC/main.c
index 2cc543d51..8bd7eeef9 100644
--- a/demos/various/RT-ARMCM0-GENERIC/main.c
+++ b/demos/various/RT-ARMCM0-GENERIC/main.c
@@ -65,7 +65,7 @@ int main(void) {
   SysTick->LOAD = SYSTEM_CLOCK / CH_CFG_ST_FREQUENCY - (systime_t)1;
   SysTick->VAL = (uint32_t)0;
   SysTick->CTRL = SysTick_CTRL_CLKSOURCE_Msk | SysTick_CTRL_ENABLE_Msk |
-                  SysTick_CTRL_ENABLE_Msk;
+                  SysTick_CTRL_TICKINT_Msk;
 
   /*
    * System initializations.
diff --git a/demos/various/RT-ARMCM4-GENERIC/main.c b/demos/various/RT-ARMCM4-GENERIC/main.c
index 2cc543d51..8bd7eeef9 100644
--- a/demos/various/RT-ARMCM4-GENERIC/main.c
+++ b/demos/various/RT-ARMCM4-GENERIC/main.c
@@ -65,7 +65,7 @@ int main(void) {
   SysTick->LOAD = SYSTEM_CLOCK / CH_CFG_ST_FREQUENCY - (systime_t)1;
   SysTick->VAL = (uint32_t)0;
   SysTick->CTRL = SysTick_CTRL_CLKSOURCE_Msk | SysTick_CTRL_ENABLE_Msk |
-                  SysTick_CTRL_ENABLE_Msk;
+                  SysTick_CTRL_TICKINT_Msk;
 
   /*
    * System initializations.
diff --git a/readme.txt b/readme.txt
index 377a51e55..4fa03ffcf 100644
--- a/readme.txt
+++ b/readme.txt
@@ -74,6 +74,8 @@
 
 *** 16.1.4 ***
 - ALL: Startup files relicensed under Apache 2.0.
+- RT:  Fixed wrong SysTick initialization in generic demos (bug #715).
+- NIL: Fixed wrong SysTick initialization in generic demos (bug #715).
 - HAL: Fixed usbStop does not resume threads suspended in synchronous calls
        to usbTransmit (bug #714).
 - VAR: Fixed state check in lwIP when SYS_LIGHTWEIGHT_PROT is disabled