summaryrefslogtreecommitdiffstats
path: root/c
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2008-09-23 14:07:19 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2008-09-23 14:07:19 +0000
commit8c0cab0b098af0c99c55472ce5ed1c4e8b8c667a (patch)
treed7e5cbf4b308fcf4435912b1986a93c37bdd1e67 /c
parent2008-09-23 Sebastian Huber <sebastian.huber@embedded-brains.de> (diff)
downloadrtems-8c0cab0b098af0c99c55472ce5ed1c4e8b8c667a.tar.bz2
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.
Diffstat (limited to 'c')
-rw-r--r--c/src/ChangeLog5
-rw-r--r--c/src/libchip/serial/ns16550.c17
2 files changed, 10 insertions, 12 deletions
diff --git a/c/src/ChangeLog b/c/src/ChangeLog
index ef5ceb6072..6082a18862 100644
--- a/c/src/ChangeLog
+++ b/c/src/ChangeLog
@@ -1,3 +1,8 @@
+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.
+
2008-09-22 Joel Sherrill <joel.sherrill@oarcorp.com>
* libchip/serial/ns16550.c: Fix typo.
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) */