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

Fix some cloning errors

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3112 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2010-11-15 21:12:59 +00:00
parent fdb0f3b35d
commit 69ab3afaf1
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
arch/arm/src/lpc17xx/lpc17_ethernet.c
View File

@ -73,11 +73,13 @@
****************************************************************************/ ****************************************************************************/
/* CONFIG_LPC17_NINTERFACES determines the number of physical interfaces /* CONFIG_LPC17_NINTERFACES determines the number of physical interfaces
* that will be supported. * that will be supported -- unless it is more than actually supported by the
* hardware!
*/ */
#if !defined(CONFIG_LPC17_NINTERFACES) || CONFIG_LPC17_NINTERFACES > LPC17_NETHCONTROLLERS #if !defined(CONFIG_LPC17_NINTERFACES) || CONFIG_LPC17_NINTERFACES > LPC17_NETHCONTROLLERS
# define CONFIG_LPC17_NINTERFACES LPC17_NETHCONTROLLERS # undef CONFIG_LPC17_NINTERFACES
# define CONFIG_LPC17_NINTERFACES LPC17_NETHCONTROLLERS
#endif #endif
/* The logic here has a few hooks for support for multiple interfaces, but /* The logic here has a few hooks for support for multiple interfaces, but
@ -343,7 +345,7 @@ struct lpc17_driver_s
* multiple Ethernet controllers. * multiple Ethernet controllers.
*/ */
#if LM3S_NETHCONTROLLERS > 1 #if CONFIG_LPC17_NINTERFACES > 1
uint32_t lp_base; /* Ethernet controller base address */ uint32_t lp_base; /* Ethernet controller base address */
int lp_irq; /* Ethernet controller IRQ */ int lp_irq; /* Ethernet controller IRQ */
#endif #endif
@ -1326,7 +1328,7 @@ static int lpc17_ifup(struct uip_driver_s *dev)
/* Set the interrupt to the highest priority */ /* Set the interrupt to the highest priority */
#ifdef CONFIG_ARCH_IRQPRIO #ifdef CONFIG_ARCH_IRQPRIO
#if LM3S_NETHCONTROLLERS > 1 #if CONFIG_LPC17_NINTERFACES > 1
(void)up_prioritize_irq(priv->irq, CONFIG_NET_PRIORITY); (void)up_prioritize_irq(priv->irq, CONFIG_NET_PRIORITY);
#else #else
(void)up_prioritize_irq(LPC17_IRQ_ETH, CONFIG_NET_PRIORITY); (void)up_prioritize_irq(LPC17_IRQ_ETH, CONFIG_NET_PRIORITY);
@ -1365,7 +1367,7 @@ static int lpc17_ifup(struct uip_driver_s *dev)
/* Finally, enable the Ethernet interrupt at the interrupt controller */ /* Finally, enable the Ethernet interrupt at the interrupt controller */
priv->lp_ifup = true; priv->lp_ifup = true;
#if LM3S_NETHCONTROLLERS > 1 #if CONFIG_LPC17_NINTERFACES > 1
up_enable_irq(priv->irq); up_enable_irq(priv->irq);
#else #else
up_enable_irq(LPC17_IRQ_ETH); up_enable_irq(LPC17_IRQ_ETH);
@ -2270,7 +2272,7 @@ static void lpc17_ethreset(struct lpc17_driver_s *priv)
* *
****************************************************************************/ ****************************************************************************/
#if LPC17_NETHCONTROLLERS > 1 #if CONFIG_LPC17_NINTERFACES > 1
int lpc17_ethinitialize(int intf) int lpc17_ethinitialize(int intf)
#else #else
static inline int lpc17_ethinitialize(int intf) static inline int lpc17_ethinitialize(int intf)
@ -2281,7 +2283,7 @@ static inline int lpc17_ethinitialize(int intf)
int ret; int ret;
int i; int i;
DEBUGASSERT(intf < LPC17_NETHCONTROLLERS); DEBUGASSERT(intf < CONFIG_LPC17_NINTERFACES);
priv = &g_ethdrvr[intf]; priv = &g_ethdrvr[intf];
/* Turn on the ethernet MAC clock */ /* Turn on the ethernet MAC clock */
@ -2310,7 +2312,7 @@ static inline int lpc17_ethinitialize(int intf)
#endif #endif
priv->lp_dev.d_private = (void*)priv; /* Used to recover private state from dev */ priv->lp_dev.d_private = (void*)priv; /* Used to recover private state from dev */
#if LM3S_NETHCONTROLLERS > 1 #if CONFIG_LPC17_NINTERFACES > 1
# error "A mechanism to associate base address an IRQ with an interface is needed" # error "A mechanism to associate base address an IRQ with an interface is needed"
priv->lp_base = ??; /* Ethernet controller base address */ priv->lp_base = ??; /* Ethernet controller base address */
priv->lp_irq = ??; /* Ethernet controller IRQ number */ priv->lp_irq = ??; /* Ethernet controller IRQ number */
@ -2330,7 +2332,7 @@ static inline int lpc17_ethinitialize(int intf)
/* Attach the IRQ to the driver */ /* Attach the IRQ to the driver */
#if LM3S_NETHCONTROLLERS > 1 #if CONFIG_LPC17_NINTERFACES > 1
ret = irq_attach(priv->irq, lpc17_interrupt); ret = irq_attach(priv->irq, lpc17_interrupt);
#else #else
ret = irq_attach(LPC17_IRQ_ETH, lpc17_interrupt); ret = irq_attach(LPC17_IRQ_ETH, lpc17_interrupt);
@ -2359,7 +2361,7 @@ static inline int lpc17_ethinitialize(int intf)
* *
****************************************************************************/ ****************************************************************************/
#if LPC17_NETHCONTROLLERS == 1 #if CONFIG_LPC17_NINTERFACES == 1
void up_netinitialize(void) void up_netinitialize(void)
{ {
(void)lpc17_ethinitialize(0); (void)lpc17_ethinitialize(0);