summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@oarcorp.com>2012-05-07 18:26:51 -0500
committerJoel Sherrill <joel.sherrill@oarcorp.com>2012-05-09 16:56:33 -0500
commita29909cb87b5dce4385b78c55fa1ac4cbd14a779 (patch)
tree01e14e60f56ea1d0f0b1e51d6b149766204c6f01
parentc424bb544e91c17c59d6076b0071907de74d1a88 (diff)
downloadrtems-a29909cb87b5dce4385b78c55fa1ac4cbd14a779.tar.bz2
libchip/serial - Only use set_vector() on Simple Vectored Architectures
-rw-r--r--c/src/libchip/serial/mc68681.c7
-rw-r--r--c/src/libchip/serial/z85c30.c6
2 files changed, 11 insertions, 2 deletions
diff --git a/c/src/libchip/serial/mc68681.c b/c/src/libchip/serial/mc68681.c
index 1a2e2f178f..47781c2157 100644
--- a/c/src/libchip/serial/mc68681.c
+++ b/c/src/libchip/serial/mc68681.c
@@ -55,7 +55,10 @@ console_fns mc68681_fns_polled =
false, /* deviceOutputUsesInterrupts */
};
-extern void set_vector( rtems_isr_entry, rtems_vector_number, int );
+
+#if (CPU_SIMPLE_VECTORED_INTERRUPTS == TRUE)
+ extern void set_vector( rtems_isr_entry, rtems_vector_number, int );
+#endif
/*
* Console Device Driver Entry Points
@@ -432,7 +435,9 @@ MC68681_STATIC void mc68681_initialize_interrupts(int minor)
Console_Port_Data[minor].bActive = FALSE;
+#if (CPU_SIMPLE_VECTORED_INTERRUPTS == TRUE)
set_vector(mc68681_isr, Console_Port_Tbl[minor]->ulIntVector, 1);
+#endif
mc68681_enable_interrupts(minor,MC68681_IMR_ENABLE_ALL_EXCEPT_TX);
}
diff --git a/c/src/libchip/serial/z85c30.c b/c/src/libchip/serial/z85c30.c
index e6adf337a1..f5ebde84f6 100644
--- a/c/src/libchip/serial/z85c30.c
+++ b/c/src/libchip/serial/z85c30.c
@@ -80,7 +80,9 @@ console_fns z85c30_fns_polled = {
false /* deviceOutputUsesInterrupts */
};
-extern void set_vector( rtems_isr_entry, rtems_vector_number, int );
+#if (CPU_SIMPLE_VECTORED_INTERRUPTS == TRUE)
+ extern void set_vector( rtems_isr_entry, rtems_vector_number, int );
+#endif
/*
* z85c30_initialize_port
@@ -722,7 +724,9 @@ Z85C30_STATIC void z85c30_initialize_interrupts(
z85c30_negate_RTS(minor);
}
+#if (CPU_SIMPLE_VECTORED_INTERRUPTS == TRUE)
set_vector(z85c30_isr, Console_Port_Tbl[minor]->ulIntVector, 1);
+#endif
z85c30_enable_interrupts(minor, SCC_ENABLE_ALL_INTR_EXCEPT_TX);