From 1cbf7b6019cc8e06e40fba55ad2d7c81fdd1bb3c Mon Sep 17 00:00:00 2001
From: Giovanni Di Sirio <gdisirio@gmail.com>
Date: Sun, 3 Jan 2016 14:33:37 +0000
Subject: git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@8680
 35acf78f-673a-0410-8e92-d51de3d6d3f4

---
 os/hal/include/hal_buffers.h |  4 +--
 os/hal/include/hal_queues.h  | 72 --------------------------------------------
 2 files changed, 2 insertions(+), 74 deletions(-)

(limited to 'os/hal/include')

diff --git a/os/hal/include/hal_buffers.h b/os/hal/include/hal_buffers.h
index 7ce499215..c7f731f83 100644
--- a/os/hal/include/hal_buffers.h
+++ b/os/hal/include/hal_buffers.h
@@ -128,11 +128,11 @@ typedef io_buffers_queue_t output_buffers_queue_t;
 /**
  * @brief   Computes the size of a buffers queue buffer size.
  *
- * @param[in] n         sumber of buffers in the queue
+ * @param[in] n         number of buffers in the queue
  * @param[in] size      size of the buffers
  */
 #define BQ_BUFFER_SIZE(n, size)                                             \
-  (((size_t)(size) + sizeof (size_t)) * (size_t)(n))
+  (((size_t)(size) + (sizeof (size_t)) * (size_t)(n)))
 
 /**
  * @name    Macro Functions
diff --git a/os/hal/include/hal_queues.h b/os/hal/include/hal_queues.h
index a2149f9fe..42d70953a 100644
--- a/os/hal/include/hal_queues.h
+++ b/os/hal/include/hal_queues.h
@@ -192,42 +192,6 @@ typedef io_queue_t input_queue_t;
 #define iqGet(iqp) iqGetTimeout(iqp, TIME_INFINITE)
 /** @} */
 
-/**
- * @brief   Data part of a static input queue initializer.
- * @details This macro should be used when statically initializing an
- *          input queue that is part of a bigger structure.
- *
- * @param[in] name      the name of the input queue variable
- * @param[in] buffer    pointer to the queue buffer area
- * @param[in] size      size of the queue buffer area
- * @param[in] inotify   input notification callback pointer
- * @param[in] link      application defined pointer
- */
-#define _INPUTQUEUE_DATA(name, buffer, size, inotify, link) {               \
-  NULL,                                                                     \
-  0U,                                                                       \
-  (uint8_t *)(buffer),                                                      \
-  (uint8_t *)(buffer) + (size),                                             \
-  (uint8_t *)(buffer),                                                      \
-  (uint8_t *)(buffer),                                                      \
-  (inotify),                                                                \
-  (link)                                                                    \
-}
-
-/**
- * @brief   Static input queue initializer.
- * @details Statically initialized input queues require no explicit
- *          initialization using @p iqInit().
- *
- * @param[in] name      the name of the input queue variable
- * @param[in] buffer    pointer to the queue buffer area
- * @param[in] size      size of the queue buffer area
- * @param[in] inotify   input notification callback pointer
- * @param[in] link      application defined pointer
- */
-#define INPUTQUEUE_DECL(name, buffer, size, inotify, link)                  \
-  input_queue_t name = _INPUTQUEUE_DATA(name, buffer, size, inotify, link)
-
 /**
  * @extends io_queue_t
  *
@@ -308,42 +272,6 @@ typedef io_queue_t output_queue_t;
 #define oqPut(oqp, b) oqPutTimeout(oqp, b, TIME_INFINITE)
  /** @} */
 
-/**
- * @brief   Data part of a static output queue initializer.
- * @details This macro should be used when statically initializing an
- *          output queue that is part of a bigger structure.
- *
- * @param[in] name      the name of the output queue variable
- * @param[in] buffer    pointer to the queue buffer area
- * @param[in] size      size of the queue buffer area
- * @param[in] onotify   output notification callback pointer
- * @param[in] link      application defined pointer
- */
-#define _OUTPUTQUEUE_DATA(name, buffer, size, onotify, link) {              \
-  NULL,                                                                     \
-  (size),                                                                   \
-  (uint8_t *)(buffer),                                                      \
-  (uint8_t *)(buffer) + (size),                                             \
-  (uint8_t *)(buffer),                                                      \
-  (uint8_t *)(buffer),                                                      \
-  (onotify),                                                                \
-  (link)                                                                    \
-}
-
-/**
- * @brief   Static output queue initializer.
- * @details Statically initialized output queues require no explicit
- *          initialization using @p oqInit().
- *
- * @param[in] name      the name of the output queue variable
- * @param[in] buffer    pointer to the queue buffer area
- * @param[in] size      size of the queue buffer area
- * @param[in] onotify   output notification callback pointer
- * @param[in] link      application defined pointer
- */
-#define OUTPUTQUEUE_DECL(name, buffer, size, onotify, link)                 \
-  output_queue_t name = _OUTPUTQUEUE_DATA(name, buffer, size, onotify, link)
-
 #ifdef __cplusplus
 extern "C" {
 #endif
-- 
cgit v1.2.3