From 37cfe67a50e472ca5f9c2147d3fced8ca5162786 Mon Sep 17 00:00:00 2001
From: gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>
Date: Thu, 6 Jan 2011 08:19:16 +0000
Subject: [PATCH] Fixed bugs 3148525 and 3149141.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/stable_2.0.x@2583 35acf78f-673a-0410-8e92-d51de3d6d3f4
---
 os/hal/src/adc.c               | 2 +-
 os/hal/src/can.c               | 2 +-
 os/hal/src/mac.c               | 2 +-
 os/hal/src/mmc_spi.c           | 2 +-
 os/hal/src/pwm.c               | 2 +-
 os/hal/src/spi.c               | 2 +-
 os/hal/templates/meta/driver.c | 2 +-
 os/kernel/include/chqueues.h   | 2 +-
 os/kernel/src/chqueues.c       | 2 --
 readme.txt                     | 3 +++
 10 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/os/hal/src/adc.c b/os/hal/src/adc.c
index ee5db261e..5b5756eab 100644
--- a/os/hal/src/adc.c
+++ b/os/hal/src/adc.c
@@ -64,7 +64,7 @@ void adcInit(void) {
 /**
  * @brief   Initializes the standard part of a @p ADCDriver structure.
  *
- * @param[in] adcp      pointer to the @p ADCDriver object
+ * @param[out] adcp     pointer to the @p ADCDriver object
  */
 void adcObjectInit(ADCDriver *adcp) {
 
diff --git a/os/hal/src/can.c b/os/hal/src/can.c
index 60331eb53..a828147f8 100644
--- a/os/hal/src/can.c
+++ b/os/hal/src/can.c
@@ -64,7 +64,7 @@ void canInit(void) {
 /**
  * @brief   Initializes the standard part of a @p CANDriver structure.
  *
- * @param[in] canp      pointer to the @p CANDriver object
+ * @param[out] canp     pointer to the @p CANDriver object
  */
 void canObjectInit(CANDriver *canp) {
 
diff --git a/os/hal/src/mac.c b/os/hal/src/mac.c
index 3a3cb4ec8..2a9b81593 100644
--- a/os/hal/src/mac.c
+++ b/os/hal/src/mac.c
@@ -68,7 +68,7 @@ void macInit(void) {
 /**
  * @brief   Initialize the standard part of a @p MACDriver structure.
  *
- * @param[in] macp      pointer to the @p MACDriver object
+ * @param[out] macp     pointer to the @p MACDriver object
  */
 void macObjectInit(MACDriver *macp) {
 
diff --git a/os/hal/src/mmc_spi.c b/os/hal/src/mmc_spi.c
index a40e9f80d..36471fbf9 100644
--- a/os/hal/src/mmc_spi.c
+++ b/os/hal/src/mmc_spi.c
@@ -197,7 +197,7 @@ void mmcInit(void) {
 /**
  * @brief   Initializes an instance.
  *
- * @param[in] mmcp          pointer to the @p MMCDriver object
+ * @param[out] mmcp         pointer to the @p MMCDriver object
  * @param[in] spip          pointer to the SPI driver to be used as interface
  * @param[in] lscfg         low speed configuration for the SPI driver
  * @param[in] hscfg         high speed configuration for the SPI driver
diff --git a/os/hal/src/pwm.c b/os/hal/src/pwm.c
index ba8b9a736..81f3ae256 100644
--- a/os/hal/src/pwm.c
+++ b/os/hal/src/pwm.c
@@ -64,7 +64,7 @@ void pwmInit(void) {
 /**
  * @brief   Initializes the standard part of a @p PWMDriver structure.
  *
- * @param[in] pwmp      pointer to a @p PWMDriver object
+ * @param[out] pwmp     pointer to a @p PWMDriver object
  */
 void pwmObjectInit(PWMDriver *pwmp) {
 
diff --git a/os/hal/src/spi.c b/os/hal/src/spi.c
index 8b315aa60..590328c42 100644
--- a/os/hal/src/spi.c
+++ b/os/hal/src/spi.c
@@ -64,7 +64,7 @@ void spiInit(void) {
 /**
  * @brief   Initializes the standard part of a @p SPIDriver structure.
  *
- * @param[in] spip      pointer to the @p SPIDriver object
+ * @param[out] spip     pointer to the @p SPIDriver object
  */
 void spiObjectInit(SPIDriver *spip) {
 
diff --git a/os/hal/templates/meta/driver.c b/os/hal/templates/meta/driver.c
index 13757926b..3438251d3 100644
--- a/os/hal/templates/meta/driver.c
+++ b/os/hal/templates/meta/driver.c
@@ -75,7 +75,7 @@ void xxxObjectInit(XXXDriver *xxxp) {
 /**
  * @brief   Configures and activates the XXX peripheral.
  *
- * @param[in] xxxp      pointer to the @p XXXDriver object
+ * @param[out] xxxp     pointer to the @p XXXDriver object
  * @param[in] config    pointer to the @p XXXConfig object
  */
 void xxxStart(XXXDriver *xxxp, const XXXConfig *config) {
diff --git a/os/kernel/include/chqueues.h b/os/kernel/include/chqueues.h
index 6afc1eccb..7401d3dfc 100644
--- a/os/kernel/include/chqueues.h
+++ b/os/kernel/include/chqueues.h
@@ -221,7 +221,7 @@ typedef GenericQueue OutputQueue;
  * @param[in] onotify   output notification callback pointer
  */
 #define OUTPUTQUEUE_DECL(name, buffer, size, onotify)                   \
-  InputQueue name = _OUTPUTQUEUE_DATA(name, buffer, size, onotify)
+  OutputQueue name = _OUTPUTQUEUE_DATA(name, buffer, size, onotify)
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/os/kernel/src/chqueues.c b/os/kernel/src/chqueues.c
index 6e19aae25..6e96f58c7 100644
--- a/os/kernel/src/chqueues.c
+++ b/os/kernel/src/chqueues.c
@@ -193,8 +193,6 @@ size_t chIQReadTimeout(InputQueue *iqp, uint8_t *bp,
     *bp++ = *iqp->q_rdptr++;
     if (iqp->q_rdptr >= iqp->q_top)
       iqp->q_rdptr = iqp->q_buffer;
-    if (nfy)
-      nfy();
     chSysUnlock(); /* Gives a preemption chance in a controlled point.*/
     r++;
     if (--n == 0) {
diff --git a/readme.txt b/readme.txt
index e1f5f4aba..d8a8e5f36 100644
--- a/readme.txt
+++ b/readme.txt
@@ -59,8 +59,11 @@
 *****************************************************************************
 
 *** 2.0.9 ***
+- FIX: Fixed error in output queues static initializer (bug 3149141).
+- FIX: Fixed extra notifications in input queues (bug 3148525).
 - FIX: Fixed error in sdPutTimeout() macro (bug 3138763).
 - FIX: Fixed preprocessing crt0.s fail (bug 3132293).
+- Documentation related fixes.
 
 *** 2.0.8 ***
 - FIX: Fixed failed memory recovery by registry scan, improved the related