summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2009-12-07 16:21:07 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2009-12-07 16:21:07 +0000
commit6789d70a66436807050328abd366e3b9b856c2cf (patch)
tree65c4a7a02325c621a52ffc675d4daf2ef75ae11f
parent2009-12-07 Ralf Corsépius <ralf.corsepius@rtems.org> (diff)
downloadrtems-6789d70a66436807050328abd366e3b9b856c2cf.tar.bz2
2009-12-07 Ralf Corsépius <ralf.corsepius@rtems.org>
* console/conio.c, console/console.c, include/conio.h: Let *getch return "int". Remove casts.
-rw-r--r--c/src/lib/libbsp/arm/gba/ChangeLog5
-rw-r--r--c/src/lib/libbsp/arm/gba/console/conio.c2
-rw-r--r--c/src/lib/libbsp/arm/gba/console/console.c2
-rw-r--r--c/src/lib/libbsp/arm/gba/include/conio.h2
4 files changed, 8 insertions, 3 deletions
diff --git a/c/src/lib/libbsp/arm/gba/ChangeLog b/c/src/lib/libbsp/arm/gba/ChangeLog
index 68a306c855..6e3f5b3d5e 100644
--- a/c/src/lib/libbsp/arm/gba/ChangeLog
+++ b/c/src/lib/libbsp/arm/gba/ChangeLog
@@ -1,3 +1,8 @@
+2009-12-07 Ralf Corsépius <ralf.corsepius@rtems.org>
+
+ * console/conio.c, console/console.c, include/conio.h:
+ Let *getch return "int". Remove casts.
+
2009-10-21 Ralf Corsépius <ralf.corsepius@rtems.org>
* make/custom/gba.cfg: Remove RTEMS_BSP_FAMILY.
diff --git a/c/src/lib/libbsp/arm/gba/console/conio.c b/c/src/lib/libbsp/arm/gba/console/conio.c
index c6dc1ca2e9..b877b35fbb 100644
--- a/c/src/lib/libbsp/arm/gba/console/conio.c
+++ b/c/src/lib/libbsp/arm/gba/console/conio.c
@@ -377,7 +377,7 @@ static unsigned char inputch = ASCII_CR; /**< input character value */
* @param None
* @return Selected char code
*/
-char gba_getch(void)
+int gba_getch(void)
{
int keyx, key = 0;
diff --git a/c/src/lib/libbsp/arm/gba/console/console.c b/c/src/lib/libbsp/arm/gba/console/console.c
index a907d2d40e..3059c9b94f 100644
--- a/c/src/lib/libbsp/arm/gba/console/console.c
+++ b/c/src/lib/libbsp/arm/gba/console/console.c
@@ -74,7 +74,7 @@ static int gba_setAttributes(int minor, const struct termios *t)
/** BSP_output_char for printk support */
BSP_output_char_function_type BSP_output_char = (BSP_output_char_function_type) gba_putch;
/** BSP_poll_char for printk support */
-BSP_polling_getchar_function_type BSP_poll_char = (BSP_polling_getchar_function_type) gba_getch;
+BSP_polling_getchar_function_type BSP_poll_char = gba_getch;
/**
* @brief Console device driver INITIALIZE entry point
diff --git a/c/src/lib/libbsp/arm/gba/include/conio.h b/c/src/lib/libbsp/arm/gba/include/conio.h
index 171aa6782d..3402279539 100644
--- a/c/src/lib/libbsp/arm/gba/include/conio.h
+++ b/c/src/lib/libbsp/arm/gba/include/conio.h
@@ -82,7 +82,7 @@ void gba_putch(char _c);
void gba_puts(const char *_str);
int gba_printf(const char *_format, ...);
void gba_gotoxy(int _x, int _y);
-char gba_getch(void);
+int gba_getch(void);
#ifdef __cplusplus