Updated queues.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6112 35acf78f-673a-0410-8e92-d51de3d6d3f4

5 files changed, 22 insertions, 20 deletions

diff --git a/os/hal/include/hal_queues.h b/os/hal/include/hal_queues.h
index c49d68eb9..f0487fa0f 100644
--- a/os/hal/include/hal_queues.h
+++ b/os/hal/include/hal_queues.h
@@ -346,16 +346,16 @@ typedef GenericQueue OutputQueue;
 #ifdef __cplusplus

 extern "C" {

 #endif

-  void iqInit(InputQueue *iqp, uint8_t *bp, size_t size, qnotify_t infy,

-              void *link);

+  void iqObjectInit(InputQueue *iqp, uint8_t *bp, size_t size,

+                    qnotify_t infy, void *link);

   void iqResetI(InputQueue *iqp);

   msg_t iqPutI(InputQueue *iqp, uint8_t b);

   msg_t iqGetTimeout(InputQueue *iqp, systime_t time);

   size_t iqReadTimeout(InputQueue *iqp, uint8_t *bp,

                        size_t n, systime_t time);

 

-  void oqInit(OutputQueue *oqp, uint8_t *bp, size_t size, qnotify_t onfy,

-              void *link);

+  void oqObjectInit(OutputQueue *oqp, uint8_t *bp, size_t size,

+                    qnotify_t onfy, void *link);

   void oqResetI(OutputQueue *oqp);

   msg_t oqPutTimeout(OutputQueue *oqp, uint8_t b, systime_t time);

   msg_t oqGetI(OutputQueue *oqp);

@@ -383,12 +383,14 @@ extern "C" {
 #define oqIsEmptyI(oqp)                     chOQIsEmptyI(oqp)

 #define oqIsFullI(oqp)                      chOQIsFullI(oqp)

 #define oqPut(oqp, b)                       chOQPut(oqp, b)

-#define iqInit(iqp, bp, size, infy, link)   chIQInit(iqp, bp, size, infy, link)

+#define iqObjectInit(iqp, bp, size, infy, link)                             \

+  chIQObjectInit(iqp, bp, size, infy, link)

 #define iqResetI(iqp)                       chIQResetI(iqp)

 #define iqPutI(iqp, b)                      chIQPutI(iqp, b)

 #define iqGetTimeout(iqp, time)             chIQGetTimeout(iqp, time)

 #define iqReadTimeout(iqp, bp, n, time)     chIQReadTimeout(iqp, bp, n, time)

-#define oqInit(oqp, bp, size, onfy, link)   chOQInit(oqp, bp, size, onfy, link)

+#define oqObjectInit(oqp, bp, size, onfy, link)                             \

+  chOQObjectInit(oqp, bp, size, onfy, link)

 #define oqResetI(oqp)                       chOQResetI(oqp)

 #define oqPutTimeout(oqp, b, time)          chOQPutTimeout(oqp, b, time)

 #define oqGetI(oqp)                         chOQGetI(oqp)

diff --git a/os/hal/platforms/STM32/USARTv2/serial_lld.c b/os/hal/platforms/STM32/USARTv2/serial_lld.c
index 9e640c86e..38042003e 100644
--- a/os/hal/platforms/STM32/USARTv2/serial_lld.c
+++ b/os/hal/platforms/STM32/USARTv2/serial_lld.c
@@ -190,7 +190,7 @@ static void serve_interrupt(SerialDriver *sdp) {
 }

 

 #if STM32_SERIAL_USE_USART1 || defined(__DOXYGEN__)

-static void notify1(GenericQueue *qp) {

+static void notify1(io_queue_t *qp) {

 

   (void)qp;

   USART1->CR1 |= USART_CR1_TXEIE;

@@ -198,7 +198,7 @@ static void notify1(GenericQueue *qp) {
 #endif

 

 #if STM32_SERIAL_USE_USART2 || defined(__DOXYGEN__)

-static void notify2(GenericQueue *qp) {

+static void notify2(io_queue_t *qp) {

 

   (void)qp;

   USART2->CR1 |= USART_CR1_TXEIE;

@@ -206,7 +206,7 @@ static void notify2(GenericQueue *qp) {
 #endif

 

 #if STM32_SERIAL_USE_USART3 || defined(__DOXYGEN__)

-static void notify3(GenericQueue *qp) {

+static void notify3(io_queue_t *qp) {

 

   (void)qp;

   USART3->CR1 |= USART_CR1_TXEIE;

@@ -214,7 +214,7 @@ static void notify3(GenericQueue *qp) {
 #endif

 

 #if STM32_SERIAL_USE_UART4 || defined(__DOXYGEN__)

-static void notify4(GenericQueue *qp) {

+static void notify4(io_queue_t *qp) {

 

   (void)qp;

   UART4->CR1 |= USART_CR1_TXEIE;

@@ -222,7 +222,7 @@ static void notify4(GenericQueue *qp) {
 #endif

 

 #if STM32_SERIAL_USE_UART5 || defined(__DOXYGEN__)

-static void notify5(GenericQueue *qp) {

+static void notify5(io_queue_t *qp) {

 

   (void)qp;

   UART5->CR1 |= USART_CR1_TXEIE;

@@ -230,7 +230,7 @@ static void notify5(GenericQueue *qp) {
 #endif

 

 #if STM32_SERIAL_USE_USART6 || defined(__DOXYGEN__)

-static void notify6(GenericQueue *qp) {

+static void notify6(io_queue_t *qp) {

 

   (void)qp;

   USART6->CR1 |= USART_CR1_TXEIE;

diff --git a/os/hal/platforms/STM32/USARTv2/serial_lld.h b/os/hal/platforms/STM32/USARTv2/serial_lld.h
index 743cb0b50..ac7415895 100644
--- a/os/hal/platforms/STM32/USARTv2/serial_lld.h
+++ b/os/hal/platforms/STM32/USARTv2/serial_lld.h
@@ -240,9 +240,9 @@ typedef struct {
   /* Driver state.*/                                                        \

   sdstate_t                 state;                                          \

   /* Input queue.*/                                                         \

-  InputQueue                iqueue;                                         \

+  input_queue_t             iqueue;                                         \

   /* Output queue.*/                                                        \

-  OutputQueue               oqueue;                                         \

+  output_queue_t               oqueue;                                      \

   /* Input circular buffer.*/                                               \

   uint8_t                   ib[SERIAL_BUFFERS_SIZE];                        \

   /* Output circular buffer.*/                                              \

diff --git a/os/hal/src/hal_queues.c b/os/hal/src/hal_queues.c
index 5a4465652..71330854e 100644
--- a/os/hal/src/hal_queues.c
+++ b/os/hal/src/hal_queues.c
@@ -59,8 +59,8 @@
  *

  * @init

  */

-void iqInit(InputQueue *iqp, uint8_t *bp, size_t size, qnotify_t infy,

-            void *link) {

+void iqObjectInit(InputQueue *iqp, uint8_t *bp, size_t size,

+                  qnotify_t infy, void *link) {

 

   osalQueueObjectInit(&iqp->q_waiting);

   iqp->q_counter = 0;

@@ -237,8 +237,8 @@ size_t iqReadTimeout(InputQueue *iqp, uint8_t *bp,
  *

  * @init

  */

-void oqInit(OutputQueue *oqp, uint8_t *bp, size_t size, qnotify_t onfy,

-              void *link) {

+void oqObjectInit(OutputQueue *oqp, uint8_t *bp, size_t size,

+                  qnotify_t onfy, void *link) {

 

   osalQueueObjectInit(&oqp->q_waiting);

   oqp->q_counter = size;

diff --git a/os/hal/src/serial.c b/os/hal/src/serial.c
index 73a0b7457..0b9d5b41d 100644
--- a/os/hal/src/serial.c
+++ b/os/hal/src/serial.c
@@ -134,8 +134,8 @@ void sdObjectInit(SerialDriver *sdp, qnotify_t inotify, qnotify_t onotify) {
   sdp->vmt = &vmt;

   osalEventObjectInit(&sdp->event);

   sdp->state = SD_STOP;

-  iqInit(&sdp->iqueue, sdp->ib, SERIAL_BUFFERS_SIZE, inotify, sdp);

-  oqInit(&sdp->oqueue, sdp->ob, SERIAL_BUFFERS_SIZE, onotify, sdp);

+  iqObjectInit(&sdp->iqueue, sdp->ib, SERIAL_BUFFERS_SIZE, inotify, sdp);

+  oqObjectInit(&sdp->oqueue, sdp->ob, SERIAL_BUFFERS_SIZE, onotify, sdp);

 }

 

 /**