From f64a7dc6bb2ed71e294dc608ce2130891e0aa07b Mon Sep 17 00:00:00 2001 From: gdisirio Date: Fri, 11 Dec 2009 17:00:52 +0000 Subject: git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@1418 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- os/hal/platforms/Win32/console.c | 73 ++++++++++++++++++++++++++++++++++++++++ os/hal/platforms/Win32/console.h | 41 ++++++++++++++++++++++ test/coverage/Makefile | 3 +- test/coverage/console.c | 73 ---------------------------------------- test/coverage/console.h | 41 ---------------------- 5 files changed, 116 insertions(+), 115 deletions(-) create mode 100644 os/hal/platforms/Win32/console.c create mode 100644 os/hal/platforms/Win32/console.h delete mode 100644 test/coverage/console.c delete mode 100644 test/coverage/console.h diff --git a/os/hal/platforms/Win32/console.c b/os/hal/platforms/Win32/console.c new file mode 100644 index 000000000..e6e9a1be8 --- /dev/null +++ b/os/hal/platforms/Win32/console.c @@ -0,0 +1,73 @@ +/* + ChibiOS/RT - Copyright (C) 2006-2007 Giovanni Di Sirio. + + This file is part of ChibiOS/RT. + + ChibiOS/RT is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + ChibiOS/RT is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + +/** + * @file console.c + * @brief Simulator console driver code. + * @{ + */ + +#include + +#include "ch.h" +#include "console.h" + +/** + * @brief Console driver 1. + */ +BaseChannel CD1; + +static bool_t putwouldblock(void *ip) { + + (void)ip; + return FALSE; +} + +static bool_t getwouldblock(void *ip) { + + (void)ip; + return TRUE; +} + +static msg_t put(void *ip, uint8_t b, systime_t timeout) { + + (void)ip; + (void)timeout; + fputc(b, stdout); + fflush(stdout); + return RDY_OK; +} + +static msg_t get(void *ip, systime_t timeout) { + + (void)ip; + (void)timeout; + return fgetc(stdin); +} + +static const struct BaseChannelVMT vmt = { + {putwouldblock, getwouldblock, put, get} +}; + +void conInit(void) { + + CD1.vmt = &vmt; +} + +/** @} */ diff --git a/os/hal/platforms/Win32/console.h b/os/hal/platforms/Win32/console.h new file mode 100644 index 000000000..e8079a042 --- /dev/null +++ b/os/hal/platforms/Win32/console.h @@ -0,0 +1,41 @@ +/* + ChibiOS/RT - Copyright (C) 2006-2007 Giovanni Di Sirio. + + This file is part of ChibiOS/RT. + + ChibiOS/RT is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + ChibiOS/RT is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + +/** + * @file console.h + * @brief Simulator console driver header. + * @{ + */ + +#ifndef _CONSOLE_H_ +#define _CONSOLE_H_ + +extern BaseChannel CD1; + +#ifdef __cplusplus +extern "C" { +#endif + void conInit(void); +#ifdef __cplusplus +} +#endif + +#endif /* _CONSOLE_H_ */ + +/** @} */ diff --git a/test/coverage/Makefile b/test/coverage/Makefile index 37d0de1ef..788a7bc99 100644 --- a/test/coverage/Makefile +++ b/test/coverage/Makefile @@ -70,7 +70,8 @@ SRC = ${PORTSRC} \ ${TESTSRC} \ ${HALSRC} \ ${PLATFORMSRC} \ - console.c main.c + ${CHIBIOS}/os/hal/platforms/Win32/console.c \ + main.c # List ASM source files here ASRC = diff --git a/test/coverage/console.c b/test/coverage/console.c deleted file mode 100644 index e6e9a1be8..000000000 --- a/test/coverage/console.c +++ /dev/null @@ -1,73 +0,0 @@ -/* - ChibiOS/RT - Copyright (C) 2006-2007 Giovanni Di Sirio. - - This file is part of ChibiOS/RT. - - ChibiOS/RT is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. - - ChibiOS/RT is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . -*/ - -/** - * @file console.c - * @brief Simulator console driver code. - * @{ - */ - -#include - -#include "ch.h" -#include "console.h" - -/** - * @brief Console driver 1. - */ -BaseChannel CD1; - -static bool_t putwouldblock(void *ip) { - - (void)ip; - return FALSE; -} - -static bool_t getwouldblock(void *ip) { - - (void)ip; - return TRUE; -} - -static msg_t put(void *ip, uint8_t b, systime_t timeout) { - - (void)ip; - (void)timeout; - fputc(b, stdout); - fflush(stdout); - return RDY_OK; -} - -static msg_t get(void *ip, systime_t timeout) { - - (void)ip; - (void)timeout; - return fgetc(stdin); -} - -static const struct BaseChannelVMT vmt = { - {putwouldblock, getwouldblock, put, get} -}; - -void conInit(void) { - - CD1.vmt = &vmt; -} - -/** @} */ diff --git a/test/coverage/console.h b/test/coverage/console.h deleted file mode 100644 index e8079a042..000000000 --- a/test/coverage/console.h +++ /dev/null @@ -1,41 +0,0 @@ -/* - ChibiOS/RT - Copyright (C) 2006-2007 Giovanni Di Sirio. - - This file is part of ChibiOS/RT. - - ChibiOS/RT is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. - - ChibiOS/RT is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . -*/ - -/** - * @file console.h - * @brief Simulator console driver header. - * @{ - */ - -#ifndef _CONSOLE_H_ -#define _CONSOLE_H_ - -extern BaseChannel CD1; - -#ifdef __cplusplus -extern "C" { -#endif - void conInit(void); -#ifdef __cplusplus -} -#endif - -#endif /* _CONSOLE_H_ */ - -/** @} */ -- cgit v1.2.3