From 69be08eef642107a72876c515b08168d34126d88 Mon Sep 17 00:00:00 2001
From: Ralf Corsepius <ralf.corsepius@rtems.org>
Date: Wed, 17 Dec 2008 12:48:04 +0000
Subject: =?UTF-8?q?2008-12-17=09Ralf=20Cors=C3=A9pius=20<ralf.corsepius@rt?=
 =?UTF-8?q?ems.org>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

	* libchip/serial/ns16550.c: Add CVS-Id. Fix #define mess.
---
 c/src/ChangeLog                |  4 ++++
 c/src/libchip/serial/ns16550.c | 10 +++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

(limited to 'c')

diff --git a/c/src/ChangeLog b/c/src/ChangeLog
index d9b01077a5..2dcbd432bf 100644
--- a/c/src/ChangeLog
+++ b/c/src/ChangeLog
@@ -1,3 +1,7 @@
+2008-12-17	Ralf Corsépius <ralf.corsepius@rtems.org>
+
+	* libchip/serial/ns16550.c: Add CVS-Id. Fix #define mess.
+
 2008-12-16	Joel Sherrill <joel.sherrill@oarcorp.com>
 
 	* libchip/network/i82586.c, libchip/network/smc91111config.h: Eliminate
diff --git a/c/src/libchip/serial/ns16550.c b/c/src/libchip/serial/ns16550.c
index b7c2c887b9..a5c0196613 100644
--- a/c/src/libchip/serial/ns16550.c
+++ b/c/src/libchip/serial/ns16550.c
@@ -19,6 +19,10 @@
  *
  *  This driver uses the termios pseudo driver.
  */
+ 
+/*
+ * $Id$
+ */
 
 #include <stdlib.h>
 
@@ -443,6 +447,7 @@ NS16550_STATIC int ns16550_set_attributes(
   return 0;
 }
 
+#if defined(BSP_FEATURE_IRQ_EXTENSION)
 /*
  *  ns16550_process
  *
@@ -516,6 +521,7 @@ NS16550_STATIC void ns16550_process( int minor)
  *
  *  This routine initializes the port to have the specified interrupts masked.
  */
+#endif
 
 NS16550_STATIC void ns16550_enable_interrupts(
   int minor,
@@ -554,7 +560,9 @@ NS16550_STATIC void ns16550_enable_interrupts(
  */
 NS16550_STATIC void ns16550_initialize_interrupts( int minor)
 {
+#if defined(BSP_FEATURE_IRQ_EXTENSION) || defined(BSP_FEATURE_IRQ_LEGACY)
   console_tbl *c = &Console_Port_Tbl [minor];
+#endif
   console_data *d = &Console_Port_Data [minor];
 
   ns16550_init( minor);
@@ -577,7 +585,7 @@ NS16550_STATIC void ns16550_initialize_interrupts( int minor)
         rtems_fatal_error_occurred( 0xdeadbeef);
       }
     }
-  #elif defined BSP_FEATURE_IRQ_LEGACY
+  #elif defined(BSP_FEATURE_IRQ_LEGACY)
     {
       int rv = 0;
       #ifdef BSP_FEATURE_IRQ_LEGACY_SHARED_HANDLER_SUPPORT
-- 
cgit v1.2.3