aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--os/hal/src/serial.c4
-rw-r--r--readme.txt3
2 files changed, 6 insertions, 1 deletions
diff --git a/os/hal/src/serial.c b/os/hal/src/serial.c
index 54db8e95d..1372d5acc 100644
--- a/os/hal/src/serial.c
+++ b/os/hal/src/serial.c
@@ -141,7 +141,7 @@ void sdObjectInit(SerialDriver *sdp, qnotify_t inotify, qnotify_t onotify) {
*/
void sdStart(SerialDriver *sdp, const SerialConfig *config) {
- chDbgCheck((sdp != NULL) && (config != NULL), "sdStart");
+ chDbgCheck(sdp != NULL, "sdStart");
chSysLock();
chDbgAssert((sdp->sd.state == SD_STOP) || (sdp->sd.state == SD_READY),
@@ -251,8 +251,10 @@ sdflags_t sdGetAndClearFlags(SerialDriver *sdp) {
chDbgCheck(sdp != NULL, "sdGetAndClearFlags");
+ chSysLock();
mask = sdp->sd.flags;
sdp->sd.flags = SD_NO_ERROR;
+ chSysUnlock();
return mask;
}
diff --git a/readme.txt b/readme.txt
index 1b1bc2cde..529045be9 100644
--- a/readme.txt
+++ b/readme.txt
@@ -51,6 +51,9 @@
*** Releases ***
*****************************************************************************
+*** 1.5.0 ***
+- FIX: Fixed parameter check in sdStart() function (bug 2932922).
+
*** 1.3.8 ***
- FIX: Fixed dequeuing in lifo_remove() function (bug 2928142).
- FIX: Fixed spurious character generation in MSP430 serial driver (bug