From d0a2e55ed0cf97be924ebbdae2497fd77bfac5b6 Mon Sep 17 00:00:00 2001 From: gdisirio Date: Tue, 8 May 2012 17:09:20 +0000 Subject: git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@4175 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- os/hal/platforms/AT91SAM7/serial_lld.c | 6 +++--- os/hal/platforms/AVR/serial_lld.c | 4 ++-- os/hal/platforms/LPC11xx/serial_lld.c | 12 ++++++------ os/hal/platforms/LPC13xx/serial_lld.c | 12 ++++++------ os/hal/platforms/LPC214x/serial_lld.c | 12 ++++++------ os/hal/platforms/MSP430/serial_lld.c | 4 ++-- os/hal/platforms/Posix/serial_lld.c | 6 +++--- os/hal/platforms/SPC56x/serial_lld.c | 6 +++--- os/hal/platforms/STM32/serial_lld.c | 10 +++++----- os/hal/platforms/STM8L/serial_lld.c | 4 ++-- os/hal/platforms/STM8S/serial_lld.c | 4 ++-- os/hal/platforms/Win32/serial_lld.c | 6 +++--- 12 files changed, 43 insertions(+), 43 deletions(-) (limited to 'os/hal/platforms') diff --git a/os/hal/platforms/AT91SAM7/serial_lld.c b/os/hal/platforms/AT91SAM7/serial_lld.c index d23aa9b0e..0e6aa1178 100644 --- a/os/hal/platforms/AT91SAM7/serial_lld.c +++ b/os/hal/platforms/AT91SAM7/serial_lld.c @@ -139,7 +139,7 @@ static void usart_deinit(AT91PS_USART u) { * @param[in] sdp communication channel associated to the USART */ static void set_error(SerialDriver *sdp, AT91_REG csr) { - ioflags_t sts = 0; + chnflags_t sts = 0; if (csr & AT91C_US_OVRE) sts |= SD_OVERRUN_ERROR; @@ -150,7 +150,7 @@ static void set_error(SerialDriver *sdp, AT91_REG csr) { if (csr & AT91C_US_RXBRK) sts |= SD_BREAK_DETECTED; chSysLockFromIsr(); - chIOAddFlagsI(sdp, sts); + chnAddFlagsI(sdp, sts); chSysUnlockFromIsr(); } @@ -181,7 +181,7 @@ void sd_lld_serve_interrupt(SerialDriver *sdp) { chSysLockFromIsr(); b = chOQGetI(&sdp->oqueue); if (b < Q_OK) { - chIOAddFlagsI(sdp, IO_OUTPUT_EMPTY); + chnAddFlagsI(sdp, CHN_OUTPUT_EMPTY); u->US_IDR = AT91C_US_TXRDY; } else diff --git a/os/hal/platforms/AVR/serial_lld.c b/os/hal/platforms/AVR/serial_lld.c index 102fd9d45..e070d5448 100644 --- a/os/hal/platforms/AVR/serial_lld.c +++ b/os/hal/platforms/AVR/serial_lld.c @@ -70,7 +70,7 @@ static const SerialConfig default_config = { /*===========================================================================*/ static void set_error(uint8_t sra, SerialDriver *sdp) { - ioflags_t sts = 0; + chnflags_t sts = 0; if (sra & (1 << DOR)) sts |= SD_OVERRUN_ERROR; @@ -79,7 +79,7 @@ static void set_error(uint8_t sra, SerialDriver *sdp) { if (sra & (1 << FE)) sts |= SD_FRAMING_ERROR; chSysLockFromIsr(); - chIOAddFlagsI(sdp, sts); + chnAddFlagsI(sdp, sts); chSysUnlockFromIsr(); } diff --git a/os/hal/platforms/LPC11xx/serial_lld.c b/os/hal/platforms/LPC11xx/serial_lld.c index 4b2b40b39..10f7817b7 100644 --- a/os/hal/platforms/LPC11xx/serial_lld.c +++ b/os/hal/platforms/LPC11xx/serial_lld.c @@ -101,7 +101,7 @@ static void uart_deinit(LPC_UART_TypeDef *u) { * @param[in] err UART LSR register value */ static void set_error(SerialDriver *sdp, IOREG32 err) { - ioflags_t sts = 0; + chnflags_t sts = 0; if (err & LSR_OVERRUN) sts |= SD_OVERRUN_ERROR; @@ -112,7 +112,7 @@ static void set_error(SerialDriver *sdp, IOREG32 err) { if (err & LSR_BREAK) sts |= SD_BREAK_DETECTED; chSysLockFromIsr(); - chIOAddFlagsI(sdp, sts); + chnAddFlagsI(sdp, sts); chSysUnlockFromIsr(); } @@ -139,12 +139,12 @@ static void serve_interrupt(SerialDriver *sdp) { case IIR_SRC_RX: chSysLockFromIsr(); if (chIQIsEmptyI(&sdp->iqueue)) - chIOAddFlagsI(sdp, IO_INPUT_AVAILABLE); + chnAddFlagsI(sdp, CHN_INPUT_AVAILABLE); chSysUnlockFromIsr(); while (u->LSR & LSR_RBR_FULL) { chSysLockFromIsr(); if (chIQPutI(&sdp->iqueue, u->RBR) < Q_OK) - chIOAddFlagsI(sdp, SD_OVERRUN_ERROR); + chnAddFlagsI(sdp, SD_OVERRUN_ERROR); chSysUnlockFromIsr(); } break; @@ -160,7 +160,7 @@ static void serve_interrupt(SerialDriver *sdp) { if (b < Q_OK) { u->IER &= ~IER_THRE; chSysLockFromIsr(); - chIOAddFlagsI(sdp, IO_OUTPUT_EMPTY); + chnAddFlagsI(sdp, CHN_OUTPUT_EMPTY); chSysUnlockFromIsr(); break; } @@ -186,7 +186,7 @@ static void preload(SerialDriver *sdp) { do { msg_t b = chOQGetI(&sdp->oqueue); if (b < Q_OK) { - chIOAddFlagsI(sdp, IO_OUTPUT_EMPTY); + chnAddFlagsI(sdp, CHN_OUTPUT_EMPTY); return; } u->THR = b; diff --git a/os/hal/platforms/LPC13xx/serial_lld.c b/os/hal/platforms/LPC13xx/serial_lld.c index 2bf781a3d..f0c75d247 100644 --- a/os/hal/platforms/LPC13xx/serial_lld.c +++ b/os/hal/platforms/LPC13xx/serial_lld.c @@ -101,7 +101,7 @@ static void uart_deinit(LPC_UART_TypeDef *u) { * @param[in] err UART LSR register value */ static void set_error(SerialDriver *sdp, IOREG32 err) { - ioflags_t sts = 0; + chnflags_t sts = 0; if (err & LSR_OVERRUN) sts |= SD_OVERRUN_ERROR; @@ -112,7 +112,7 @@ static void set_error(SerialDriver *sdp, IOREG32 err) { if (err & LSR_BREAK) sts |= SD_BREAK_DETECTED; chSysLockFromIsr(); - chIOAddFlagsI(sdp, sts); + chnAddFlagsI(sdp, sts); chSysUnlockFromIsr(); } @@ -139,12 +139,12 @@ static void serve_interrupt(SerialDriver *sdp) { case IIR_SRC_RX: chSysLockFromIsr(); if (chIQIsEmptyI(&sdp->iqueue)) - chIOAddFlagsI(sdp, IO_INPUT_AVAILABLE); + chnAddFlagsI(sdp, CHN_INPUT_AVAILABLE); chSysUnlockFromIsr(); while (u->LSR & LSR_RBR_FULL) { chSysLockFromIsr(); if (chIQPutI(&sdp->iqueue, u->RBR) < Q_OK) - chIOAddFlagsI(sdp, SD_OVERRUN_ERROR); + chnAddFlagsI(sdp, SD_OVERRUN_ERROR); chSysUnlockFromIsr(); } break; @@ -160,7 +160,7 @@ static void serve_interrupt(SerialDriver *sdp) { if (b < Q_OK) { u->IER &= ~IER_THRE; chSysLockFromIsr(); - chIOAddFlagsI(sdp, IO_OUTPUT_EMPTY); + chnAddFlagsI(sdp, CHN_OUTPUT_EMPTY); chSysUnlockFromIsr(); break; } @@ -186,7 +186,7 @@ static void preload(SerialDriver *sdp) { do { msg_t b = chOQGetI(&sdp->oqueue); if (b < Q_OK) { - chIOAddFlagsI(sdp, IO_OUTPUT_EMPTY); + chnAddFlagsI(sdp, CHN_OUTPUT_EMPTY); return; } u->THR = b; diff --git a/os/hal/platforms/LPC214x/serial_lld.c b/os/hal/platforms/LPC214x/serial_lld.c index 8b325f35e..ce207ff61 100644 --- a/os/hal/platforms/LPC214x/serial_lld.c +++ b/os/hal/platforms/LPC214x/serial_lld.c @@ -106,7 +106,7 @@ static void uart_deinit(UART *u) { * @param[in] err UART LSR register value */ static void set_error(SerialDriver *sdp, IOREG32 err) { - ioflags_t sts = 0; + chnflags_t sts = 0; if (err & LSR_OVERRUN) sts |= SD_OVERRUN_ERROR; @@ -117,7 +117,7 @@ static void set_error(SerialDriver *sdp, IOREG32 err) { if (err & LSR_BREAK) sts |= SD_BREAK_DETECTED; chSysLockFromIsr(); - chIOAddFlagsI(sdp, sts); + chnAddFlagsI(sdp, sts); chSysUnlockFromIsr(); } @@ -145,12 +145,12 @@ static void serve_interrupt(SerialDriver *sdp) { case IIR_SRC_RX: chSysLockFromIsr(); if (chIQIsEmptyI(&sdp->iqueue)) - chIOAddFlagsI(sdp, IO_INPUT_AVAILABLE); + chnAddFlagsI(sdp, CHN_INPUT_AVAILABLE); chSysUnlockFromIsr(); while (u->UART_LSR & LSR_RBR_FULL) { chSysLockFromIsr(); if (chIQPutI(&sdp->iqueue, u->UART_RBR) < Q_OK) - chIOAddFlagsI(sdp, SD_OVERRUN_ERROR); + chnAddFlagsI(sdp, SD_OVERRUN_ERROR); chSysUnlockFromIsr(); } break; @@ -166,7 +166,7 @@ static void serve_interrupt(SerialDriver *sdp) { if (b < Q_OK) { u->UART_IER &= ~IER_THRE; chSysLockFromIsr(); - chIOAddFlagsI(sdp, IO_OUTPUT_EMPTY); + chnAddFlagsI(sdp, CHN_OUTPUT_EMPTY); chSysUnlockFromIsr(); break; } @@ -192,7 +192,7 @@ static void preload(SerialDriver *sdp) { do { msg_t b = chOQGetI(&sdp->oqueue); if (b < Q_OK) { - chIOAddFlagsI(sdp, IO_OUTPUT_EMPTY); + chnAddFlagsI(sdp, CHN_OUTPUT_EMPTY); return; } u->UART_THR = b; diff --git a/os/hal/platforms/MSP430/serial_lld.c b/os/hal/platforms/MSP430/serial_lld.c index b3a030bc6..bdc3c580d 100644 --- a/os/hal/platforms/MSP430/serial_lld.c +++ b/os/hal/platforms/MSP430/serial_lld.c @@ -60,7 +60,7 @@ static const SerialConfig default_config = { /*===========================================================================*/ static void set_error(SerialDriver *sdp, uint8_t urctl) { - ioflags_t sts = 0; + chnflags_t sts = 0; if (urctl & OE) sts |= SD_OVERRUN_ERROR; @@ -71,7 +71,7 @@ static void set_error(SerialDriver *sdp, uint8_t urctl) { if (urctl & BRK) sts |= SD_BREAK_DETECTED; chSysLockFromIsr(); - chIOAddFlagsI(sdp, sts); + chnAddFlagsI(sdp, sts); chSysUnlockFromIsr(); } diff --git a/os/hal/platforms/Posix/serial_lld.c b/os/hal/platforms/Posix/serial_lld.c index 4eea349b6..d8c62a0d7 100644 --- a/os/hal/platforms/Posix/serial_lld.c +++ b/os/hal/platforms/Posix/serial_lld.c @@ -121,7 +121,7 @@ static bool_t connint(SerialDriver *sdp) { goto abort; } chSysLockFromIsr(); - chIOAddFlagsI(sdp, IO_CONNECTED); + chnAddFlagsI(sdp, CHN_CONNECTED); chSysUnlockFromIsr(); return TRUE; } @@ -149,7 +149,7 @@ static bool_t inint(SerialDriver *sdp) { close(sdp->com_data); sdp->com_data = INVALID_SOCKET; chSysLockFromIsr(); - chIOAddFlagsI(sdp, IO_DISCONNECTED); + chnAddFlagsI(sdp, CHN_DISCONNECTED); chSysUnlockFromIsr(); return FALSE; case INVALID_SOCKET: @@ -190,7 +190,7 @@ static bool_t outint(SerialDriver *sdp) { close(sdp->com_data); sdp->com_data = INVALID_SOCKET; chSysLockFromIsr(); - chIOAddFlagsI(sdp, IO_DISCONNECTED); + chnAddFlagsI(sdp, CHN_DISCONNECTED); chSysUnlockFromIsr(); return FALSE; case INVALID_SOCKET: diff --git a/os/hal/platforms/SPC56x/serial_lld.c b/os/hal/platforms/SPC56x/serial_lld.c index 935ba6d8b..7effeeb60 100644 --- a/os/hal/platforms/SPC56x/serial_lld.c +++ b/os/hal/platforms/SPC56x/serial_lld.c @@ -117,7 +117,7 @@ static void esci_deinit(volatile struct ESCI_tag *escip) { * @param[in] sr eSCI SR register value */ static void set_error(SerialDriver *sdp, uint32_t sr) { - ioflags_t sts = 0; + chnflags_t sts = 0; if (sr & 0x08000000) sts |= SD_OVERRUN_ERROR; @@ -130,7 +130,7 @@ static void set_error(SerialDriver *sdp, uint32_t sr) { /* if (sr & 0x00000000) sts |= SD_BREAK_DETECTED;*/ chSysLockFromIsr(); - chIOAddFlagsI(sdp, sts); + chnAddFlagsI(sdp, sts); chSysUnlockFromIsr(); } @@ -156,7 +156,7 @@ static void serve_interrupt(SerialDriver *sdp) { chSysLockFromIsr(); b = chOQGetI(&sdp->oqueue); if (b < Q_OK) { - chIOAddFlagsI(sdp, IO_OUTPUT_EMPTY); + chnAddFlagsI(sdp, CHN_OUTPUT_EMPTY); escip->CR1.B.TIE = 0; } else { diff --git a/os/hal/platforms/STM32/serial_lld.c b/os/hal/platforms/STM32/serial_lld.c index cc60bb850..a93d36523 100644 --- a/os/hal/platforms/STM32/serial_lld.c +++ b/os/hal/platforms/STM32/serial_lld.c @@ -140,7 +140,7 @@ static void usart_deinit(USART_TypeDef *u) { * @param[in] sr USART SR register value */ static void set_error(SerialDriver *sdp, uint16_t sr) { - ioflags_t sts = 0; + chnflags_t sts = 0; if (sr & USART_SR_ORE) sts |= SD_OVERRUN_ERROR; @@ -151,7 +151,7 @@ static void set_error(SerialDriver *sdp, uint16_t sr) { if (sr & USART_SR_NE) sts |= SD_NOISE_ERROR; chSysLockFromIsr(); - chIOAddFlagsI(sdp, sts); + chnAddFlagsI(sdp, sts); chSysUnlockFromIsr(); } @@ -172,7 +172,7 @@ static void serve_interrupt(SerialDriver *sdp) { /* Special case, LIN break detection.*/ if (sr & USART_SR_LBD) { chSysLockFromIsr(); - chIOAddFlagsI(sdp, SD_BREAK_DETECTED); + chnAddFlagsI(sdp, SD_BREAK_DETECTED); chSysUnlockFromIsr(); u->SR &= ~USART_SR_LBD; } @@ -188,7 +188,7 @@ static void serve_interrupt(SerialDriver *sdp) { chSysLockFromIsr(); b = chOQGetI(&sdp->oqueue); if (b < Q_OK) { - chIOAddFlagsI(sdp, IO_OUTPUT_EMPTY); + chnAddFlagsI(sdp, CHN_OUTPUT_EMPTY); u->CR1 = (cr1 & ~USART_CR1_TXEIE) | USART_CR1_TCIE; } else @@ -198,7 +198,7 @@ static void serve_interrupt(SerialDriver *sdp) { /* Physical transmission end.*/ if (sr & USART_SR_TC) { chSysLockFromIsr(); - chIOAddFlagsI(sdp, IO_TRANSMISSION_END); + chnAddFlagsI(sdp, CHN_TRANSMISSION_END); chSysUnlockFromIsr(); u->CR1 = cr1 & ~USART_CR1_TCIE; u->SR &= ~USART_SR_TC; diff --git a/os/hal/platforms/STM8L/serial_lld.c b/os/hal/platforms/STM8L/serial_lld.c index b5ee21f83..b91f44a21 100644 --- a/os/hal/platforms/STM8L/serial_lld.c +++ b/os/hal/platforms/STM8L/serial_lld.c @@ -115,7 +115,7 @@ static void notify3(GenericQueue *qp) { * @notapi */ void sd_lld_set_error(SerialDriver *sdp, uint8_t sr) { - ioflags_t sts = 0; + chnflags_t sts = 0; if (sr & USART_SR_OR) sts |= SD_OVERRUN_ERROR; @@ -126,7 +126,7 @@ void sd_lld_set_error(SerialDriver *sdp, uint8_t sr) { if (sr & USART_SR_PE) sts |= SD_PARITY_ERROR; chSysLockFromIsr(); - chIOAddFlagsI(sdp, sts); + chnAddFlagsI(sdp, sts); chSysUnlockFromIsr(); } diff --git a/os/hal/platforms/STM8S/serial_lld.c b/os/hal/platforms/STM8S/serial_lld.c index fbc3baeaf..610591cdf 100644 --- a/os/hal/platforms/STM8S/serial_lld.c +++ b/os/hal/platforms/STM8S/serial_lld.c @@ -73,7 +73,7 @@ static ROMCONST SerialConfig default_config = { /*===========================================================================*/ static void set_error(SerialDriver *sdp, uint8_t sr) { - ioflags_t sts = 0; + chnflags_t sts = 0; /* Note, SR register bit definitions are equal for all UARTs so using the UART1 definitions is fine.*/ @@ -86,7 +86,7 @@ static void set_error(SerialDriver *sdp, uint8_t sr) { if (sr & UART1_SR_PE) sts |= SD_PARITY_ERROR; chSysLockFromIsr(); - chIOAddFlagsI(sdp, sts); + chnAddFlagsI(sdp, sts); chSysUnlockFromIsr(); } diff --git a/os/hal/platforms/Win32/serial_lld.c b/os/hal/platforms/Win32/serial_lld.c index a144b7f50..d383317bc 100644 --- a/os/hal/platforms/Win32/serial_lld.c +++ b/os/hal/platforms/Win32/serial_lld.c @@ -114,7 +114,7 @@ static bool_t connint(SerialDriver *sdp) { goto abort; } chSysLockFromIsr(); - chIOAddFlagsI(sdp, IO_CONNECTED); + chnAddFlagsI(sdp, CHN_CONNECTED); chSysUnlockFromIsr(); return TRUE; } @@ -143,7 +143,7 @@ static bool_t inint(SerialDriver *sdp) { closesocket(sdp->com_data); sdp->com_data = INVALID_SOCKET; chSysLockFromIsr(); - chIOAddFlagsI(sdp, IO_DISCONNECTED); + chnAddFlagsI(sdp, CHN_DISCONNECTED); chSysUnlockFromIsr(); return FALSE; case SOCKET_ERROR: @@ -184,7 +184,7 @@ static bool_t outint(SerialDriver *sdp) { closesocket(sdp->com_data); sdp->com_data = INVALID_SOCKET; chSysLockFromIsr(); - chIOAddFlagsI(sdp, IO_DISCONNECTED); + chnAddFlagsI(sdp, CHN_DISCONNECTED); chSysUnlockFromIsr(); return FALSE; case SOCKET_ERROR: -- cgit v1.2.3