zcy
/
tinySA
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[KINETIS] Fix KL2x serial driver for osal compatibility 

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7144 35acf78f-673a-0410-8e92-d51de3d6d3f4
master
utzig 2014-08-06 20:34:43 +00:00
parent e48246c26a
commit 2a6b156390
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
os/hal/ports/KINETIS/KL2x/serial_lld.c
View File

@ -22,7 +22,7 @@
* @{ * @{
*/ */
#include "ch.h" #include "osal.h"
#include "hal.h" #include "hal.h"
#if HAL_USE_SERIAL || defined(__DOXYGEN__) #if HAL_USE_SERIAL || defined(__DOXYGEN__)
@ -136,7 +136,7 @@ static void preload(SerialDriver *sdp) {
* @brief Driver output notification. * @brief Driver output notification.
*/ */
#if KINETIS_SERIAL_USE_UART0 || defined(__DOXYGEN__) #if KINETIS_SERIAL_USE_UART0 || defined(__DOXYGEN__)
static void notify1(GenericQueue *qp) static void notify1(io_queue_t *qp)
{ {
(void)qp; (void)qp;
preload(&SD1); preload(&SD1);
@ -144,7 +144,7 @@ static void notify1(GenericQueue *qp)
#endif #endif
#if KINETIS_SERIAL_USE_UART1 || defined(__DOXYGEN__) #if KINETIS_SERIAL_USE_UART1 || defined(__DOXYGEN__)
static void notify2(GenericQueue *qp) static void notify2(io_queue_t *qp)
{ {
(void)qp; (void)qp;
preload(&SD2); preload(&SD2);
@ -152,7 +152,7 @@ static void notify2(GenericQueue *qp)
#endif #endif
#if KINETIS_SERIAL_USE_UART2 || defined(__DOXYGEN__) #if KINETIS_SERIAL_USE_UART2 || defined(__DOXYGEN__)
static void notify3(GenericQueue *qp) static void notify3(io_queue_t *qp)
{ {
(void)qp; (void)qp;
preload(&SD3); preload(&SD3);

4
os/hal/ports/KINETIS/KL2x/serial_lld.h
View File

@ -115,9 +115,9 @@ typedef struct {
/* Driver state.*/ \ /* Driver state.*/ \
sdstate_t state; \ sdstate_t state; \
/* Input queue.*/ \ /* Input queue.*/ \
InputQueue iqueue; \ input_queue_t iqueue; \
/* Output queue.*/ \ /* Output queue.*/ \
OutputQueue oqueue; \ output_queue_t oqueue; \
/* Input circular buffer.*/ \ /* Input circular buffer.*/ \
uint8_t ib[SERIAL_BUFFERS_SIZE]; \ uint8_t ib[SERIAL_BUFFERS_SIZE]; \
/* Output circular buffer.*/ \ /* Output circular buffer.*/ \