aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGiovanni Di Sirio <gdisirio@gmail.com>2019-02-09 08:23:01 +0000
committerGiovanni Di Sirio <gdisirio@gmail.com>2019-02-09 08:23:01 +0000
commitdb3058ecfcefb57e487c647b0c34cebc945e3f46 (patch)
tree50b0a8c2fd502b11abd5e39dbda67787ee8d021e
parentc8dce5865b9c2bd77d67a7038005c9be0ea29ac9 (diff)
downloadChibiOS-db3058ecfcefb57e487c647b0c34cebc945e3f46.tar.gz
ChibiOS-db3058ecfcefb57e487c647b0c34cebc945e3f46.tar.bz2
ChibiOS-db3058ecfcefb57e487c647b0c34cebc945e3f46.zip
Fixed bug #1011.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/stable_19.1.x@12649 110e8d01-0319-4d1e-a829-52ad28d1bb01
-rw-r--r--os/nil/include/ch.h2
-rw-r--r--readme.txt1
2 files changed, 2 insertions, 1 deletions
diff --git a/os/nil/include/ch.h b/os/nil/include/ch.h
index 9e613ed47..7328aa874 100644
--- a/os/nil/include/ch.h
+++ b/os/nil/include/ch.h
@@ -449,7 +449,7 @@
#if (CH_LICENSE_FEATURES != CH_FEATURES_FULL) && \
(CH_LICENSE_FEATURES != CH_FEATURES_INTERMEDIATE) && \
- (CH_LICENSE_FEATURES == CH_FEATURES_BASIC)
+ (CH_LICENSE_FEATURES != CH_FEATURES_BASIC)
#error "invalid CH_LICENSE_FEATURES setting"
#endif
diff --git a/readme.txt b/readme.txt
index beeead0e3..4d0d35e4b 100644
--- a/readme.txt
+++ b/readme.txt
@@ -74,6 +74,7 @@
*****************************************************************************
*** 19.1.1 ***
+- FIX: Fixed wrong license restriction check in Nil (bug #1011).
- FIX: Fixed uninitialized variables in STM32 DMA drivers (bug #1010).
- FIX: Fixed wrong mcuconf.h in some testex demos related to STM32F407
(bug #1008).