2 files changed, 34 insertions, 4 deletions
diff --git a/os/hal/platforms/Posix/hal_lld.c b/os/hal/platforms/Posix/hal_lld.c
index 8b59d992b..8e1c34939 100644
--- a/os/hal/platforms/Posix/hal_lld.c
+++ b/os/hal/platforms/Posix/hal_lld.c
@@ -78,8 +78,10 @@ void ChkIntSources(void) {
 
 #if HAL_USE_SERIAL
   if (sd_lld_interrupt_pending()) {
+    dbg_check_lock();
     if (chSchIsPreemptionRequired())
       chSchDoReschedule();
+    dbg_check_unlock();
     return;
   }
 #endif
@@ -87,9 +89,19 @@ void ChkIntSources(void) {
   gettimeofday(&tv, NULL);
   if (timercmp(&tv, &nextcnt, >=)) {
     timeradd(&nextcnt, &tick, &nextcnt);
+
+    CH_IRQ_PROLOGUE();
+
+    chSysLockFromIsr();
     chSysTimerHandlerI();
+    chSysUnlockFromIsr();
+
+    CH_IRQ_EPILOGUE();
+
+    dbg_check_lock();
     if (chSchIsPreemptionRequired())
       chSchDoReschedule();
+    dbg_check_unlock();
   }
 }
 
diff --git a/os/hal/platforms/Posix/serial_lld.c b/os/hal/platforms/Posix/serial_lld.c
index 31be73825..5bf22bc76 100644
--- a/os/hal/platforms/Posix/serial_lld.c
+++ b/os/hal/platforms/Posix/serial_lld.c
@@ -120,7 +120,9 @@ static bool_t connint(SerialDriver *sdp) {
       printf("%s: Unable to setup non blocking mode on data socket\n", sdp->com_name);
       goto abort;
     }
+    chSysLockFromIsr();
     chIOAddFlagsI(sdp, IO_CONNECTED);
+    chSysUnlockFromIsr();
     return TRUE;
   }
   return FALSE;
@@ -146,7 +148,9 @@ static bool_t inint(SerialDriver *sdp) {
     case 0:
       close(sdp->com_data);
       sdp->com_data = INVALID_SOCKET;
+      chSysLockFromIsr();
       chIOAddFlagsI(sdp, IO_DISCONNECTED);
+      chSysUnlockFromIsr();
       return FALSE;
     case INVALID_SOCKET:
       if (errno == EWOULDBLOCK)
@@ -155,8 +159,11 @@ static bool_t inint(SerialDriver *sdp) {
       sdp->com_data = INVALID_SOCKET;
       return FALSE;
     }
-    for (i = 0; i < n; i++)
+    for (i = 0; i < n; i++) {
+      chSysLockFromIsr();
       sdIncomingDataI(sdp, data[i]);
+      chSysUnlockFromIsr();
+    }
     return TRUE;
   }
   return FALSE;
@@ -171,7 +178,9 @@ static bool_t outint(SerialDriver *sdp) {
     /*
      * Input.
      */
+    chSysLockFromIsr();
     n = sdRequestDataI(sdp);
+    chSysUnlockFromIsr();
     if (n < 0)
       return FALSE;
     data[0] = (uint8_t)n;
@@ -180,7 +189,9 @@ static bool_t outint(SerialDriver *sdp) {
     case 0:
       close(sdp->com_data);
       sdp->com_data = INVALID_SOCKET;
+      chSysLockFromIsr();
       chIOAddFlagsI(sdp, IO_DISCONNECTED);
+      chSysUnlockFromIsr();
       return FALSE;
     case INVALID_SOCKET:
       if (errno == EWOULDBLOCK)
@@ -256,10 +267,17 @@ void sd_lld_stop(SerialDriver *sdp) {
 }
 
 bool_t sd_lld_interrupt_pending(void) {
+  bool_t b;
+
+  CH_IRQ_PROLOGUE();
+
+  b =  connint(&SD1) || connint(&SD2) ||
+       inint(&SD1)   || inint(&SD2)   ||
+       outint(&SD1)  || outint(&SD2);
+
+  CH_IRQ_EPILOGUE();
 
-  return connint(&SD1) || connint(&SD2) ||
-         inint(&SD1)   || inint(&SD2)   ||
-         outint(&SD1)  || outint(&SD2);
+  return b;
 }
 
 #endif /* HAL_USE_SERIAL */