From 1166e311b0f158fff05e3d006b21f6e51312749e Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Wed, 3 Feb 2016 11:17:15 -0600 Subject: [PATCH] Networking: Remove the HSEC argument from devif_timer. --- arch/arm/src/c5471/c5471_ethernet.c | 7 +++---- arch/arm/src/kinetis/kinetis_enet.c | 3 +-- arch/arm/src/lpc17xx/lpc17_ethernet.c | 3 +-- arch/arm/src/lpc43xx/lpc43_ethernet.c | 3 +-- arch/arm/src/sam34/sam_emac.c | 3 +-- arch/arm/src/sama5/sam_emaca.c | 3 +-- arch/arm/src/sama5/sam_emacb.c | 3 +-- arch/arm/src/sama5/sam_gmac.c | 3 +-- arch/arm/src/samv7/sam_emac.c | 3 +-- arch/arm/src/stm32/stm32_eth.c | 3 +-- arch/arm/src/stm32f7/stm32_ethernet.c | 3 +-- arch/arm/src/tiva/lm3s_ethernet.c | 3 +-- arch/arm/src/tiva/tm4c_ethernet.c | 3 +-- arch/hc/src/m9s12/m9s12_ethernet.c | 3 +-- arch/mips/src/pic32mx/pic32mx-ethernet.c | 3 +-- arch/mips/src/pic32mz/pic32mz-ethernet.c | 3 +-- arch/sim/src/up_netdriver.c | 2 +- arch/z80/src/ez80/ez80_emac.c | 3 +-- 18 files changed, 20 insertions(+), 37 deletions(-) diff --git a/arch/arm/src/c5471/c5471_ethernet.c b/arch/arm/src/c5471/c5471_ethernet.c index 761802337b..91b6cb224d 100644 --- a/arch/arm/src/c5471/c5471_ethernet.c +++ b/arch/arm/src/c5471/c5471_ethernet.c @@ -112,12 +112,11 @@ /* Timing values ************************************************************/ /* TX poll deley = 1 seconds. CLK_TCK=number of clock ticks per second */ -#define C5471_WDDELAY (1*CLK_TCK) -#define C5471_POLLHSEC (1*2) +#define C5471_WDDELAY (1*CLK_TCK) /* TX timeout = 1 minute */ -#define C5471_TXTIMEOUT (60*CLK_TCK) +#define C5471_TXTIMEOUT (60*CLK_TCK) /* Ethernet GPIO bit settings ***********************************************/ @@ -1650,7 +1649,7 @@ static void c5471_polltimer(int argc, uint32_t arg, ...) { /* If so, update TCP timing states and poll uIP for new XMIT data */ - (void)devif_timer(&c5471->c_dev, c5471_txpoll, C5471_POLLHSEC); + (void)devif_timer(&c5471->c_dev, c5471_txpoll); } /* Setup the watchdog poll timer again */ diff --git a/arch/arm/src/kinetis/kinetis_enet.c b/arch/arm/src/kinetis/kinetis_enet.c index 6cb7f32793..d9258c26fa 100644 --- a/arch/arm/src/kinetis/kinetis_enet.c +++ b/arch/arm/src/kinetis/kinetis_enet.c @@ -101,7 +101,6 @@ /* TX poll delay = 1 seconds. CLK_TCK is the number of clock ticks per second */ #define KINETIS_WDDELAY (1*CLK_TCK) -#define KINETIS_POLLHSEC (1*2) /* TX timeout = 1 minute */ @@ -887,7 +886,7 @@ static void kinetis_polltimer(int argc, uint32_t arg, ...) * we will missing TCP time state updates? */ - (void)devif_timer(&priv->dev, kinetis_txpoll, KINETIS_POLLHSEC); + (void)devif_timer(&priv->dev, kinetis_txpoll); } /* Setup the watchdog poll timer again in any case */ diff --git a/arch/arm/src/lpc17xx/lpc17_ethernet.c b/arch/arm/src/lpc17xx/lpc17_ethernet.c index 5db862d3c1..fc30eac414 100644 --- a/arch/arm/src/lpc17xx/lpc17_ethernet.c +++ b/arch/arm/src/lpc17xx/lpc17_ethernet.c @@ -152,7 +152,6 @@ /* TX poll deley = 1 seconds. CLK_TCK is the number of clock ticks per second */ #define LPC17_WDDELAY (1*CLK_TCK) -#define LPC17_POLLHSEC (1*2) /* TX timeout = 1 minute */ @@ -1512,7 +1511,7 @@ static void lpc17_poll_process(FAR struct lpc17_driver_s *priv) * transmit in progress, we will missing TCP time state updates? */ - (void)devif_timer(&priv->lp_dev, lpc17_txpoll, LPC17_POLLHSEC); + (void)devif_timer(&priv->lp_dev, lpc17_txpoll); } /* Simulate a fake receive to relaunch the data exchanges when a receive diff --git a/arch/arm/src/lpc43xx/lpc43_ethernet.c b/arch/arm/src/lpc43xx/lpc43_ethernet.c index 52f535f017..4782ac54c8 100644 --- a/arch/arm/src/lpc43xx/lpc43_ethernet.c +++ b/arch/arm/src/lpc43xx/lpc43_ethernet.c @@ -223,7 +223,6 @@ */ #define LPC43_WDDELAY (1*CLK_TCK) -#define LPC43_POLLHSEC (1*2) /* TX timeout = 1 minute */ @@ -2255,7 +2254,7 @@ static inline void lpc43_poll_process(FAR struct lpc43_ethmac_s *priv) /* Update TCP timing states and poll for new XMIT data. */ - (void)devif_timer(dev, lpc43_txpoll, LPC43_POLLHSEC); + (void)devif_timer(dev, lpc43_txpoll); /* We will, most likely end up with a buffer to be freed. But it * might not be the same one that we allocated above. diff --git a/arch/arm/src/sam34/sam_emac.c b/arch/arm/src/sam34/sam_emac.c index 882603221b..4694fb381f 100644 --- a/arch/arm/src/sam34/sam_emac.c +++ b/arch/arm/src/sam34/sam_emac.c @@ -247,7 +247,6 @@ */ #define SAM_WDDELAY (1*CLK_TCK) -#define SAM_POLLHSEC (1*2) /* TX timeout = 1 minute */ @@ -1847,7 +1846,7 @@ static inline void sam_poll_process(FAR struct sam_emac_s *priv) { /* Update TCP timing states and poll uIP for new XMIT data. */ - (void)devif_timer(dev, sam_txpoll, SAM_POLLHSEC); + (void)devif_timer(dev, sam_txpoll); } /* Setup the watchdog poll timer again */ diff --git a/arch/arm/src/sama5/sam_emaca.c b/arch/arm/src/sama5/sam_emaca.c index 4d2e61b3fe..9ce94c5dac 100644 --- a/arch/arm/src/sama5/sam_emaca.c +++ b/arch/arm/src/sama5/sam_emaca.c @@ -239,7 +239,6 @@ */ #define SAM_WDDELAY (1*CLK_TCK) -#define SAM_POLLHSEC (1*2) /* TX timeout = 1 minute */ @@ -1670,7 +1669,7 @@ static void sam_polltimer(int argc, uint32_t arg, ...) { /* Update TCP timing states and poll uIP for new XMIT data. */ - (void)devif_timer(dev, sam_txpoll, SAM_POLLHSEC); + (void)devif_timer(dev, sam_txpoll); } /* Setup the watchdog poll timer again */ diff --git a/arch/arm/src/sama5/sam_emacb.c b/arch/arm/src/sama5/sam_emacb.c index 154f241f1f..ec734e3089 100644 --- a/arch/arm/src/sama5/sam_emacb.c +++ b/arch/arm/src/sama5/sam_emacb.c @@ -327,7 +327,6 @@ */ #define SAM_WDDELAY (1*CLK_TCK) -#define SAM_POLLHSEC (1*2) /* TX timeout = 1 minute */ @@ -2267,7 +2266,7 @@ static inline void sam_poll_process(FAR struct sam_emac_s *priv) { /* Update TCP timing states and poll uIP for new XMIT data. */ - (void)devif_timer(dev, sam_txpoll, SAM_POLLHSEC); + (void)devif_timer(dev, sam_txpoll); } /* Setup the watchdog poll timer again */ diff --git a/arch/arm/src/sama5/sam_gmac.c b/arch/arm/src/sama5/sam_gmac.c index 0129d8e549..021fd84270 100644 --- a/arch/arm/src/sama5/sam_gmac.c +++ b/arch/arm/src/sama5/sam_gmac.c @@ -165,7 +165,6 @@ */ #define SAM_WDDELAY (1*CLK_TCK) -#define SAM_POLLHSEC (1*2) /* TX timeout = 1 minute */ @@ -1622,7 +1621,7 @@ static void sam_polltimer(int argc, uint32_t arg, ...) { /* Update TCP timing states and poll uIP for new XMIT data. */ - (void)devif_timer(dev, sam_txpoll, SAM_POLLHSEC); + (void)devif_timer(dev, sam_txpoll); } /* Setup the watchdog poll timer again */ diff --git a/arch/arm/src/samv7/sam_emac.c b/arch/arm/src/samv7/sam_emac.c index d493b3ecb9..4509c017cb 100644 --- a/arch/arm/src/samv7/sam_emac.c +++ b/arch/arm/src/samv7/sam_emac.c @@ -409,7 +409,6 @@ */ #define SAM_WDDELAY (1*CLK_TCK) -#define SAM_POLLHSEC (1*2) /* TX timeout = 1 minute */ @@ -2714,7 +2713,7 @@ static inline void sam_poll_process(FAR struct sam_emac_s *priv) { /* Update TCP timing states and poll the network for new XMIT data. */ - (void)devif_timer(dev, sam_txpoll, SAM_POLLHSEC); + (void)devif_timer(dev, sam_txpoll); } /* Setup the watchdog poll timer again */ diff --git a/arch/arm/src/stm32/stm32_eth.c b/arch/arm/src/stm32/stm32_eth.c index c534a01f7b..cf954775ae 100644 --- a/arch/arm/src/stm32/stm32_eth.c +++ b/arch/arm/src/stm32/stm32_eth.c @@ -267,7 +267,6 @@ */ #define STM32_WDDELAY (1*CLK_TCK) -#define STM32_POLLHSEC (1*2) /* TX timeout = 1 minute */ @@ -2325,7 +2324,7 @@ static inline void stm32_poll_process(FAR struct stm32_ethmac_s *priv) /* Update TCP timing states and poll uIP for new XMIT data. */ - (void)devif_timer(dev, stm32_txpoll, STM32_POLLHSEC); + (void)devif_timer(dev, stm32_txpoll); /* We will, most likely end up with a buffer to be freed. But it * might not be the same one that we allocated above. diff --git a/arch/arm/src/stm32f7/stm32_ethernet.c b/arch/arm/src/stm32f7/stm32_ethernet.c index 6d4e388b3d..1e8c2e6177 100644 --- a/arch/arm/src/stm32f7/stm32_ethernet.c +++ b/arch/arm/src/stm32f7/stm32_ethernet.c @@ -290,7 +290,6 @@ */ #define STM32_WDDELAY (1*CLK_TCK) -#define STM32_POLLHSEC (1*2) /* TX timeout = 1 minute */ @@ -2441,7 +2440,7 @@ static inline void stm32_poll_process(struct stm32_ethmac_s *priv) /* Update TCP timing states and poll uIP for new XMIT data. */ - (void)devif_timer(dev, stm32_txpoll, STM32_POLLHSEC); + (void)devif_timer(dev, stm32_txpoll); /* We will, most likely end up with a buffer to be freed. But it * might not be the same one that we allocated above. diff --git a/arch/arm/src/tiva/lm3s_ethernet.c b/arch/arm/src/tiva/lm3s_ethernet.c index d78ed573e4..055b58659c 100644 --- a/arch/arm/src/tiva/lm3s_ethernet.c +++ b/arch/arm/src/tiva/lm3s_ethernet.c @@ -153,7 +153,6 @@ /* TX poll deley = 1 seconds. CLK_TCK is the number of clock ticks per second */ #define TIVA_WDDELAY (1*CLK_TCK) -#define TIVA_POLLHSEC (1*2) /* TX timeout = 1 minute */ @@ -1072,7 +1071,7 @@ static void tiva_polltimer(int argc, uint32_t arg, ...) { /* If so, update TCP timing states and poll uIP for new XMIT data */ - (void)devif_timer(&priv->ld_dev, tiva_txpoll, TIVA_POLLHSEC); + (void)devif_timer(&priv->ld_dev, tiva_txpoll); /* Setup the watchdog poll timer again */ diff --git a/arch/arm/src/tiva/tm4c_ethernet.c b/arch/arm/src/tiva/tm4c_ethernet.c index 465d695c9d..a407f21573 100644 --- a/arch/arm/src/tiva/tm4c_ethernet.c +++ b/arch/arm/src/tiva/tm4c_ethernet.c @@ -274,7 +274,6 @@ */ #define TIVA_WDDELAY (1*CLK_TCK) -#define TIVA_POLLHSEC (1*2) /* TX timeout = 1 minute */ @@ -2366,7 +2365,7 @@ static inline void tiva_poll_process(FAR struct tiva_ethmac_s *priv) /* Update TCP timing states and poll uIP for new XMIT data. */ - (void)devif_timer(dev, tiva_txpoll, TIVA_POLLHSEC); + (void)devif_timer(dev, tiva_txpoll); /* We will, most likely end up with a buffer to be freed. But it * might not be the same one that we allocated above. diff --git a/arch/hc/src/m9s12/m9s12_ethernet.c b/arch/hc/src/m9s12/m9s12_ethernet.c index 0d9a60b02e..92d7ae1295 100644 --- a/arch/hc/src/m9s12/m9s12_ethernet.c +++ b/arch/hc/src/m9s12/m9s12_ethernet.c @@ -74,7 +74,6 @@ /* TX poll deley = 1 seconds. CLK_TCK is the number of clock ticks per second */ #define HCS12_WDDELAY (1*CLK_TCK) -#define HCS12_POLLHSEC (1*2) /* TX timeout = 1 minute */ @@ -521,7 +520,7 @@ static void emac_polltimer(int argc, uint32_t arg, ...) * we will missing TCP time state updates? */ - (void)devif_timer(&priv->d_dev, emac_txpoll, HCS12_POLLHSEC); + (void)devif_timer(&priv->d_dev, emac_txpoll); /* Setup the watchdog poll timer again */ diff --git a/arch/mips/src/pic32mx/pic32mx-ethernet.c b/arch/mips/src/pic32mx/pic32mx-ethernet.c index 4dd9d89042..dca417a230 100644 --- a/arch/mips/src/pic32mx/pic32mx-ethernet.c +++ b/arch/mips/src/pic32mx/pic32mx-ethernet.c @@ -169,7 +169,6 @@ /* TX poll deley = 1 seconds. CLK_TCK is the number of clock ticks per second */ #define PIC32MX_WDDELAY (1*CLK_TCK) -#define PIC32MX_POLLHSEC (1*2) /* TX timeout = 1 minute */ @@ -1248,7 +1247,7 @@ static void pic32mx_timerpoll(struct pic32mx_driver_s *priv) /* And perform the poll */ priv->pd_polling = true; - (void)devif_timer(&priv->pd_dev, pic32mx_txpoll, PIC32MX_POLLHSEC); + (void)devif_timer(&priv->pd_dev, pic32mx_txpoll); /* Free any buffer left attached after the poll */ diff --git a/arch/mips/src/pic32mz/pic32mz-ethernet.c b/arch/mips/src/pic32mz/pic32mz-ethernet.c index e2f3e1e635..42b4bb6615 100644 --- a/arch/mips/src/pic32mz/pic32mz-ethernet.c +++ b/arch/mips/src/pic32mz/pic32mz-ethernet.c @@ -169,7 +169,6 @@ /* TX poll deley = 1 seconds. CLK_TCK is the number of clock ticks per second */ #define PIC32MZ_WDDELAY (1*CLK_TCK) -#define PIC32MZ_POLLHSEC (1*2) /* TX timeout = 1 minute */ @@ -1266,7 +1265,7 @@ static void pic32mz_timerpoll(struct pic32mz_driver_s *priv) /* And perform the poll */ priv->pd_polling = true; - (void)devif_timer(&priv->pd_dev, pic32mz_txpoll, PIC32MZ_POLLHSEC); + (void)devif_timer(&priv->pd_dev, pic32mz_txpoll); /* Free any buffer left attached after the poll */ diff --git a/arch/sim/src/up_netdriver.c b/arch/sim/src/up_netdriver.c index cafa5ae4a2..346159157f 100644 --- a/arch/sim/src/up_netdriver.c +++ b/arch/sim/src/up_netdriver.c @@ -302,7 +302,7 @@ void netdriver_loop(void) else if (timer_expired(&g_periodic_timer)) { timer_reset(&g_periodic_timer); - devif_timer(&g_sim_dev, sim_txpoll, 1); + devif_timer(&g_sim_dev, sim_txpoll); } sched_unlock(); } diff --git a/arch/z80/src/ez80/ez80_emac.c b/arch/z80/src/ez80/ez80_emac.c index 138906f8d5..d338e569ba 100644 --- a/arch/z80/src/ez80/ez80_emac.c +++ b/arch/z80/src/ez80/ez80_emac.c @@ -229,7 +229,6 @@ /* TX poll deley = 1 seconds. CLK_TCK is the number of clock ticks per second */ #define EMAC_WDDELAY (1*CLK_TCK) -#define EMAC_POLLHSEC (1*2) /* TX timeout = 1 minute */ @@ -1698,7 +1697,7 @@ static void ez80emac_polltimer(int argc, uint32_t arg, ...) /* Poll uIP for new XMIT data */ - (void)devif_timer(&priv->dev, ez80emac_txpoll, EMAC_POLLHSEC); + (void)devif_timer(&priv->dev, ez80emac_txpoll); /* Setup the watchdog poll timer again */