2009-06-18 Fernando Nicodemos <fgnicodemos@terra.com.br>

	* umon/umonrtemsglue.c: Add console device that uses MicroMonitor to do
	actual input and output. This driver should work on any board that
	uses MicroMonitor.
	* umon/umoncons.c: New file.

3 files changed, 141 insertions, 1 deletions

diff --git a/c/src/lib/libbsp/shared/ChangeLog b/c/src/lib/libbsp/shared/ChangeLog
index 9c90b440b3..85bd7e9fa5 100644
--- a/c/src/lib/libbsp/shared/ChangeLog
+++ b/c/src/lib/libbsp/shared/ChangeLog
@@ -1,3 +1,10 @@
+2009-06-18	Fernando Nicodemos <fgnicodemos@terra.com.br>
+
+	* umon/umonrtemsglue.c: Add console device that uses MicroMonitor to do
+	actual input and output. This driver should work on any board that
+	uses MicroMonitor.
+	* umon/umoncons.c: New file.
+
 2009-06-17	Till Straumann <strauman@slac.stanford.edu>
 
 	* vmeUniverse/vmeUniverse.c, vmeUniverse/vmeTsi148.c:
diff --git a/c/src/lib/libbsp/shared/umon/umoncons.c b/c/src/lib/libbsp/shared/umon/umoncons.c
new file mode 100644
index 0000000000..408eb5cd6d
--- /dev/null
+++ b/c/src/lib/libbsp/shared/umon/umoncons.c
@@ -0,0 +1,133 @@
+/*
+ * uMon Support Output Driver
+ *
+ *  COPYRIGHT (c) 1989-2009.
+ *  On-Line Applications Research Corporation (OAR).
+ *
+ *  Modified by Fernando Nicodemos <fgnicodemos@terra.com.br>
+ *  from NCB - Sistemas Embarcados Ltda. (Brazil)
+ *
+ *  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.
+ *
+ *  $Id$
+ */
+
+#include <rtems/umon.h>
+#include <libchip/serial.h>
+#include <libchip/sersupp.h>
+
+/* static function prototypes */
+static int     umoncons_first_open(int major, int minor, void *arg);
+static int     umoncons_last_close(int major, int minor, void *arg);
+static int     umoncons_read(int minor);
+static int     umoncons_write(int minor, const char *buf, int len);
+static void    umoncons_init(int minor);
+static void    umoncons_write_polled(int minor, char c);
+static int     umoncons_set_attributes(int minor, const struct termios *t);
+
+/* Pointers to functions for handling the UART. */
+console_fns umoncons_fns = 
+{ 
+  libchip_serial_default_probe,
+  umoncons_first_open,
+  umoncons_last_close,
+  umoncons_read,
+  umoncons_write,
+  umoncons_init,
+  umoncons_write_polled,   /* not used in this driver */
+  umoncons_set_attributes,
+  false                    /* TRUE if interrupt driven, FALSE if not. */
+};
+
+/*********************************************************************/
+/* Functions called via callbacks (i.e. the ones in uart_fns */
+/*********************************************************************/
+
+/* 
+ * This is called the first time each device is opened. Since
+ * the driver is polled, we don't have to do anything. If the driver 
+ * were interrupt driven, we'd enable interrupts here. 
+*/
+static int umoncons_first_open(int major, int minor, void *arg) 
+{
+  return 0;
+}
+
+
+/* 
+ * This is called the last time each device is closed.  Since
+ * the driver is polled, we don't have to do anything. If the driver 
+ * were interrupt driven, we'd disable interrupts here. 
+*/
+static int umoncons_last_close(int major, int minor, void *arg) 
+{
+  return 0;
+}
+
+
+/*
+ * Read one character from UART.
+ *
+ * return -1 if there's no data, otherwise return
+ * the character in lowest 8 bits of returned int.
+*/
+static int umoncons_read(int minor) 
+{
+  if ( !mon_gotachar() )
+    return -1;
+  return mon_getchar();
+}
+
+
+/* 
+ * Write buffer to LCD 
+ *
+ * return 1 on success, -1 on error
+*/
+static int umoncons_write(int minor, const char *buf, int len)
+{
+  int i;
+
+  for ( i=0 ; i<len ; i++ )
+    mon_putchar( buf[i] );
+
+  return 1;
+}
+
+
+/* Set up the uMon driver. */
+static void umoncons_init(int minor)
+{
+  rtems_umon_connect();
+}
+
+/* This is used for putchark support */
+static void umoncons_write_polled(int minor, char c)
+{
+  mon_putchar( c );
+}
+
+/* This is for setting baud rate, bits, etc. */
+static int umoncons_set_attributes(int minor, const struct termios *t) 
+{
+  return 0;
+}
+
+/***********************************************************************/
+/*
+ * The following functions are not used by TERMIOS, but other RTEMS
+ * functions use them instead.
+ */
+/***********************************************************************/
+/* 
+ * Read from UART. This is used in the exit code, and can't
+ * rely on interrupts.
+*/
+int umoncons_poll_read(int minor)
+{
+  if (!mon_gotachar())
+    return -1;
+  return mon_getchar();
+}
diff --git a/c/src/lib/libbsp/shared/umon/umonrtemsglue.c b/c/src/lib/libbsp/shared/umon/umonrtemsglue.c
index 0d38f4dbf8..782395117e 100644
--- a/c/src/lib/libbsp/shared/umon/umonrtemsglue.c
+++ b/c/src/lib/libbsp/shared/umon/umonrtemsglue.c
@@ -9,7 +9,7 @@
  *  $Id$
  */
 
-#include <umon/monlib.h>
+#include <rtems/umon.h>
 
 /* XXX eventually add lock/unlock methods */