6 files changed, 11 insertions, 9 deletions
diff --git a/os/io/platforms/STM32F103/serial_lld.c b/os/io/platforms/STM32F103/serial_lld.c
index f671f2be6..55074f51b 100644
--- a/os/io/platforms/STM32F103/serial_lld.c
+++ b/os/io/platforms/STM32F103/serial_lld.c
@@ -65,7 +65,7 @@ static const SerialDriverConfig default_config =
  * @param[in] u pointer to an USART I/O block
  * @param[in] config the architecture-dependent serial driver configuration
  */
-static void usart_init(USART_TypeDef *u, const SerialDriverConfig* config) {
+static void usart_init(USART_TypeDef *u, const SerialDriverConfig *config) {
 
   /*
    * Baud rate setting.
diff --git a/os/io/readme.txt b/os/io/readme.txt
index 2f13a937f..24aace302 100644
--- a/os/io/readme.txt
+++ b/os/io/readme.txt
@@ -1,3 +1,4 @@
-ChibiOS/RT I/O abstraction code, available modules:
-- PAL, digital I/O ports abstraction layer.
-- serial, abstract serial communication port using channels and events.
+ChibiOS/RT I/O abstraction layer, available drivers:
+- PAL. Digital I/O ports abstraction layer.
+- Serial. Buffered, interrupt driven, serial communication driver using OS
+  queues, channels and events.
diff --git a/os/io/templates/pal_lld.c b/os/io/templates/pal_lld.c
index b830de338..547db75b6 100644
--- a/os/io/templates/pal_lld.c
+++ b/os/io/templates/pal_lld.c
@@ -18,7 +18,7 @@
 */
 
 /**
- * @file os/io/templates/pal_lld.c
+ * @file templates/pal_lld.c
  * @brief PAL subsystem low level driver template
  * @addtogroup PAL_LLD
  * @{
diff --git a/os/io/templates/pal_lld.h b/os/io/templates/pal_lld.h
index cd68f605d..3da1c6d7d 100644
--- a/os/io/templates/pal_lld.h
+++ b/os/io/templates/pal_lld.h
@@ -18,7 +18,7 @@
 */
 
 /**
- * @file os/io/templates/pal_lld.h
+ * @file templates/pal_lld.h
  * @brief PAL subsystem low level driver header template
  * @addtogroup PAL_LLD
  * @{
diff --git a/os/io/templates/serial_lld.c b/os/io/templates/serial_lld.c
index 211307f16..505a80378 100644
--- a/os/io/templates/serial_lld.c
+++ b/os/io/templates/serial_lld.c
@@ -18,13 +18,14 @@
 */
 
 /**
- * @file os/io/templates/serial_lld.c
+ * @file templates/serial_lld.c
  * @brief Serial Driver subsystem low level driver source template
  * @addtogroup SERIAL_LLD
  * @{
  */
 
 #include <ch.h>
+#include <serial.h>
 
 /** @brief Driver default configuration.*/
 static const SerialDriverConfig default_config = {
diff --git a/os/io/templates/serial_lld.h b/os/io/templates/serial_lld.h
index 2c133f91c..ab6d8e7a2 100644
--- a/os/io/templates/serial_lld.h
+++ b/os/io/templates/serial_lld.h
@@ -18,7 +18,7 @@
 */
 
 /**
- * @file os/io/templates/serial_lld.h
+ * @file templates/serial_lld.h
  * @brief Serial Driver subsystem low level driver header template
  * @addtogroup SERIAL_LLD
  * @{
@@ -96,10 +96,10 @@ typedef struct {
 
 #ifdef __cplusplus
 extern "C" {
+#endif
   void sd_lld_init(void);
   void sd_lld_start(SerialDriver *sdp, const SerialDriverConfig *config);
   void sd_lld_stop(SerialDriver *sdp);
-#endif
 #ifdef __cplusplus
 }
 #endif