reconcile architectures w/o interrupt controllers

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

1 files changed, 7 insertions, 15 deletions

diff --git a/nuttx/arch/sh/src/sh1/sh1_serial.c b/nuttx/arch/sh/src/sh1/sh1_serial.c
index cfdfbe349..7578132b2 100644
--- a/nuttx/arch/sh/src/sh1/sh1_serial.c
+++ b/nuttx/arch/sh/src/sh1/sh1_serial.c
@@ -425,24 +425,16 @@ static int up_attach(struct uart_dev_s *dev)
 
   /* Attach the RDR full IRQ */
 
-  ret = irq_attach(priv->irq + , up_interrupt);
+  ret = irq_attach(priv->irq + SH1_RXI_IRQ_OFFSET, up_interrupt);
   if (ret == OK)
     {
-       /* Enable the interrupt 
-        */
+      /* Attach the TDR empty IRQ */
 
-       up_enable_irq(priv->irq);
-    }
-
-  /* Enable the RDR full and TDR empty interrupts at the interupt controller
-   * (RX and TX interrupts are still disabled in the SCI)
-   */
-
-  if (ret == OK)
-    {
-
-      up_enable_irq(priv->irq);
-      up_enable_irq(priv->irq);
+      ret = irq_attach(priv->irq + SH1_TXI_IRQ_OFFSET, up_interrupt);
+      if (ret < 0)
+        {
+          (void)irq_detach(priv->irq + SH1_RXI_IRQ_OFFSET);
+        }
     }
 
   return ret;