diff options
| author | Giovanni Di Sirio <gdisirio@gmail.com> | 2015-12-26 13:16:24 +0000 |
|---|---|---|
| committer | Giovanni Di Sirio <gdisirio@gmail.com> | 2015-12-26 13:16:24 +0000 |
| commit | ae70b0edcea8b466894e140839371fb122a4aa92 (patch) | |
| tree | 4c0031bf1e4afddba7d9479ebd055d7a6d16ae64 /os/hal/ports/LPC | |
| parent | 672c4381f55bb8d7fd7ff902dae116c5b9b72373 (diff) | |
| download | ChibiOS-ae70b0edcea8b466894e140839371fb122a4aa92.tar.gz ChibiOS-ae70b0edcea8b466894e140839371fb122a4aa92.tar.bz2 ChibiOS-ae70b0edcea8b466894e140839371fb122a4aa92.zip | |
Fixed bug #686.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@8647 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/hal/ports/LPC')
| -rw-r--r-- | os/hal/ports/LPC/LPC214x/serial_lld.c | 20 | ||||
| -rw-r--r-- | os/hal/ports/LPC/LPC214x/spi_lld.h | 2 |
2 files changed, 11 insertions, 11 deletions
diff --git a/os/hal/ports/LPC/LPC214x/serial_lld.c b/os/hal/ports/LPC/LPC214x/serial_lld.c index d1bb58cb1..d8154396e 100644 --- a/os/hal/ports/LPC/LPC214x/serial_lld.c +++ b/os/hal/ports/LPC/LPC214x/serial_lld.c @@ -111,9 +111,9 @@ static void set_error(SerialDriver *sdp, IOREG32 err) { sts |= SD_FRAMING_ERROR;
if (err & LSR_BREAK)
sts |= SD_BREAK_DETECTED;
- chSysLockFromISR();
+ osalSysLockFromISR();
chnAddFlagsI(sdp, sts);
- chSysUnlockFromISR();
+ osalSysUnlockFromISR();
}
/**
@@ -135,15 +135,15 @@ static void serve_interrupt(SerialDriver *sdp) { break;
case IIR_SRC_TIMEOUT:
case IIR_SRC_RX:
- chSysLockFromISR();
+ osalSysLockFromISR();
if (chIQIsEmptyI(&sdp->iqueue))
chnAddFlagsI(sdp, CHN_INPUT_AVAILABLE);
- chSysUnlockFromISR();
+ osalSysUnlockFromISR();
while (u->UART_LSR & LSR_RBR_FULL) {
- chSysLockFromISR();
+ osalSysLockFromISR();
if (chIQPutI(&sdp->iqueue, u->UART_RBR) < Q_OK)
chnAddFlagsI(sdp, SD_OVERRUN_ERROR);
- chSysUnlockFromISR();
+ osalSysUnlockFromISR();
}
break;
case IIR_SRC_TX:
@@ -152,14 +152,14 @@ static void serve_interrupt(SerialDriver *sdp) { do {
msg_t b;
- chSysLockFromISR();
+ osalSysLockFromISR();
b = chOQGetI(&sdp->oqueue);
- chSysUnlockFromISR();
+ osalSysUnlockFromISR();
if (b < Q_OK) {
u->UART_IER &= ~IER_THRE;
- chSysLockFromISR();
+ osalSysLockFromISR();
chnAddFlagsI(sdp, CHN_OUTPUT_EMPTY);
- chSysUnlockFromISR();
+ osalSysUnlockFromISR();
break;
}
u->UART_THR = b;
diff --git a/os/hal/ports/LPC/LPC214x/spi_lld.h b/os/hal/ports/LPC/LPC214x/spi_lld.h index d0455f359..6f95cddfa 100644 --- a/os/hal/ports/LPC/LPC214x/spi_lld.h +++ b/os/hal/ports/LPC/LPC214x/spi_lld.h @@ -61,7 +61,7 @@ * @details The default action is to stop the system.
*/
#if !defined(LPC214x_SPI_SSP_ERROR_HOOK) || defined(__DOXYGEN__)
-#define LPC214x_SPI_SSP_ERROR_HOOK() chSysHalt()
+#define LPC214x_SPI_SSP_ERROR_HOOK() osalSysHalt()
#endif
/*===========================================================================*/
|