From dfd81f5be91be21b8bf7c364bf027531b7ec9946 Mon Sep 17 00:00:00 2001 From: gdisirio Date: Tue, 29 Dec 2009 12:42:31 +0000 Subject: git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@1478 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- os/hal/platforms/Win32/console.c | 20 ++++++++++++++++++++ os/hal/platforms/Win32/console.h | 24 ++++++++++++++++++++++++ os/hal/platforms/Win32/hal_lld.c | 10 +++++----- os/hal/platforms/Win32/serial_lld.c | 14 +++++++++++--- 4 files changed, 60 insertions(+), 8 deletions(-) (limited to 'os/hal/platforms/Win32') diff --git a/os/hal/platforms/Win32/console.c b/os/hal/platforms/Win32/console.c index e6e9a1be8..c7b71823a 100644 --- a/os/hal/platforms/Win32/console.c +++ b/os/hal/platforms/Win32/console.c @@ -28,11 +28,23 @@ #include "ch.h" #include "console.h" +/*===========================================================================*/ +/* Driver exported variables. */ +/*===========================================================================*/ + /** * @brief Console driver 1. */ BaseChannel CD1; +/*===========================================================================*/ +/* Driver local variables. */ +/*===========================================================================*/ + +/*===========================================================================*/ +/* Driver local functions. */ +/*===========================================================================*/ + static bool_t putwouldblock(void *ip) { (void)ip; @@ -65,6 +77,14 @@ static const struct BaseChannelVMT vmt = { {putwouldblock, getwouldblock, put, get} }; +/*===========================================================================*/ +/* Driver interrupt handlers. */ +/*===========================================================================*/ + +/*===========================================================================*/ +/* Driver exported functions. */ +/*===========================================================================*/ + void conInit(void) { CD1.vmt = &vmt; diff --git a/os/hal/platforms/Win32/console.h b/os/hal/platforms/Win32/console.h index e8079a042..d6f6cc9c4 100644 --- a/os/hal/platforms/Win32/console.h +++ b/os/hal/platforms/Win32/console.h @@ -26,6 +26,30 @@ #ifndef _CONSOLE_H_ #define _CONSOLE_H_ +/*===========================================================================*/ +/* Driver constants. */ +/*===========================================================================*/ + +/*===========================================================================*/ +/* Driver pre-compile time settings. */ +/*===========================================================================*/ + +/*===========================================================================*/ +/* Derived constants and error checks. */ +/*===========================================================================*/ + +/*===========================================================================*/ +/* Driver data structures and types. */ +/*===========================================================================*/ + +/*===========================================================================*/ +/* Driver macros. */ +/*===========================================================================*/ + +/*===========================================================================*/ +/* External declarations. */ +/*===========================================================================*/ + extern BaseChannel CD1; #ifdef __cplusplus diff --git a/os/hal/platforms/Win32/hal_lld.c b/os/hal/platforms/Win32/hal_lld.c index 6e36a19c6..f0446186e 100644 --- a/os/hal/platforms/Win32/hal_lld.c +++ b/os/hal/platforms/Win32/hal_lld.c @@ -28,26 +28,26 @@ #include "hal.h" /*===========================================================================*/ -/* Low Level Driver exported variables. */ +/* Driver exported variables. */ /*===========================================================================*/ /*===========================================================================*/ -/* Low Level Driver local variables. */ +/* Driver local variables. */ /*===========================================================================*/ static LARGE_INTEGER nextcnt; static LARGE_INTEGER slice; /*===========================================================================*/ -/* Low Level Driver local functions. */ +/* Driver local functions. */ /*===========================================================================*/ /*===========================================================================*/ -/* Low Level Driver interrupt handlers. */ +/* Driver interrupt handlers. */ /*===========================================================================*/ /*===========================================================================*/ -/* Low Level Driver exported functions. */ +/* Driver exported functions. */ /*===========================================================================*/ /** diff --git a/os/hal/platforms/Win32/serial_lld.c b/os/hal/platforms/Win32/serial_lld.c index bc4985247..68decfc01 100644 --- a/os/hal/platforms/Win32/serial_lld.c +++ b/os/hal/platforms/Win32/serial_lld.c @@ -29,6 +29,10 @@ #if CH_HAL_USE_SERIAL || defined(__DOXYGEN__) +/*===========================================================================*/ +/* Driver exported variables. */ +/*===========================================================================*/ + /** @brief Serial driver 1 identifier.*/ #if USE_WIN32_SERIAL1 || defined(__DOXYGEN__) SerialDriver SD1; @@ -38,6 +42,10 @@ SerialDriver SD1; SerialDriver SD2; #endif +/*===========================================================================*/ +/* Driver local variables. */ +/*===========================================================================*/ + /** @brief Driver default configuration.*/ static const SerialDriverConfig default_config = { }; @@ -45,7 +53,7 @@ static const SerialDriverConfig default_config = { static u_long nb = 1; /*===========================================================================*/ -/* Low Level Driver local functions. */ +/* Driver local functions. */ /*===========================================================================*/ static void init(SerialDriver *sdp, uint16_t port) { @@ -180,11 +188,11 @@ static bool_t outint(SerialDriver *sdp) { } /*===========================================================================*/ -/* Low Level Driver interrupt handlers. */ +/* Driver interrupt handlers. */ /*===========================================================================*/ /*===========================================================================*/ -/* Low Level Driver exported functions. */ +/* Driver exported functions. */ /*===========================================================================*/ /** -- cgit v1.2.3