From 25ddb1c801f06a3be7171e20dcfd46d11a75f112 Mon Sep 17 00:00:00 2001 From: gdisirio Date: Fri, 19 Jul 2013 14:51:35 +0000 Subject: First cleanup pass finished, queues and streams not yet removed. git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@5999 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- os/hal/include/io_channel.h | 6 +++--- os/hal/platforms/STM32/USARTv2/serial_lld.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'os/hal') diff --git a/os/hal/include/io_channel.h b/os/hal/include/io_channel.h index af90b431e..b0c21a9ee 100644 --- a/os/hal/include/io_channel.h +++ b/os/hal/include/io_channel.h @@ -230,7 +230,7 @@ typedef struct { #define _base_asynchronous_channel_data \ _base_channel_data \ /* I/O condition event source.*/ \ - EventSource event; + event_source_t event; /** * @extends BaseChannelVMT @@ -264,11 +264,11 @@ typedef struct { * * @param[in] ip pointer to a @p BaseAsynchronousChannel or derived * class - * @return A pointer to an @p EventSource object. + * @return A pointer to an @p event_source_t object. * * @api */ -#define chnGetEventSource(ip) (&((ip)->event)) +#define chnGetevent_source_t(ip) (&((ip)->event)) /** * @brief Adds status flags to the listeners's flags mask. diff --git a/os/hal/platforms/STM32/USARTv2/serial_lld.c b/os/hal/platforms/STM32/USARTv2/serial_lld.c index 5209c499b..85f6b059c 100644 --- a/os/hal/platforms/STM32/USARTv2/serial_lld.c +++ b/os/hal/platforms/STM32/USARTv2/serial_lld.c @@ -124,7 +124,7 @@ static void usart_deinit(USART_TypeDef *u) { * @param[in] isr USART ISR register value */ static void set_error(SerialDriver *sdp, uint32_t isr) { - flagsmask_t sts = 0; + eventflags_t sts = 0; if (isr & USART_ISR_ORE) sts |= SD_OVERRUN_ERROR; -- cgit v1.2.3