[rtems commit] mouse: Add shared bsp_get_serial_mouse_device()

[Sebastian Huber]

Module:    rtems
Branch:    master
Commit:    ad83ea03eb3184873f7c63b7077b0be6d6e692b2
Changeset: http://git.rtems.org/rtems/commit/?id=ad83ea03eb3184873f7c63b7077b0be6d6e692b2

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Sun Jul  7 14:43:17 2013 +0200

mouse: Add shared bsp_get_serial_mouse_device()

---

 c/src/lib/libbsp/arm/realview-pbx-a9/Makefile.am   |    1 +
 .../arm/realview-pbx-a9/console/console-config.c   |   15 +----------
 c/src/lib/libbsp/shared/get-serial-mouse-ps2.c     |   26 ++++++++++++++++++++
 cpukit/libmisc/mouse/serial_mouse.h                |    5 ++++
 4 files changed, 33 insertions(+), 14 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 ef8e2d6..e97c120 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/get-serial-mouse-ps2.c
 libbsp_a_SOURCES += ../shared/arm-pl011.c
 libbsp_a_SOURCES += ../shared/arm-pl050.c
 libbsp_a_SOURCES += console/console-config.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 4814ef8..0276c1c 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
@@ -21,8 +21,6 @@
 #include <bsp/arm-pl011.h>
 #include <bsp/arm-pl050.h>
 
-static const char psaux[] = "/dev/psaux";
-
 console_tbl Console_Configuration_Ports[] = {
   {
     .sDeviceName = "/dev/ttyS0",
@@ -43,7 +41,7 @@ console_tbl Console_Configuration_Ports[] = {
     .ulClock = 0,
     .ulIntVector = RVPBXA9_IRQ_UART_0
   }, {
-    .sDeviceName = &psaux[0],
+    .sDeviceName = SERIAL_MOUSE_DEVICE_PS2,
     .deviceType = SERIAL_CUSTOM,
     .pDeviceFns = &arm_pl050_fns,
     .deviceProbe = NULL,
@@ -96,14 +94,3 @@ static void output_char_init(char c)
 BSP_output_char_function_type BSP_output_char = output_char_init;
 
 BSP_polling_getchar_function_type BSP_poll_char = NULL;
-
-bool bsp_get_serial_mouse_device(
-  const char **name,
-  const char **type
-)
-{
-  *name = &psaux[0];
-  *type = "ps2";
-
-  return true;
-}
diff --git a/c/src/lib/libbsp/shared/get-serial-mouse-ps2.c b/c/src/lib/libbsp/shared/get-serial-mouse-ps2.c
new file mode 100644
index 0000000..3010795
--- /dev/null
+++ b/c/src/lib/libbsp/shared/get-serial-mouse-ps2.c
@@ -0,0 +1,26 @@
+/*
+ * 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 <rtems/serial_mouse.h>
+
+bool bsp_get_serial_mouse_device(
+  const char **name,
+  const char **type
+)
+{
+  *name = SERIAL_MOUSE_DEVICE_PS2;
+  *type = "ps2";
+
+  return true;
+}
diff --git a/cpukit/libmisc/mouse/serial_mouse.h b/cpukit/libmisc/mouse/serial_mouse.h
index 296fa2c..ffd4d05 100644
--- a/cpukit/libmisc/mouse/serial_mouse.h
+++ b/cpukit/libmisc/mouse/serial_mouse.h
@@ -38,6 +38,11 @@ extern "C" {
 #endif
 
 /**
+ * @brief Standard device file path for a PS2 mouse device.
+ */
+#define SERIAL_MOUSE_DEVICE_PS2 "/dev/psaux"
+
+/**
  *  This macro defines the serial mouse device driver entry points.
  */
 #define SERIAL_MOUSE_DRIVER_TABLE_ENTRY \