From 8c0cab0b098af0c99c55472ce5ed1c4e8b8c667a Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@OARcorp.com>
Date: Tue, 23 Sep 2008 14:07:19 +0000
Subject: 2008-09-23	Sebastian Huber <sebastian.huber@embedded-brains.de>

	* libchip/serial/ns16550.c: Enable interrupt code only for PowerPC or
	BSPs that support this feature.
---
 c/src/libchip/serial/ns16550.c | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

(limited to 'c/src/libchip')

diff --git a/c/src/libchip/serial/ns16550.c b/c/src/libchip/serial/ns16550.c
index 6cb0510e85..62f680076e 100644
--- a/c/src/libchip/serial/ns16550.c
+++ b/c/src/libchip/serial/ns16550.c
@@ -30,28 +30,22 @@
 #include <libchip/serial.h>
 #include <libchip/sersupp.h>
 
-#include "ns16550_p.h"
+#include <bsp.h>
 
-#if !defined(CPU_SIMPLE_VECTORED_INTERRUPTS) && !defined(__arm__)
-  #include <bsp/irq.h>
-  #define NS16550_SUPPORTED
-#endif
+#include "ns16550_p.h"
 
 #ifdef BSP_FEATURE_IRQ_EXTENSION
-  /* Nothing to do */
+  #include <bsp/irq.h>
 #elif defined BSP_FEATURE_IRQ_LEGACY
-  /* Nothing to do */
+  #include <bsp/irq.h>
 #elif defined __PPC__
+  #include <bsp/irq.h>
   #define BSP_FEATURE_IRQ_LEGACY
   #ifdef BSP_SHARED_HANDLER_SUPPORT
     #define BSP_FEATURE_IRQ_LEGACY_SHARED_HANDLER_SUPPORT
   #endif
-#else
-  #undef NS16650_SUPPORTED
 #endif
 
-#if defined(NS16550_SUPPORTED)
-
 /*
  * Flow control is only supported when using interrupts
  */
@@ -724,4 +718,3 @@ NS16550_STATIC int ns16550_inbyte_nonblocking_polled(
     return -1;
   }
 }
-#endif /* defined(NS16550_SUPPORTED) */
-- 
cgit v1.2.3