-/**
+/*!
* \file
- * Copyright (C) 2003 Develer S.r.l. (http://www.develer.com/)
- * All Rights Reserved.
+ * <!--
+ * Copyright (C) 2003,2004 Develer S.r.l. (http://www.develer.com/)
+ * This file is part of DevLib - See devlib/README for information.
+ * -->
*
* \version $Id$
*
* \author Stefano Fedrigo <aleph@develer.com>
+ * \author Giovanni Bajo <rasky@develer.com>
*
* \brief DSP5680x CPU specific serial I/O driver
*/
-#include <DSP56F807.H>
-#include <drv/kdebug.h>
-#include <hw.h>
+/*
+ * $Log$
+ * Revision 1.4 2004/07/30 14:27:49 rasky
+ * Aggiornati alcuni file DSP56k per la nuova libreria di IRQ management
+ *
+ * Revision 1.3 2004/06/03 11:27:09 bernie
+ * Add dual-license information.
+ *
+ * Revision 1.2 2004/05/23 18:21:53 bernie
+ * Trim CVS logs and cleanup header info.
+ *
+ */
+
#include "ser.h"
#include "ser_p.h"
+#include <drv/kdebug.h>
+#include <drv/irq.h>
+#include <hw.h>
+#include <DSP56F807.H>
// GPIO E is shared with SPI (in DSP56807). Pins 0&1 are TXD0 and RXD0. To use
// the serial, we need to disable the GPIO functions on them.
struct SerialHardware hw;
struct Serial* serial;
volatile struct REG_SCI_STRUCT* regs;
- uint16_t irq_tx;
- uint16_t irq_rx;
+ IRQ_VECTOR irq_tx;
+ IRQ_VECTOR irq_rx;
};
-
static inline void enable_tx_irq_bare(volatile struct REG_SCI_STRUCT* regs)
{
regs->CR |= REG_SCI_CR_TEIE | REG_SCI_CR_TIIE;
enable_rx_irq_bare(regs);
}
-INLINE void tx_isr(struct SCI *hw)
+static void tx_isr(const struct SCI *hw)
{
+#pragma interrupt warn
volatile struct REG_SCI_STRUCT* regs = hw->regs;
if (fifo_isempty(&hw->serial->txfifo))
}
}
-INLINE void rx_isr(struct SCI *hw)
+static void rx_isr(const struct SCI *hw)
{
+#pragma interrupt warn
volatile struct REG_SCI_STRUCT* regs = hw->regs;
- hw->serial->status |= regs->SR & (SERRF_PARITYERROR |
- SERRF_RXSROVERRUN |
- SERRF_FRAMEERROR |
+ hw->serial->status |= regs->SR & (SERRF_PARITYERROR |
+ SERRF_RXSROVERRUN |
+ SERRF_FRAMEERROR |
SERRF_NOISEERROR);
-
+
if (fifo_isfull(&hw->serial->rxfifo))
hw->serial->status |= SERRF_RXFIFOOVERRUN;
else
fifo_push(&hw->serial->rxfifo, regs->DR);
-
+
// Writing anything to the status register clear the
// error bits.
regs->SR = 0;
// Clear status register (IRQ/status flags)
(void)regs->SR;
regs->SR = 0;
-
+
// Clear data register
(void)regs->DR;
-
- // Set priorities for both IRQs
+
+ // Install the handlers and set priorities for both IRQs
+ irq_install(hw->irq_tx, (isr_t)tx_isr, hw);
+ irq_install(hw->irq_rx, (isr_t)rx_isr, hw);
irq_setpriority(hw->irq_tx, IRQ_PRIORITY_SCI_TX);
irq_setpriority(hw->irq_rx, IRQ_PRIORITY_SCI_RX);
// Activate the RX error interrupts, and RX/TX transmissions
regs->CR = REG_SCI_CR_TE | REG_SCI_CR_RE;
enable_rx_irq_bare(regs);
-
+
// Disable GPIO pins for TX and RX lines
REG_GPIO_SERIAL->PER |= REG_GPIO_SERIAL_MASK;
static struct SCI SCIDescs[2] =
{
- {
- .hw = { .table = &SCI_VT },
- .regs = ®_SCI[0],
- .irq_rx = IRQ_SCI0_RECEIVER_FULL,
- .irq_tx = IRQ_SCI0_TRANSMITTER_READY,
- },
-
- {
- .hw = { .table = &SCI_VT },
+ {
+ .hw = { .table = &SCI_VT },
+ .regs = ®_SCI[0],
+ .irq_rx = IRQ_SCI0_RECEIVER_FULL,
+ .irq_tx = IRQ_SCI0_TRANSMITTER_READY,
+ },
+
+ {
+ .hw = { .table = &SCI_VT },
.regs = ®_SCI[1],
- .irq_rx = IRQ_SCI1_RECEIVER_FULL,
- .irq_tx = IRQ_SCI1_TRANSMITTER_READY,
- },
+ .irq_rx = IRQ_SCI1_RECEIVER_FULL,
+ .irq_tx = IRQ_SCI1_TRANSMITTER_READY,
+ },
};
-
-void ser_hw_tx_isr_0(void);
-void ser_hw_tx_isr_0(void)
-{
-#pragma interrupt warn
- tx_isr(&SCIDescs[0]);
-}
-
-void ser_hw_rx_isr_0(void);
-void ser_hw_rx_isr_0(void)
-{
-#pragma interrupt warn
- rx_isr(&SCIDescs[0]);
-}
-
-void ser_hw_tx_isr_1(void);
-void ser_hw_tx_isr_1(void)
-{
-#pragma interrupt warn
- tx_isr(&SCIDescs[1]);
-}
-
-void ser_hw_rx_isr_1(void);
-void ser_hw_rx_isr_1(void)
-{
-#pragma interrupt warn
- rx_isr(&SCIDescs[1]);
-}
-
struct SerialHardware* ser_hw_getdesc(int unit)
{
ASSERT(unit < 2);