summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJennifer Averett <Jennifer.Averett@OARcorp.com>2005-04-29 13:50:05 +0000
committerJennifer Averett <Jennifer.Averett@OARcorp.com>2005-04-29 13:50:05 +0000
commit16c4793093f48eca21afc76bd878825f564c18cc (patch)
tree0cb44734fb220cd3a52ce149903bbe87a1b260b8
parent2005-04-29 Jennifer Averett <jennifer.averett@oarcorp.com> (diff)
downloadrtems-16c4793093f48eca21afc76bd878825f564c18cc.tar.bz2
2005-04-29 Jennifer Averett <jennifer.averett@oarcorp.com>
* irq/irq.c, start/start.S: Removed warnings
-rw-r--r--c/src/lib/libbsp/powerpc/ep1a/ChangeLog4
-rw-r--r--c/src/lib/libbsp/powerpc/ep1a/irq/irq.c25
-rw-r--r--c/src/lib/libbsp/powerpc/ep1a/start/start.S2
3 files changed, 5 insertions, 26 deletions
diff --git a/c/src/lib/libbsp/powerpc/ep1a/ChangeLog b/c/src/lib/libbsp/powerpc/ep1a/ChangeLog
index a2ec61504f..d6fbddf5b3 100644
--- a/c/src/lib/libbsp/powerpc/ep1a/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/ep1a/ChangeLog
@@ -1,4 +1,8 @@
2005-04-29 Jennifer Averett <jennifer.averett@oarcorp.com>
+ * irq/irq.c, start/start.S: Removed warnings
+
+2005-04-29 Jennifer Averett <jennifer.averett@oarcorp.com>
+
* New BSP.
* console/config.c: New files.
diff --git a/c/src/lib/libbsp/powerpc/ep1a/irq/irq.c b/c/src/lib/libbsp/powerpc/ep1a/irq/irq.c
index 1c83338e6d..5c9a6dab5c 100644
--- a/c/src/lib/libbsp/powerpc/ep1a/irq/irq.c
+++ b/c/src/lib/libbsp/powerpc/ep1a/irq/irq.c
@@ -83,31 +83,6 @@ static inline int is_processor_irq(const rtems_irq_symbolic_name irqLine)
*/
/*
- * Caution : this function assumes the variable "internal_config"
- * is already set and that the tables it contains are still valid
- * and accessible.
- */
-static void compute_i8259_masks_from_prio ()
-{
- int i;
- int j;
- /*
- * Always mask at least current interrupt to prevent re-entrance
- */
- for (i=BSP_ISA_IRQ_LOWEST_OFFSET; i < BSP_ISA_IRQ_LOWEST_OFFSET + BSP_ISA_IRQ_NUMBER; i++) {
- * ((unsigned short*) &irq_mask_or_tbl[i]) = (1 << i);
- for (j = BSP_ISA_IRQ_LOWEST_OFFSET; j < BSP_ISA_IRQ_LOWEST_OFFSET + BSP_ISA_IRQ_NUMBER; j++) {
- /*
- * Mask interrupts at i8259 level that have a lower priority
- */
- if (internal_config->irqPrioTbl [i] > internal_config->irqPrioTbl [j]) {
- * ((unsigned short*) &irq_mask_or_tbl[i]) |= (1 << j);
- }
- }
- }
-}
-
-/*
* This function check that the value given for the irq line
* is valid.
*/
diff --git a/c/src/lib/libbsp/powerpc/ep1a/start/start.S b/c/src/lib/libbsp/powerpc/ep1a/start/start.S
index 873d729787..bdf971f73f 100644
--- a/c/src/lib/libbsp/powerpc/ep1a/start/start.S
+++ b/c/src/lib/libbsp/powerpc/ep1a/start/start.S
@@ -36,7 +36,7 @@
#include <bsp.h>
*/
-#include <asm.h>
+#include <rtems/asm.h>
#include <rtems/score/cpu.h>
#include <libcpu/io.h>
#include <ppc-asm.h>