[rtems commit] bsps: Add simple console output char
Sebastian Huber
sebh at rtems.org
Sun Oct 27 18:36:16 UTC 2013
Module: rtems
Branch: master
Commit: f61925039138d3337e8a5b16a5f169cf13fae273
Changeset: http://git.rtems.org/rtems/commit/?id=f61925039138d3337e8a5b16a5f169cf13fae273
Author: Sebastian Huber <sebastian.huber at embedded-brains.de>
Date: Sun Oct 27 19:13:47 2013 +0100
bsps: Add simple console output char
---
c/src/lib/libbsp/arm/realview-pbx-a9/Makefile.am | 1 +
.../arm/realview-pbx-a9/console/console-config.c | 31 -------------
c/src/lib/libbsp/shared/console-output-char.c | 46 ++++++++++++++++++++
3 files changed, 47 insertions(+), 31 deletions(-)
diff --git a/c/src/lib/libbsp/arm/realview-pbx-a9/Makefile.am b/c/src/lib/libbsp/arm/realview-pbx-a9/Makefile.am
index e97c120..a472cc2 100644
--- a/c/src/lib/libbsp/arm/realview-pbx-a9/Makefile.am
+++ b/c/src/lib/libbsp/arm/realview-pbx-a9/Makefile.am
@@ -113,6 +113,7 @@ libbsp_a_SOURCES += ../../shared/console_control.c
libbsp_a_SOURCES += ../../shared/console_read.c
libbsp_a_SOURCES += ../../shared/console_select.c
libbsp_a_SOURCES += ../../shared/console_write.c
+libbsp_a_SOURCES += ../../shared/console-output-char.c
libbsp_a_SOURCES += ../../shared/get-serial-mouse-ps2.c
libbsp_a_SOURCES += ../shared/arm-pl011.c
libbsp_a_SOURCES += ../shared/arm-pl050.c
diff --git a/c/src/lib/libbsp/arm/realview-pbx-a9/console/console-config.c b/c/src/lib/libbsp/arm/realview-pbx-a9/console/console-config.c
index 0276c1c..9dca8d1 100644
--- a/c/src/lib/libbsp/arm/realview-pbx-a9/console/console-config.c
+++ b/c/src/lib/libbsp/arm/realview-pbx-a9/console/console-config.c
@@ -63,34 +63,3 @@ console_tbl Console_Configuration_Ports[] = {
unsigned long Console_Configuration_Count =
RTEMS_ARRAY_SIZE(Console_Configuration_Ports);
-
-static void output_char(char c)
-{
- int minor = (int) Console_Port_Minor;
- const console_tbl *ct = Console_Port_Tbl != NULL ?
- Console_Port_Tbl[minor] : &Console_Configuration_Ports[minor];
- const console_fns *cf = ct->pDeviceFns;
-
- if (c == '\n') {
- (*cf->deviceWritePolled)(minor, '\r');
- }
-
- (*cf->deviceWritePolled)(minor, c);
-}
-
-static void output_char_init(char c)
-{
- if (Console_Port_Tbl == NULL) {
- int minor = (int) Console_Port_Minor;
- const console_fns *cf = Console_Configuration_Ports[minor].pDeviceFns;
-
- (*cf->deviceInitialize)(minor);
- }
-
- BSP_output_char = output_char;
- output_char(c);
-}
-
-BSP_output_char_function_type BSP_output_char = output_char_init;
-
-BSP_polling_getchar_function_type BSP_poll_char = NULL;
diff --git a/c/src/lib/libbsp/shared/console-output-char.c b/c/src/lib/libbsp/shared/console-output-char.c
new file mode 100644
index 0000000..358cacd
--- /dev/null
+++ b/c/src/lib/libbsp/shared/console-output-char.c
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2013 embedded brains GmbH. All rights reserved.
+ *
+ * embedded brains GmbH
+ * Dornierstr. 4
+ * 82178 Puchheim
+ * Germany
+ * <info at embedded-brains.de>
+ *
+ * The license and distribution terms for this file may be
+ * found in the file LICENSE in this distribution or at
+ * http://www.rtems.com/license/LICENSE.
+ */
+
+#include <libchip/serial.h>
+
+static void output_char(char c)
+{
+ int minor = (int) Console_Port_Minor;
+ const console_tbl *ct = Console_Port_Tbl != NULL ?
+ Console_Port_Tbl[minor] : &Console_Configuration_Ports[minor];
+ const console_fns *cf = ct->pDeviceFns;
+
+ if (c == '\n') {
+ (*cf->deviceWritePolled)(minor, '\r');
+ }
+
+ (*cf->deviceWritePolled)(minor, c);
+}
+
+static void output_char_init(char c)
+{
+ if (Console_Port_Tbl == NULL) {
+ int minor = (int) Console_Port_Minor;
+ const console_fns *cf = Console_Configuration_Ports[minor].pDeviceFns;
+
+ (*cf->deviceInitialize)(minor);
+ }
+
+ BSP_output_char = output_char;
+ output_char(c);
+}
+
+BSP_output_char_function_type BSP_output_char = output_char_init;
+
+BSP_polling_getchar_function_type BSP_poll_char = NULL;
More information about the vc
mailing list