Implement interrupt priority logic

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@1177 42af7a65-404d-4744-a932-0658087f49c3

1 files changed, 186 insertions, 3 deletions

diff --git a/nuttx/arch/sh/src/sh1/sh1_irq.c b/nuttx/arch/sh/src/sh1/sh1_irq.c
index 71a43f5f2..d0e2a6892 100644
--- a/nuttx/arch/sh/src/sh1/sh1_irq.c
+++ b/nuttx/arch/sh/src/sh1/sh1_irq.c
@@ -38,8 +38,11 @@
  ****************************************************************************/
 
 #include <nuttx/config.h>
+
 #include <sys/types.h>
 #include <errno.h>
+#include <debug.h>
+
 #include <nuttx/irq.h>
 
 #include "up_arch.h"
@@ -74,8 +77,6 @@ uint32 *current_regs;
 
 void up_irqinitialize(void)
 {
-#warning "To be provided"
-
   /* Currents_regs is non-NULL only while processing an interrupt */
 
   current_regs = NULL;
@@ -97,6 +98,188 @@ void up_irqinitialize(void)
 
 void up_prioritize_irq(int irq, int priority)
 {
-#warning "To be provided"
+  uint16 mask;
+  uint16 reg16;
+  uint32 reg;
+  int    shift;
+
+#ifdef CONFIG_DEBUG
+  if ((unsigned) irq > NR_IRQS || (unsigned)priority > 15)
+    {
+      dbg("Invalid parameters\n");
+      return;
+    }
+#endif
+
+  /* Get the register to set, the mask for the bits to be set, and
+   * the shift value to position the bits in the register.
+   */
+
+  switch (irq)
+    {
+#if 0 /* Not yet supported */
+    case SH1_IRQ0_IRQ:
+      mask  = SH1_IPRA_IRQ0MASK;
+      shift = SH1_IPRA_IRQ0SHIFT;
+      goto ipra;
+
+    case SH1_IRQ1_IRQ:
+      mask  = SH1_IPRA_IRQ1MASK;
+      shift = SH1_IPRA_IRQ1SHIFT;
+      goto ipra;
+
+    case SH1_IRQ2_IRQ:
+      mask  = SH1_IPRA_IRQ2MASK;
+      shift = SH1_IPRA_IRQ2SHIFT;
+      goto ipra;
+
+    case SH1_IRQ3_IRQ:
+      mask  = SH1_IPRA_IRQ3MASK;
+      shift = SH1_IPRA_IRQ3SHIFT;
+      goto ipra;
+    ipra:
+      reg   = SH1_INTC_IPRA;
+      break;
+
+    case SH1_IRQ4_IRQ:
+      mask  = SH1_IPRB_IRQ4MASK;
+      shift = SH1_IPRB_IRQ4SHIFT;
+      goto iprb;
+
+    case SH1_IRQ5_IRQ:
+      mask  = SH1_IPRB_IRQ5MASK;
+      shift = SH1_IPRB_IRQ5SHIFT;
+      goto iprb;
+
+    case SH1_IRQ6_IRQ:
+      mask  = SH1_IPRB_IRQ6MASK;
+      shift = SH1_IPRB_IRQ6SHIFT;
+      goto iprb;
+
+    case SH1_IRQ7_IRQ:
+      mask  = SH1_IPRB_IRQ7MASK;
+      shift = SH1_IPRB_IRQ7SHIFT;
+      goto iprb;
+    iprb:
+      reg   = SH1_INTC_IPRB;
+      break;
+#endif
+
+#if defined(CONFIG_SH1_DMAC0) || defined(CONFIG_SH1_DMAC1)
+    case SH1_DEI0_IRQ:
+    case SH1_DEI1_IRQ:
+      mask  = SH1_IPRC_DM01MASK;
+      shift = SH1_IPRC_DM01SHIFT;
+      goto iprc;
+#endif
+
+#if defined(CONFIG_SH1_DMAC2) || defined(CONFIG_SH1_DMAC3)
+    case SH1_DEI2_IRQ:
+    case SH1_DEI3_IRQ:
+      mask  = SH1_IPRC_DM23MASK;
+      shift = SH1_IPRC_DM23SHIFT;
+      goto iprc;
+#endif
+
+#ifdef CONFIG_SH1_ITU1
+    case SH1_IMIA1_IRQ:
+    case SH1_IMIB1_IRQ:
+    case SH1_OVI1_IRQ:
+      mask  = SH1_IPRC_ITU1MASK;
+      shift = SH1_IPRC_ITU1SHIFT;
+      goto iprc;
+#endif
+
+    case SH1_IMIA0_IRQ:
+    case SH1_IMIB0_IRQ:
+    case SH1_OVI0_IRQ:
+      mask  = SH1_IPRC_ITU0MASK;
+      shift = SH1_IPRC_ITU0SHIFT;
+      goto iprc;
+    iprc:
+      reg   = SH1_INTC_IPRC;
+      break;
+
+#if defined(CONFIG_SH1_ITU2) || defined(CONFIG_SH1_ITU3) || \
+    defined(CONFIG_SH1_ITU4) || defined(CONFIG_SH1_SCI0)
+#ifdef CONFIG_SH1_ITU2
+    case SH1_IMIA2_IRQ:
+    case SH1_IMIB2_IRQ:
+    case SH1_OVI2_IRQ:
+      mask  = SH1_IPRD_ITU2MASK;
+      shift = SH1_IPRD_ITU2SHIFT;
+      goto iprd;
+#endif
+#ifdef CONFIG_SH1_ITU3
+    case SH1_IMIA3_IRQ:
+    case SH1_IMIB3_IRQ:
+    case SH1_OVI3_IRQ:
+      mask  = SH1_IPRD_ITU3MASK;
+      shift = SH1_IPRD_ITU3SHIFT;
+      goto iprd;
+#endif
+#ifdef CONFIG_SH1_ITU4
+    case SH1_IMIA4_IRQ:
+    case SH1_IMIB4_IRQ:
+    case SH1_OVI4_IRQ:
+      mask  = SH1_IPRD_ITU4MASK;
+      shift = SH1_IPRD_ITU4SHIFT;
+      goto iprd;
+#endif
+#ifdef CONFIG_SH1_SCI0
+    case SH1_ERI0_IRQ:
+    case SH1_RXI0_IRQ:
+    case SH1_TXI0_IRQ:
+    case SH1_TEI0_IRQ:
+      mask  = SH1_IPRD_SCI0MASK;
+      shift = SH1_IPRD_SCI0SHIFT;
+      goto iprd;
+#endif
+    iprd:
+      reg   = SH1_INTC_IPRD;
+      break;
+#endif
+
+#if defined(CONFIG_SH1_SCI1) || defined(CONFIG_SH1_PCU) || \
+    defined(CONFIG_SH1_AD) || defined(CONFIG_SH1_WDT) || defined(CONFIG_SH1_CMI)
+#ifdef CONFIG_SH1_SCI1
+    case SH1_ERI1_IRQ:
+    case SH1_RXI1_IRQ:
+    case SH1_TXI1_IRQ:
+    case SH1_TEI1_IRQ:
+      mask  = SH1_IPRE_SCI1MASK;
+      shift = SH1_IPRE_SCI1SHIFT;
+      goto ipre;
+#endif
+#if defined(CONFIG_SH1_PCU) || defined(CONFIG_SH1_AD)
+    case SH1_PEI_IRQ:
+    case SH1_ADITI_IRQ:
+      mask  = SH1_IPRE_PRADMASK;
+      shift = SH1_IPRE_PRADSHIFT;
+      goto ipre;
+#endif
+#if defined(CONFIG_SH1_WDT) || defined(CONFIG_SH1_CMI)
+    case SH1_WDTITI_IRQ:
+    case SH1_CMI_IRQ:
+      mask  = SH1_IPRE_WDRFMASK;
+      shift = SH1_IPRE_WDRFSHIFT;
+      goto ipre;
+#endif
+    ipre:
+      reg   = SH1_INTC_IPRD;
+      break;
+#endif
+
+    default:
+      dbg("Disabled irq=%d\n", irq);
+      return;
+    }
+
+  /* Then set the priority bits */
+
+  reg16  = getreg16(reg);
+  reg16 &= ~mask;
+  reg16 |= (priority << shift);
+  putreg16(reg16, reg);
 }