From a66602c99d316ecfb03e47dcf9b3fe4167edc580 Mon Sep 17 00:00:00 2001 From: gdisirio Date: Mon, 25 Jan 2010 18:50:35 +0000 Subject: git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@1545 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- os/hal/include/serial.h | 2 +- os/hal/platforms/AT91SAM7/serial_lld.h | 2 +- os/hal/platforms/LPC214x/serial_lld.h | 2 +- os/hal/platforms/Linux/serial_lld.h | 2 +- os/hal/platforms/STM32/serial_lld.h | 2 +- os/hal/platforms/Win32/serial_lld.h | 2 +- os/hal/src/serial.c | 7 ++++--- os/hal/templates/serial_lld.h | 2 +- os/kernel/include/channels.h | 24 ++++++++++++------------ os/kernel/include/debug.h | 6 +++--- os/kernel/include/streams.h | 6 +++--- 11 files changed, 29 insertions(+), 28 deletions(-) (limited to 'os') 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.*/ \ diff --git a/os/kernel/include/channels.h b/os/kernel/include/channels.h index 49a718f1e..663ddc9d3 100644 --- a/os/kernel/include/channels.h +++ b/os/kernel/include/channels.h @@ -31,7 +31,7 @@ * @brief @p BaseChannel specific methods. */ #define _base_channel_methods \ - _base_sequental_stream_methods; \ + _base_sequental_stream_methods \ /* Channel output check.*/ \ bool_t (*putwouldblock)(void *instance); \ /* Channel input check.*/ \ @@ -44,12 +44,12 @@ size_t (*writet)(void *instance, const uint8_t *bp, \ size_t n, systime_t time); \ /* Channel read method with timeout specification.*/ \ - size_t (*readt)(void *instance, uint8_t *bp, size_t n, systime_t time) + size_t (*readt)(void *instance, uint8_t *bp, size_t n, systime_t time); /** * @brief @p BaseChannel specific data. * @note It is empty because @p BaseChannel is only an interface without - * implementation. + * implementation. */ #define _base_channel_data \ _base_sequental_stream_data @@ -58,7 +58,7 @@ * @brief @p BaseChannel virtual methods table. */ struct BaseChannelVMT { \ - _base_channel_methods; \ + _base_channel_methods \ }; /** @@ -66,14 +66,14 @@ struct BaseChannelVMT { \ * * @brief Base channel class. * @details This class represents a generic, byte-wide, I/O channel. This class - * introduces generic I/O primitives with timeout specification. + * introduces generic I/O primitives with timeout specification. */ typedef struct { /** * Virtual Methods Table. */ const struct BaseChannelVMT *vmt; - _base_channel_data; + _base_channel_data } BaseChannel; /** @@ -209,17 +209,17 @@ typedef struct { * @brief @p BaseAsynchronousChannel specific data. */ #define _base_asynchronous_channel_data \ - _base_channel_data; \ + _base_channel_data \ /* Data Available EventSource.*/ \ EventSource ievent; \ /* Data Transmitted EventSource.*/ \ - EventSource oevent + EventSource oevent; /** * @brief @p BaseAsynchronousChannel virtual methods table. */ struct BaseAsynchronousChannelVMT { - _base_asynchronous_channel_methods; + _base_asynchronous_channel_methods }; /** @@ -227,21 +227,21 @@ struct BaseAsynchronousChannelVMT { * * @brief Base asynchronous channel class. * @details This class extends @p BaseChannel by adding event sources fields - * for asynchronous I/O for use in an event-driven environment. + * for asynchronous I/O for use in an event-driven environment. */ typedef struct { /** * Virtual Methods Table. */ const struct BaseAsynchronousChannelVMT *vmt; - _base_asynchronous_channel_data; + _base_asynchronous_channel_data } BaseAsynchronousChannel; /** * @brief Returns the write event source. * @details The write event source is broadcasted when the channel is ready * for write operations. This usually happens when the internal - * output queue becomes empty. + * output queue becomes empty. * @param[in] ip pointer to a @p BaseAsynchronousChannel or derived class * @return A pointer to an @p EventSource object. */ diff --git a/os/kernel/include/debug.h b/os/kernel/include/debug.h index 2987c3489..1584cec86 100644 --- a/os/kernel/include/debug.h +++ b/os/kernel/include/debug.h @@ -28,7 +28,7 @@ #define _DEBUG_H_ /** - * @brief Trace buffer entries. + * @brief Trace buffer entries. */ #ifndef TRACE_BUFFER_SIZE #define TRACE_BUFFER_SIZE 64 @@ -53,7 +53,7 @@ #endif /** - * @brief Trace buffer record. + * @brief Trace buffer record. */ typedef struct { void *cse_wtobjp; /**< Object where going to sleep.*/ @@ -63,7 +63,7 @@ typedef struct { } CtxSwcEvent; /** - * @brief Trace buffer header. + * @brief Trace buffer header. */ typedef struct { unsigned tb_size; /**< Trace buffer size (records).*/ diff --git a/os/kernel/include/streams.h b/os/kernel/include/streams.h index a65c2e017..624f4fd95 100644 --- a/os/kernel/include/streams.h +++ b/os/kernel/include/streams.h @@ -34,7 +34,7 @@ /* Stream write buffer method.*/ \ size_t (*write)(void *instance, const uint8_t *bp, size_t n); \ /* Stream read buffer method.*/ \ - size_t (*read)(void *instance, uint8_t *bp, size_t n) + size_t (*read)(void *instance, uint8_t *bp, size_t n); /** * @brief @p BaseSequentialStream specific data. @@ -47,7 +47,7 @@ * @brief @p BaseSequentialStream virtual methods table. */ struct BaseSequentialStreamVMT { - _base_sequental_stream_methods; + _base_sequental_stream_methods }; /** @@ -60,7 +60,7 @@ typedef struct { * Virtual Methods Table. */ const struct BaseSequentialStreamVMT *vmt; - _base_sequental_stream_data; + _base_sequental_stream_data } BaseSequentialStream; /** -- cgit v1.2.3