aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--demos/various/NIL-ARMCM0-GENERIC/main.c2
-rw-r--r--demos/various/NIL-ARMCM4-GENERIC/main.c2
-rw-r--r--demos/various/RT-ARMCM0-GENERIC/main.c2
-rw-r--r--demos/various/RT-ARMCM4-GENERIC/main.c2
-rw-r--r--readme.txt4
5 files changed, 8 insertions, 4 deletions
diff --git a/demos/various/NIL-ARMCM0-GENERIC/main.c b/demos/various/NIL-ARMCM0-GENERIC/main.c
index 8ff3c7295..e3a34b47c 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 / 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/NIL-ARMCM4-GENERIC/main.c b/demos/various/NIL-ARMCM4-GENERIC/main.c
index 8ff3c7295..e3a34b47c 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 / 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-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 21e4e9171..1264b8bd1 100644
--- a/readme.txt
+++ b/readme.txt
@@ -92,6 +92,10 @@
- RT: Merged RT4.
- NIL: Merged NIL2.
- NIL: Added STM32F7 demo.
+- RT: Fixed wrong SysTick initialization in generic demos (bug #715)
+ (backported to 16.1.4).
+- NIL: Fixed wrong SysTick initialization in generic demos (bug #715)
+ (backported to 16.1.4).
- HAL: Fixed usbStop does not resume threads suspended in synchronous calls
to usbTransmit (bug #714)(backported to 16.1.4).
- VAR: Fixed state check in lwIP when SYS_LIGHTWEIGHT_PROT is disabled