diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2008-11-07 16:59:36 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2008-11-07 16:59:36 +0000 |
commit | 2c9001b17ff62f61be1677ebd789f081324fe326 (patch) | |
tree | 9d7a5cc564361a837742534250d3527a06d62081 /nuttx/arch/sh/src/sh1 | |
parent | a113aa53d96d039d28e3e54ba79b2aae6a524ca5 (diff) | |
download | px4-nuttx-2c9001b17ff62f61be1677ebd789f081324fe326.tar.gz px4-nuttx-2c9001b17ff62f61be1677ebd789f081324fe326.tar.bz2 px4-nuttx-2c9001b17ff62f61be1677ebd789f081324fe326.zip |
reconcile architectures w/o interrupt controllers
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@1153 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/arch/sh/src/sh1')
-rw-r--r-- | nuttx/arch/sh/src/sh1/sh1_head.S | 2 | ||||
-rw-r--r-- | nuttx/arch/sh/src/sh1/sh1_irq.c | 44 | ||||
-rw-r--r-- | nuttx/arch/sh/src/sh1/sh1_serial.c | 22 | ||||
-rw-r--r-- | nuttx/arch/sh/src/sh1/sh1_timerisr.c | 2 |
4 files changed, 11 insertions, 59 deletions
diff --git a/nuttx/arch/sh/src/sh1/sh1_head.S b/nuttx/arch/sh/src/sh1/sh1_head.S index 6ff129493..82e8c7175 100644 --- a/nuttx/arch/sh/src/sh1/sh1_head.S +++ b/nuttx/arch/sh/src/sh1/sh1_head.S @@ -232,7 +232,7 @@ __start0: add #4, r0 /* R0: Address of next byte to clear in BSS */ cmp/ge r0, r1 /* End of BSS? */ bt 3b /* Loop until the end of BSS */ - nop /* Delay slot + nop /* Delay slot */ /* Configure the uart so that we can get debug output as soon * as possible. diff --git a/nuttx/arch/sh/src/sh1/sh1_irq.c b/nuttx/arch/sh/src/sh1/sh1_irq.c index f56f642d5..71a43f5f2 100644 --- a/nuttx/arch/sh/src/sh1/sh1_irq.c +++ b/nuttx/arch/sh/src/sh1/sh1_irq.c @@ -88,54 +88,14 @@ void up_irqinitialize(void) } /**************************************************************************** - * Name: up_disable_irq - * - * Description: - * Disable the IRQ specified by 'irq' - * - ****************************************************************************/ - -void up_disable_irq(int irq) -{ -#warning "To be provided" -} - -/**************************************************************************** - * Name: up_enable_irq - * - * Description: - * Enable the IRQ specified by 'irq' - * - ****************************************************************************/ - -void up_enable_irq(int irq) -{ -#warning "To be provided" -} - -/**************************************************************************** - * Name: up_maskack_irq - * - * Description: - * Mask the IRQ and acknowledge it - * - ****************************************************************************/ - -void up_maskack_irq(int irq) -{ -#warning "To be provided" -} - -/**************************************************************************** - * Name: up_irqpriority + * Name: up_prioritize_irq * * Description: * set interrupt priority * ****************************************************************************/ -#warning "Should this be supported?" -void up_irqpriority(int irq, ubyte priority) +void up_prioritize_irq(int irq, int priority) { #warning "To be provided" } 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; diff --git a/nuttx/arch/sh/src/sh1/sh1_timerisr.c b/nuttx/arch/sh/src/sh1/sh1_timerisr.c index d3bf495a1..874e25647 100644 --- a/nuttx/arch/sh/src/sh1/sh1_timerisr.c +++ b/nuttx/arch/sh/src/sh1/sh1_timerisr.c @@ -104,7 +104,7 @@ void up_timerinit(void) /* Set the IRQ interrupt priority */ - up_irqpriority(STR71X_IRQ_SYSTIMER, 1); + up_prioritize_irq(STR71X_IRQ_SYSTIMER, 1); /* Attach the timer interrupt vector */ |