sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[drivers/net/ftmac100] Remove private board-specific interrupt configuration calls. Configure Mode/Level outside of the driver scope.

Browse Source 
Signed-off-by: Anton D. Kachalov <mouse@yandex-team.ru>
This commit is contained in:
Anton D. Kachalov 2015-07-31 14:12:10 +03:00
parent 7613d97a90
commit 2ef03d49fe
1 changed files with 5 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
drivers/net/ftmac100.c
View File

@ -174,13 +174,6 @@ static struct ftmac100_driver_s g_ftmac100[CONFIG_FTMAC100_NINTERFACES]
* Private Function Prototypes * Private Function Prototypes
****************************************************************************/ ****************************************************************************/
/* FIXME: import low-level functions for IRQ setup */
extern inline void ftintc010_set_trig_mode(int irq, int mode);
extern inline void ftintc010_set_trig_level(int irq, int level);
extern inline void ftintc010_unmask_irq(int irq);
extern inline void ftintc010_mask_irq(int irq);
/* Common TX logic */ /* Common TX logic */
static int ftmac100_transmit(FAR struct ftmac100_driver_s *priv); static int ftmac100_transmit(FAR struct ftmac100_driver_s *priv);
@ -977,10 +970,7 @@ static void ftmac100_interrupt_work(FAR void *arg)
/* Re-enable Ethernet interrupts */ /* Re-enable Ethernet interrupts */
// up_enable_irq(CONFIG_FTMAC100_IRQ); up_enable_irq(CONFIG_FTMAC100_IRQ);
ftintc010_unmask_irq(CONFIG_FTMAC100_IRQ);
// ftintc010_set_trig_mode(CONFIG_FTMAC100_IRQ, 0);
// ftintc010_set_trig_level(CONFIG_FTMAC100_IRQ, 0);
} }
#endif #endif
@ -1018,10 +1008,7 @@ static int ftmac100_interrupt(int irq, FAR void *context)
priv->status = getreg32 (&iobase->isr); priv->status = getreg32 (&iobase->isr);
// up_disable_irq(CONFIG_FTMAC100_IRQ); up_disable_irq(CONFIG_FTMAC100_IRQ);
ftintc010_mask_irq(CONFIG_FTMAC100_IRQ);
// ftintc010_set_trig_mode(CONFIG_FTMAC100_IRQ, 1);
// ftintc010_set_trig_level(CONFIG_FTMAC100_IRQ, 1);
putreg32 (INT_MASK_ALL_DISABLED, &iobase->imr); putreg32 (INT_MASK_ALL_DISABLED, &iobase->imr);
@ -1149,10 +1136,7 @@ static void ftmac100_txtimeout_expiry(int argc, uint32_t arg, ...)
* condition with interrupt work that is already queued and in progress. * condition with interrupt work that is already queued and in progress.
*/ */
// up_disable_irq(CONFIG_FTMAC100_IRQ); up_disable_irq(CONFIG_FTMAC100_IRQ);
ftintc010_mask_irq(CONFIG_FTMAC100_IRQ);
// ftintc010_set_trig_mode(CONFIG_FTMAC100_IRQ, 1);
// ftintc010_set_trig_level(CONFIG_FTMAC100_IRQ, 1);
/* Cancel any pending poll or interrupt work. This will have no effect /* Cancel any pending poll or interrupt work. This will have no effect
* on work that has already been started. * on work that has already been started.
@ -1341,10 +1325,7 @@ static int ftmac100_ifup(struct net_driver_s *dev)
/* Enable the Ethernet interrupt */ /* Enable the Ethernet interrupt */
priv->ft_bifup = true; priv->ft_bifup = true;
// up_enable_irq(CONFIG_FTMAC100_IRQ); up_enable_irq(CONFIG_FTMAC100_IRQ);
ftintc010_unmask_irq(CONFIG_FTMAC100_IRQ);
ftintc010_set_trig_mode(CONFIG_FTMAC100_IRQ, 0);
ftintc010_set_trig_level(CONFIG_FTMAC100_IRQ, 0);
return OK; return OK;
} }
@ -1373,10 +1354,7 @@ static int ftmac100_ifdown(struct net_driver_s *dev)
/* Disable the Ethernet interrupt */ /* Disable the Ethernet interrupt */
flags = irqsave(); flags = irqsave();
// up_disable_irq(CONFIG_FTMAC100_IRQ); up_disable_irq(CONFIG_FTMAC100_IRQ);
ftintc010_mask_irq(CONFIG_FTMAC100_IRQ);
// ftintc010_set_trig_mode(CONFIG_FTMAC100_IRQ, 1);
// ftintc010_set_trig_level(CONFIG_FTMAC100_IRQ, 1);
/* Cancel the TX poll timer and TX timeout timers */ /* Cancel the TX poll timer and TX timeout timers */