projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
net: Define IP flag field values
[oweals/u-boot.git]
/
net
/
net.c
diff --git
a/net/net.c
b/net/net.c
index f55c7facf2783676ccd683e90fd45523e899e9f6..cf1f4fa1f294bb30db3885f1afb4dc31da4e1585 100644
(file)
--- a/
net/net.c
+++ b/
net/net.c
@@
-95,14
+95,9
@@
DECLARE_GLOBAL_DATA_PTR;
#ifndef CONFIG_ARP_TIMEOUT
DECLARE_GLOBAL_DATA_PTR;
#ifndef CONFIG_ARP_TIMEOUT
-# define ARP_TIMEOUT 50UL /* Deciseconds before trying ARP again */
-#elif (CONFIG_ARP_TIMEOUT < 100)
-# error "Due to possible overflow CONFIG_ARP_TIMEOUT must be greater than 100ms"
+# define ARP_TIMEOUT 5000UL /* Milliseconds before trying ARP again */
#else
#else
-# if (CONFIG_ARP_TIMEOUT % 100)
-# warning "Supported ARP_TIMEOUT precision is 100ms"
-# endif
-# define ARP_TIMEOUT (CONFIG_ARP_TIMEOUT / 100)
+# define ARP_TIMEOUT CONFIG_ARP_TIMEOUT
#endif
#endif
@@
-264,7
+259,7
@@
void ArpTimeoutCheck(void)
t = get_timer(0);
/* check for arp timeout */
t = get_timer(0);
/* check for arp timeout */
- if ((t - NetArpWaitTimerStart) > ARP_TIMEOUT
* CFG_HZ / 10
) {
+ if ((t - NetArpWaitTimerStart) > ARP_TIMEOUT) {
NetArpWaitTry++;
if (NetArpWaitTry >= ARP_TIMEOUT_COUNT) {
NetArpWaitTry++;
if (NetArpWaitTry >= ARP_TIMEOUT_COUNT) {
@@
-477,16
+472,16
@@
restart:
}
#if defined(CONFIG_MII) || defined(CONFIG_CMD_MII)
}
#if defined(CONFIG_MII) || defined(CONFIG_CMD_MII)
-#if defined(C
FG
_FAULT_ECHO_LINK_DOWN) && defined(CONFIG_STATUS_LED) && defined(STATUS_LED_RED)
+#if defined(C
ONFIG_SYS
_FAULT_ECHO_LINK_DOWN) && defined(CONFIG_STATUS_LED) && defined(STATUS_LED_RED)
/*
* Echo the inverted link state to the fault LED.
*/
/*
* Echo the inverted link state to the fault LED.
*/
- if(miiphy_link(eth_get_dev()->name, C
FG
_FAULT_MII_ADDR)) {
+ if(miiphy_link(eth_get_dev()->name, C
ONFIG_SYS
_FAULT_MII_ADDR)) {
status_led_set (STATUS_LED_RED, STATUS_LED_OFF);
} else {
status_led_set (STATUS_LED_RED, STATUS_LED_ON);
}
status_led_set (STATUS_LED_RED, STATUS_LED_OFF);
} else {
status_led_set (STATUS_LED_RED, STATUS_LED_ON);
}
-#endif /* C
FG
_FAULT_ECHO_LINK_DOWN, ... */
+#endif /* C
ONFIG_SYS
_FAULT_ECHO_LINK_DOWN, ... */
#endif /* CONFIG_MII, ... */
/*
#endif /* CONFIG_MII, ... */
/*
@@
-526,18
+521,18
@@
restart:
thand_f *x;
#if defined(CONFIG_MII) || defined(CONFIG_CMD_MII)
thand_f *x;
#if defined(CONFIG_MII) || defined(CONFIG_CMD_MII)
-# if defined(C
FG
_FAULT_ECHO_LINK_DOWN) && \
+# if defined(C
ONFIG_SYS
_FAULT_ECHO_LINK_DOWN) && \
defined(CONFIG_STATUS_LED) && \
defined(STATUS_LED_RED)
/*
* Echo the inverted link state to the fault LED.
*/
defined(CONFIG_STATUS_LED) && \
defined(STATUS_LED_RED)
/*
* Echo the inverted link state to the fault LED.
*/
- if(miiphy_link(eth_get_dev()->name, C
FG
_FAULT_MII_ADDR)) {
+ if(miiphy_link(eth_get_dev()->name, C
ONFIG_SYS
_FAULT_MII_ADDR)) {
status_led_set (STATUS_LED_RED, STATUS_LED_OFF);
} else {
status_led_set (STATUS_LED_RED, STATUS_LED_ON);
}
status_led_set (STATUS_LED_RED, STATUS_LED_OFF);
} else {
status_led_set (STATUS_LED_RED, STATUS_LED_ON);
}
-# endif /* C
FG
_FAULT_ECHO_LINK_DOWN, ... */
+# endif /* C
ONFIG_SYS
_FAULT_ECHO_LINK_DOWN, ... */
#endif /* CONFIG_MII, ... */
x = timeHandler;
timeHandler = (thand_f *)0;
#endif /* CONFIG_MII, ... */
x = timeHandler;
timeHandler = (thand_f *)0;
@@
-603,7
+598,7
@@
void NetStartAgain (void)
return;
}
#ifndef CONFIG_NET_MULTI
return;
}
#ifndef CONFIG_NET_MULTI
- NetSetTimeout (10
UL * CFG_HZ
, startAgainTimeout);
+ NetSetTimeout (10
000UL
, startAgainTimeout);
NetSetHandler (startAgainHandler);
#else /* !CONFIG_NET_MULTI*/
eth_halt ();
NetSetHandler (startAgainHandler);
#else /* !CONFIG_NET_MULTI*/
eth_halt ();
@@
-614,7
+609,7
@@
void NetStartAgain (void)
if (NetRestartWrap) {
NetRestartWrap = 0;
if (NetDevExists && !once) {
if (NetRestartWrap) {
NetRestartWrap = 0;
if (NetDevExists && !once) {
- NetSetTimeout (10
UL * CFG_HZ
, startAgainTimeout);
+ NetSetTimeout (10
000UL
, startAgainTimeout);
NetSetHandler (startAgainHandler);
} else {
NetState = NETLOOP_FAIL;
NetSetHandler (startAgainHandler);
} else {
NetState = NETLOOP_FAIL;
@@
-740,7
+735,7
@@
int PingSend(void)
ip->ip_tos = 0;
ip->ip_len = htons(IP_HDR_SIZE_NO_UDP + 8);
ip->ip_id = htons(NetIPID++);
ip->ip_tos = 0;
ip->ip_len = htons(IP_HDR_SIZE_NO_UDP + 8);
ip->ip_id = htons(NetIPID++);
- ip->ip_off = htons(
0x4000); /* No fragmentation
*/
+ ip->ip_off = htons(
IP_FLAGS_DFRAG); /* Don't fragment
*/
ip->ip_ttl = 255;
ip->ip_p = 0x01; /* ICMP */
ip->ip_sum = 0;
ip->ip_ttl = 255;
ip->ip_p = 0x01; /* ICMP */
ip->ip_sum = 0;
@@
-790,7
+785,7
@@
static void PingStart(void)
#if defined(CONFIG_NET_MULTI)
printf ("Using %s device\n", eth_get_name());
#endif /* CONFIG_NET_MULTI */
#if defined(CONFIG_NET_MULTI)
printf ("Using %s device\n", eth_get_name());
#endif /* CONFIG_NET_MULTI */
- NetSetTimeout (10
UL * CFG_HZ
, PingTimeout);
+ NetSetTimeout (10
000UL
, PingTimeout);
NetSetHandler (PingHandler);
PingSend();
NetSetHandler (PingHandler);
PingSend();
@@
-813,7
+808,7
@@
static void PingStart(void)
#define CDP_SYSOBJECT_TLV 0x0015
#define CDP_MANAGEMENT_ADDRESS_TLV 0x0016
#define CDP_SYSOBJECT_TLV 0x0015
#define CDP_MANAGEMENT_ADDRESS_TLV 0x0016
-#define CDP_TIMEOUT
(CFG_HZ/4)
/* one packet every 250ms */
+#define CDP_TIMEOUT
250UL
/* one packet every 250ms */
static int CDPSeq;
static int CDPOK;
static int CDPSeq;
static int CDPOK;
@@
-1390,7
+1385,7
@@
NetReceive(volatile uchar * inpkt, int len)
puts ("Got IP\n");
#endif
if (len < IP_HDR_SIZE) {
puts ("Got IP\n");
#endif
if (len < IP_HDR_SIZE) {
- debug ("len bad %d < %
d\n", len,
IP_HDR_SIZE);
+ debug ("len bad %d < %
lu\n", len, (ulong)
IP_HDR_SIZE);
return;
}
if (len < ntohs(ip->ip_len)) {
return;
}
if (len < ntohs(ip->ip_len)) {
@@
-1404,7
+1399,7
@@
NetReceive(volatile uchar * inpkt, int len)
if ((ip->ip_hl_v & 0xf0) != 0x40) {
return;
}
if ((ip->ip_hl_v & 0xf0) != 0x40) {
return;
}
- if (ip->ip_off & htons(
0x1fff
)) { /* Can't deal w/ fragments */
+ if (ip->ip_off & htons(
IP_OFFS
)) { /* Can't deal w/ fragments */
return;
}
/* can't deal with headers > 20 bytes */
return;
}
/* can't deal with headers > 20 bytes */
@@
-1520,7
+1515,8
@@
NetReceive(volatile uchar * inpkt, int len)
xsum = (xsum & 0x0000ffff) + ((xsum >> 16) & 0x0000ffff);
}
if ((xsum != 0x00000000) && (xsum != 0x0000ffff)) {
xsum = (xsum & 0x0000ffff) + ((xsum >> 16) & 0x0000ffff);
}
if ((xsum != 0x00000000) && (xsum != 0x0000ffff)) {
- printf(" UDP wrong checksum %08x %08x\n", xsum, ntohs(ip->udp_xsum));
+ printf(" UDP wrong checksum %08lx %08x\n",
+ xsum, ntohs(ip->udp_xsum));
return;
}
}
return;
}
}
@@
-1702,7
+1698,7
@@
NetSetIP(volatile uchar * xip, IPaddr_t dest, int dport, int sport, int len)
ip->ip_tos = 0;
ip->ip_len = htons(IP_HDR_SIZE + len);
ip->ip_id = htons(NetIPID++);
ip->ip_tos = 0;
ip->ip_len = htons(IP_HDR_SIZE + len);
ip->ip_id = htons(NetIPID++);
- ip->ip_off = htons(
0x4000); /* No fragmentation
*/
+ ip->ip_off = htons(
IP_FLAGS_DFRAG); /* Don't fragment
*/
ip->ip_ttl = 255;
ip->ip_p = 17; /* UDP */
ip->ip_sum = 0;
ip->ip_ttl = 255;
ip->ip_p = 17; /* UDP */
ip->ip_sum = 0;