From 9ded5b25e4936008603ec842e3121e95a061a6b1 Mon Sep 17 00:00:00 2001 From: patacongo Date: Thu, 25 Nov 2010 20:55:46 +0000 Subject: uip_arp_ipin needs a struct uip_driver_s as an input git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3132 42af7a65-404d-4744-a932-0658087f49c3 --- nuttx/arch/arm/src/c5471/c5471_ethernet.c | 2 +- nuttx/arch/arm/src/lm3s/lm3s_ethernet.c | 2 +- nuttx/arch/arm/src/lpc17xx/lpc17_ethernet.c | 2 +- nuttx/arch/sim/src/up_uipdriver.c | 4 ++-- nuttx/arch/z80/src/ez80/ez80_emac.c | 2 +- nuttx/drivers/net/cs89x0.c | 4 ++-- nuttx/drivers/net/dm90x0.c | 2 +- nuttx/drivers/net/enc28j60.c | 2 +- nuttx/drivers/net/skeleton.c | 2 +- nuttx/include/net/uip/uip-arp.h | 4 ++-- nuttx/net/uip/uip_arp.c | 2 +- 11 files changed, 14 insertions(+), 14 deletions(-) diff --git a/nuttx/arch/arm/src/c5471/c5471_ethernet.c b/nuttx/arch/arm/src/c5471/c5471_ethernet.c index fe18a9ace..bcf7b89b5 100644 --- a/nuttx/arch/arm/src/c5471/c5471_ethernet.c +++ b/nuttx/arch/arm/src/c5471/c5471_ethernet.c @@ -1253,7 +1253,7 @@ static void c5471_receive(struct c5471_driver_s *c5471) if (BUF->type == HTONS(UIP_ETHTYPE_IP)) #endif { - uip_arp_ipin(); + uip_arp_ipin(dev); uip_input(dev); /* If the above function invocation resulted in data that should be diff --git a/nuttx/arch/arm/src/lm3s/lm3s_ethernet.c b/nuttx/arch/arm/src/lm3s/lm3s_ethernet.c index bf8e6a8e8..73046b6df 100644 --- a/nuttx/arch/arm/src/lm3s/lm3s_ethernet.c +++ b/nuttx/arch/arm/src/lm3s/lm3s_ethernet.c @@ -759,7 +759,7 @@ static void lm3s_receive(struct lm3s_driver_s *priv) nllvdbg("IP packet received (%02x)\n", ETHBUF->type); EMAC_STAT(priv, rx_ip); - uip_arp_ipin(); + uip_arp_ipin(&priv->ld_dev); uip_input(&priv->ld_dev); /* If the above function invocation resulted in data that should be diff --git a/nuttx/arch/arm/src/lpc17xx/lpc17_ethernet.c b/nuttx/arch/arm/src/lpc17xx/lpc17_ethernet.c index a7e18fb37..fe0ac2e43 100644 --- a/nuttx/arch/arm/src/lpc17xx/lpc17_ethernet.c +++ b/nuttx/arch/arm/src/lpc17xx/lpc17_ethernet.c @@ -974,7 +974,7 @@ static void lpc17_rxdone(struct lpc17_driver_s *priv) /* Handle the incoming Rx packet */ EMAC_STAT(priv, rx_ip); - uip_arp_ipin(); + uip_arp_ipin(&priv->lp_dev); uip_input(&priv->lp_dev); /* If the above function invocation resulted in data that diff --git a/nuttx/arch/sim/src/up_uipdriver.c b/nuttx/arch/sim/src/up_uipdriver.c index 3c2a2d578..5258022e2 100644 --- a/nuttx/arch/sim/src/up_uipdriver.c +++ b/nuttx/arch/sim/src/up_uipdriver.c @@ -1,7 +1,7 @@ /**************************************************************************** * up_uipdriver.c * - * Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved. + * Copyright (C) 2007, 2009-2010 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Based on code from uIP which also has a BSD-like license: @@ -166,7 +166,7 @@ void uipdriver_loop(void) if (BUF->ether_type == htons(UIP_ETHTYPE_IP)) #endif { - uip_arp_ipin(); + uip_arp_ipin(&g_sim_dev); uip_input(&g_sim_dev); /* If the above function invocation resulted in data that diff --git a/nuttx/arch/z80/src/ez80/ez80_emac.c b/nuttx/arch/z80/src/ez80/ez80_emac.c index f347521c2..c758cfb1b 100644 --- a/nuttx/arch/z80/src/ez80/ez80_emac.c +++ b/nuttx/arch/z80/src/ez80/ez80_emac.c @@ -1274,7 +1274,7 @@ static int ez80emac_receive(struct ez80emac_driver_s *priv) nvdbg("IP packet received (%02x)\n", ETHBUF->type); EMAC_STAT(priv, rx_ip); - uip_arp_ipin(); + uip_arp_ipin(&priv->dev); uip_input(&priv->dev); /* If the above function invocation resulted in data that should be diff --git a/nuttx/drivers/net/cs89x0.c b/nuttx/drivers/net/cs89x0.c index 89ecca76c..6ec4f4f80 100644 --- a/nuttx/drivers/net/cs89x0.c +++ b/nuttx/drivers/net/cs89x0.c @@ -1,7 +1,7 @@ /**************************************************************************** * drivers/net/cs89x0.c * - * Copyright (C) 2009 Gregory Nutt. All rights reserved. + * Copyright (C) 2009-2010 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -438,7 +438,7 @@ static void cs89x0_receive(struct cs89x0_driver_s *cs89x0, uint16_t isq) if (BUF->type == HTONS(UIP_ETHTYPE_IP)) #endif { - uip_arp_ipin(); + uip_arp_ipin(&cs89x0->cs_dev); uip_input(&cs89x0->cs_dev); /* If the above function invocation resulted in data that should be diff --git a/nuttx/drivers/net/dm90x0.c b/nuttx/drivers/net/dm90x0.c index d9973e77d..361a0dea8 100644 --- a/nuttx/drivers/net/dm90x0.c +++ b/nuttx/drivers/net/dm90x0.c @@ -992,7 +992,7 @@ static void dm9x_receive(struct dm9x_driver_s *dm9x) if (BUF->type == HTONS(UIP_ETHTYPE_IP)) #endif { - uip_arp_ipin(); + uip_arp_ipin(&dm9x->dm_dev); uip_input(&dm9x->dm_dev); /* If the above function invocation resulted in data that should be diff --git a/nuttx/drivers/net/enc28j60.c b/nuttx/drivers/net/enc28j60.c index b2dcf5658..868e860dc 100755 --- a/nuttx/drivers/net/enc28j60.c +++ b/nuttx/drivers/net/enc28j60.c @@ -1132,7 +1132,7 @@ static void enc_rxdispath(FAR struct enc_driver_s *priv) #endif { nllvdbg("IP packet received (%02x)\n", BUF->type); - uip_arp_ipin(); + uip_arp_ipin(&priv->dev); uip_input(&priv->dev); /* If the above function invocation resulted in data that should be diff --git a/nuttx/drivers/net/skeleton.c b/nuttx/drivers/net/skeleton.c index 991500710..ec9877bd5 100644 --- a/nuttx/drivers/net/skeleton.c +++ b/nuttx/drivers/net/skeleton.c @@ -264,7 +264,7 @@ static void skel_receive(FAR struct skel_driver_s *skel) if (BUF->type == HTONS(UIP_ETHTYPE_IP)) #endif { - uip_arp_ipin(); + uip_arp_ipin(&skel->sk_dev); uip_input(&skel->sk_dev); /* If the above function invocation resulted in data that should be diff --git a/nuttx/include/net/uip/uip-arp.h b/nuttx/include/net/uip/uip-arp.h index b77addde5..cf8d19d30 100644 --- a/nuttx/include/net/uip/uip-arp.h +++ b/nuttx/include/net/uip/uip-arp.h @@ -126,9 +126,9 @@ EXTERN void uip_arp_init(void); ****************************************************************************/ #ifdef CONFIG_NET_ARP_IPIN -EXTERN void uip_arp_ipin(void); +EXTERN void uip_arp_ipin(struct uip_driver_s *dev); #else -# define uip_arp_ipin() +# define uip_arp_ipin(dev) #endif /**************************************************************************** diff --git a/nuttx/net/uip/uip_arp.c b/nuttx/net/uip/uip_arp.c index 90f1ef2d3..413fcddc2 100644 --- a/nuttx/net/uip/uip_arp.c +++ b/nuttx/net/uip/uip_arp.c @@ -188,7 +188,7 @@ static void uip_arp_dump(struct arp_hdr *arp) */ #ifdef CONFIG_NET_ARP_IPIN -void uip_arp_ipin(void) +void uip_arp_ipin(struct uip_driver_s *dev) { in_addr_t srcipaddr; -- cgit v1.2.3