From d417697df52d9ce3156d859d1fbfa22391c067c6 Mon Sep 17 00:00:00 2001
From: gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>
Date: Sat, 5 Feb 2011 08:00:28 +0000
Subject: [PATCH] Fixed bug 3173336.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/stable_2.2.x@2706 35acf78f-673a-0410-8e92-d51de3d6d3f4
---
 docs/Doxyfile           | 2 +-
 os/hal/include/serial.h | 6 ++++--
 os/kernel/include/ch.h  | 4 ++--
 readme.txt              | 3 +++
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/docs/Doxyfile b/docs/Doxyfile
index 4c04d98e5..9cb31e1e4 100644
--- a/docs/Doxyfile
+++ b/docs/Doxyfile
@@ -31,7 +31,7 @@ PROJECT_NAME           = ChibiOS/RT
 # This could be handy for archiving the generated documentation or 
 # if some version control system is used.
 
-PROJECT_NUMBER         = 2.2.0
+PROJECT_NUMBER         = 2.2.1
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
 # base path where the generated documentation will be put. 
diff --git a/os/hal/include/serial.h b/os/hal/include/serial.h
index d0e65bfc1..7a4128fcf 100644
--- a/os/hal/include/serial.h
+++ b/os/hal/include/serial.h
@@ -141,10 +141,11 @@ struct SerialDriver {
  *          be used to check different channels implementations.
  *
  * @see     chIOPutWouldBlock()
+ * @deprecated
  *
  * @api
  */
-#define sdPutWouldBlock(sdp) chOQIsFull(&(sdp)->oqueue)
+#define sdPutWouldBlock(sdp) chOQIsFullI(&(sdp)->oqueue)
 
 /**
  * @brief   Direct input check on a @p SerialDriver.
@@ -153,10 +154,11 @@ struct SerialDriver {
  *          be used to check different channels implementations.
  *
  * @see     chIOGetWouldBlock()
+ * @deprecated
  *
  * @api
  */
-#define sdGetWouldBlock(sdp) chIQIsEmpty(&(sdp)->iqueue)
+#define sdGetWouldBlock(sdp) chIQIsEmptyI(&(sdp)->iqueue)
 
 /**
  * @brief   Direct write to a @p SerialDriver.
diff --git a/os/kernel/include/ch.h b/os/kernel/include/ch.h
index f8e3c095f..613800bf4 100644
--- a/os/kernel/include/ch.h
+++ b/os/kernel/include/ch.h
@@ -46,7 +46,7 @@
 /**
  * @brief   Kernel version string.
  */
-#define CH_KERNEL_VERSION       "2.2.0"
+#define CH_KERNEL_VERSION       "2.2.1"
 
 /**
  * @brief   Kernel version major number.
@@ -61,7 +61,7 @@
 /**
  * @brief   Kernel version patch number.
  */
-#define CH_KERNEL_PATCH         0
+#define CH_KERNEL_PATCH         1
 
 /*
  * Common values.
diff --git a/readme.txt b/readme.txt
index 911be31b4..5499817d1 100644
--- a/readme.txt
+++ b/readme.txt
@@ -68,6 +68,9 @@
 *** Releases                                                              ***
 *****************************************************************************
 
+*** 2.2.1 ***
+- FIX: Fixed wrong serial driver macros (bug 3173336).
+
 *** 2.2.0 ***
 - NEW: The Cortex-Mx port now also supports the IAR and Keil compilers.
 - NEW: Improvements to the Cortex-Mx port.