diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2010-01-25 18:50:35 +0000 |
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2010-01-25 18:50:35 +0000 |
| commit | a66602c99d316ecfb03e47dcf9b3fe4167edc580 (patch) | |
| tree | b3460b9bab1679de908cbee4b87233d5fa2e7510 /os/hal | |
| parent | 41a4ecfc808882819791e6b126f27ebad7248ae5 (diff) | |
| download | ChibiOS-a66602c99d316ecfb03e47dcf9b3fe4167edc580.tar.gz ChibiOS-a66602c99d316ecfb03e47dcf9b3fe4167edc580.tar.bz2 ChibiOS-a66602c99d316ecfb03e47dcf9b3fe4167edc580.zip | |
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@1545 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/hal')
| -rw-r--r-- | os/hal/include/serial.h | 2 | ||||
| -rw-r--r-- | os/hal/platforms/AT91SAM7/serial_lld.h | 2 | ||||
| -rw-r--r-- | os/hal/platforms/LPC214x/serial_lld.h | 2 | ||||
| -rw-r--r-- | os/hal/platforms/Linux/serial_lld.h | 2 | ||||
| -rw-r--r-- | os/hal/platforms/STM32/serial_lld.h | 2 | ||||
| -rw-r--r-- | os/hal/platforms/Win32/serial_lld.h | 2 | ||||
| -rw-r--r-- | os/hal/src/serial.c | 7 | ||||
| -rw-r--r-- | os/hal/templates/serial_lld.h | 2 |
8 files changed, 11 insertions, 10 deletions
diff --git a/os/hal/include/serial.h b/os/hal/include/serial.h index 15593b681..932f81030 100644 --- a/os/hal/include/serial.h +++ b/os/hal/include/serial.h @@ -126,7 +126,7 @@ struct _SerialDriver { * Virtual Methods Table.
*/
const struct SerialDriverVMT *vmt;
- _serial_driver_data;
+ _serial_driver_data
};
/*===========================================================================*/
diff --git a/os/hal/platforms/AT91SAM7/serial_lld.h b/os/hal/platforms/AT91SAM7/serial_lld.h index a3030e246..3c36e0ab1 100644 --- a/os/hal/platforms/AT91SAM7/serial_lld.h +++ b/os/hal/platforms/AT91SAM7/serial_lld.h @@ -121,7 +121,7 @@ typedef struct { uint8_t ob[SERIAL_BUFFERS_SIZE]; \
/* End of the mandatory fields.*/ \
/* Pointer to the USART registers block.*/ \
- AT91PS_USART usart
+ AT91PS_USART usart;
/*===========================================================================*/
/* Driver macros. */
diff --git a/os/hal/platforms/LPC214x/serial_lld.h b/os/hal/platforms/LPC214x/serial_lld.h index 974a9849a..6501db299 100644 --- a/os/hal/platforms/LPC214x/serial_lld.h +++ b/os/hal/platforms/LPC214x/serial_lld.h @@ -142,7 +142,7 @@ typedef struct { uint8_t ob[SERIAL_BUFFERS_SIZE]; \
/* End of the mandatory fields.*/ \
/* Pointer to the USART registers block.*/ \
- UART *uart
+ UART *uart;
/*===========================================================================*/
/* Driver macros. */
diff --git a/os/hal/platforms/Linux/serial_lld.h b/os/hal/platforms/Linux/serial_lld.h index 1a246196f..61773459a 100644 --- a/os/hal/platforms/Linux/serial_lld.h +++ b/os/hal/platforms/Linux/serial_lld.h @@ -130,7 +130,7 @@ typedef struct { /* Data socket for simulated serial port.*/ \
SOCKET com_data; \
/* Port readable name.*/ \
- const char *com_name
+ const char *com_name;
/*===========================================================================*/
/* Driver macros. */
diff --git a/os/hal/platforms/STM32/serial_lld.h b/os/hal/platforms/STM32/serial_lld.h index 47d7b8650..9352d6200 100644 --- a/os/hal/platforms/STM32/serial_lld.h +++ b/os/hal/platforms/STM32/serial_lld.h @@ -190,7 +190,7 @@ typedef struct { uint8_t ob[SERIAL_BUFFERS_SIZE]; \
/* End of the mandatory fields.*/ \
/* Pointer to the USART registers block.*/ \
- USART_TypeDef *usart
+ USART_TypeDef *usart;
/*===========================================================================*/
/* Driver macros. */
diff --git a/os/hal/platforms/Win32/serial_lld.h b/os/hal/platforms/Win32/serial_lld.h index 936ff2a7a..c5d1f9c71 100644 --- a/os/hal/platforms/Win32/serial_lld.h +++ b/os/hal/platforms/Win32/serial_lld.h @@ -126,7 +126,7 @@ typedef struct { /* Data socket for simulated serial port.*/ \
SOCKET com_data; \
/* Port readable name.*/ \
- const char *com_name
+ const char *com_name;
/*===========================================================================*/
/* External declarations. */
diff --git a/os/hal/src/serial.c b/os/hal/src/serial.c index 49355ec33..9b5219fca 100644 --- a/os/hal/src/serial.c +++ b/os/hal/src/serial.c @@ -43,7 +43,7 @@ /*
* Interface implementation, the following functions just invoke the equivalent
- * queue-level function or macro. + * queue-level function or macro.
*/
static size_t writes(void *ip, const uint8_t *bp, size_t n) {
@@ -97,7 +97,7 @@ static const struct SerialDriverVMT vmt = { /*===========================================================================*/
/**
- * @brief Serial Driver initialization. + * @brief Serial Driver initialization.
*/
void sdInit(void) {
@@ -212,10 +212,11 @@ void sdIncomingDataI(SerialDriver *sdp, uint8_t b) { * the interrupt source when this happens).
*/
msg_t sdRequestDataI(SerialDriver *sdp) {
+ msg_t b;
chDbgCheck(sdp != NULL, "sdRequestDataI");
- msg_t b = chOQGetI(&sdp->oqueue);
+ b = chOQGetI(&sdp->oqueue);
if (b < Q_OK)
chEvtBroadcastI(&sdp->oevent);
return b;
diff --git a/os/hal/templates/serial_lld.h b/os/hal/templates/serial_lld.h index 47989e211..7ee255fa9 100644 --- a/os/hal/templates/serial_lld.h +++ b/os/hal/templates/serial_lld.h @@ -67,7 +67,7 @@ typedef struct { * @brief @p SerialDriver specific data.
*/
#define _serial_driver_data \
- _base_asynchronous_channel_data; \
+ _base_asynchronous_channel_data \
/* Driver state.*/ \
sdstate_t state; \
/* Current configuration data.*/ \
|