1 files changed, 59 insertions, 7 deletions

diff --git a/drivers/serial/serial_lpc2292.c b/drivers/serial/serial_lpc2292.c
index e3a60b6cb..2601ee79c 100644
--- a/drivers/serial/serial_lpc2292.c
+++ b/drivers/serial/serial_lpc2292.c
@@ -33,7 +33,7 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-void serial_setbrg (void)
+static void lpc2292_serial_setbrg(void)
 {
 	unsigned short divisor = 0;
 
@@ -57,7 +57,7 @@ void serial_setbrg (void)
 	PUT8(U0FCR, 1);		/* Enable RX and TX FIFOs */
 }
 
-int serial_init (void)
+static int lpc2292_serial_init(void)
 {
 	unsigned long pinsel0;
 
@@ -71,7 +71,7 @@ int serial_init (void)
 	return (0);
 }
 
-void serial_putc (const char c)
+static void lpc2292_serial_putc(const char c)
 {
 	if (c == '\n')
 	{
@@ -83,14 +83,13 @@ void serial_putc (const char c)
 	PUT8(U0THR, c);
 }
 
-int serial_getc (void)
+static int lpc2292_serial_getc(void)
 {
 	while((GET8(U0LSR) & 1) == 0);
 	return GET8(U0RBR);
 }
 
-void
-serial_puts (const char *s)
+static void lpc2292_serial_puts(const char *s)
 {
 	while (*s) {
 		serial_putc (*s++);
@@ -98,7 +97,60 @@ serial_puts (const char *s)
 }
 
 /* Test if there is a byte to read */
-int serial_tstc (void)
+static int lpc2292_serial_tstc(void)
 {
 	return (GET8(U0LSR) & 1);
 }
+
+#ifdef CONFIG_SERIAL_MULTI
+static struct serial_device lpc2292_serial_drv = {
+	.name	= "lpc2292_serial",
+	.start	= lpc2292_serial_init,
+	.stop	= NULL,
+	.setbrg	= lpc2292_serial_setbrg,
+	.putc	= lpc2292_serial_putc,
+	.puts	= lpc2292_serial_puts,
+	.getc	= lpc2292_serial_getc,
+	.tstc	= lpc2292_serial_tstc,
+};
+
+void lpc2292_serial_initialize(void)
+{
+	serial_register(&lpc2292_serial_drv);
+}
+
+__weak struct serial_device *default_serial_console(void)
+{
+	return &lpc2292_serial_drv;
+}
+#else
+int serial_init(void)
+{
+	return lpc2292_serial_init();
+}
+
+void serial_setbrg(void)
+{
+	lpc2292_serial_setbrg();
+}
+
+void serial_putc(const char c)
+{
+	lpc2292_serial_putc(c);
+}
+
+void serial_puts(const char *s)
+{
+	lpc2292_serial_puts(s);
+}
+
+int serial_getc(void)
+{
+	return lpc2292_serial_getc();
+}
+
+int serial_tstc(void)
+{
+	return lpc2292_serial_tstc();
+}
+#endif