summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorwdenk <wdenk>2003-06-27 21:31:46 +0000
committerwdenk <wdenk>2003-06-27 21:31:46 +0000
commit8bde7f776c77b343aca29b8c7b58464d915ac245 (patch)
tree20f1fd99975215e7c658454a15cdb4ed4694e2d4 /net
parent993cad9364c6b87ae429d1ed1130d8153f6f027e (diff)
* Code cleanup:LABEL_2003_06_27_2340
- remove trailing white space, trailing empty lines, C++ comments, etc. - split cmd_boot.c (separate cmd_bdinfo.c and cmd_load.c) * Patches by Kenneth Johansson, 25 Jun 2003: - major rework of command structure (work done mostly by Michal Cendrowski and Joakim Kristiansen)
Diffstat (limited to 'net')
-rw-r--r--net/bootp.c26
-rw-r--r--net/eth.c2
-rw-r--r--net/net.c50
3 files changed, 39 insertions, 39 deletions
diff --git a/net/bootp.c b/net/bootp.c
index 8e0f3324664..31b224327e8 100644
--- a/net/bootp.c
+++ b/net/bootp.c
@@ -124,7 +124,7 @@ static void BootpCopyNetParams(Bootp_t *bp)
debug ("Bootfile: %s\n", BootFile);
/* Propagate to environment:
- * don't delete exising entry when BOOTP / DHCP reply does
+ * don't delete exising entry when BOOTP / DHCP reply does
* not contain a new value
*/
if (*BootFile) {
@@ -213,16 +213,16 @@ static void BootpVendorFieldProcess(u8 *ext)
break;
case 18: /* Extension path - Not yet supported */
/*
- * This can be used to send the information of the
- * vendor area in another file that the client can
- * access via TFTP.
+ * This can be used to send the information of the
+ * vendor area in another file that the client can
+ * access via TFTP.
*/
break;
/* IP host layer fields */
case 40: /* NIS Domain name */
if (NetOurNISDomain[0] == 0) {
size = truncate_sz ("NIS Domain Name",
- sizeof(NetOurNISDomain),
+ sizeof(NetOurNISDomain),
size);
memcpy(&NetOurNISDomain, ext+2, size);
NetOurNISDomain[size] = 0 ;
@@ -231,8 +231,8 @@ static void BootpVendorFieldProcess(u8 *ext)
/* Application layer fields */
case 43: /* Vendor specific info - Not yet supported */
/*
- * Binary information to exchange specific
- * product information.
+ * Binary information to exchange specific
+ * product information.
*/
break;
/* Reserved (custom) fields (128..254) */
@@ -283,7 +283,7 @@ static void BootpVendorProcess(u8 *ext, int size)
}
if (NetOurNISDomain[0]) {
- printf("NetOurNISDomain : %s\n", NetOurNISDomain);
+ printf("NetOurNISDomain : %s\n", NetOurNISDomain);
}
if (NetBootFileSize) {
@@ -381,7 +381,7 @@ static int DhcpExtended(u8 *e, int message_type, IPaddr_t ServerID, IPaddr_t Req
*e++ = (576-312+OPT_SIZE) & 0xff;
if ( ServerID ) {
- int tmp = ntohl(ServerID);
+ int tmp = ntohl(ServerID);
*e++ = 54; /* ServerID */
*e++ = 4;
@@ -392,7 +392,7 @@ static int DhcpExtended(u8 *e, int message_type, IPaddr_t ServerID, IPaddr_t Req
}
if ( RequestedIP ) {
- int tmp = ntohl(RequestedIP);
+ int tmp = ntohl(RequestedIP);
*e++ = 50; /* Requested IP */
*e++ = 4;
@@ -404,7 +404,7 @@ static int DhcpExtended(u8 *e, int message_type, IPaddr_t ServerID, IPaddr_t Req
#if (CONFIG_BOOTP_MASK & CONFIG_BOOTP_VENDOREX)
if ((x = dhcp_vendorex_prep (e)))
- return x - start ;
+ return x - start ;
#endif
*e++ = 55; /* Parameter Request List */
@@ -590,7 +590,7 @@ BootpRequest (void)
sum = seed1 + seed2;
if (sum < seed1 || sum < seed2)
sum++;
- seed2 = seed1;
+ seed2 = seed1;
seed1 = sum;
if (BootpTry<=2) { /* Start with max 1024 * 1ms */
@@ -722,7 +722,7 @@ static void DhcpOptionsProcess(uchar *popt)
default:
#if (CONFIG_BOOTP_MASK & CONFIG_BOOTP_VENDOREX)
if (dhcp_vendorex_proc(popt))
- break;
+ break;
#endif
printf("*** Unhandled DHCP Option in OFFER/ACK: %d\n",
*popt);
diff --git a/net/eth.c b/net/eth.c
index 5f9c3a6cd94..468b84cde07 100644
--- a/net/eth.c
+++ b/net/eth.c
@@ -100,7 +100,7 @@ int eth_initialize(bd_t *bis)
eth_current = NULL;
#if defined(CONFIG_405GP) || defined(CONFIG_440) || defined(CONFIG_405EP)
- ppc_4xx_eth_initialize(bis);
+ ppc_4xx_eth_initialize(bis);
#endif
#ifdef CONFIG_INCA_IP_SWITCH
inca_switch_initialize(bis);
diff --git a/net/net.c b/net/net.c
index 3081829010a..ce7934180b6 100644
--- a/net/net.c
+++ b/net/net.c
@@ -175,9 +175,9 @@ void ArpRequest(void)
}
NetArpWaitReplyIP = NetOurGatewayIP;
} else
- NetArpWaitReplyIP = NetArpWaitPacketIP;
+ NetArpWaitReplyIP = NetArpWaitPacketIP;
- NetWriteIP((uchar*)&arp->ar_data[16], NetArpWaitReplyIP);
+ NetWriteIP((uchar*)&arp->ar_data[16], NetArpWaitReplyIP);
(void) eth_send(NetTxPacket, ETHER_HDR_SIZE + ARP_HDR_SIZE);
}
@@ -295,8 +295,8 @@ restart:
case BOOTP:
case RARP:
/*
- * initialize our IP addr to 0 in order to accept ANY
- * IP addr assigned to us by the BOOTP / RARP server
+ * initialize our IP addr to 0 in order to accept ANY
+ * IP addr assigned to us by the BOOTP / RARP server
*/
NetOurIP = 0;
NetServerIP = 0;
@@ -380,7 +380,7 @@ restart:
* Abort if ctrl-c was pressed.
*/
if (ctrlc()) {
- eth_halt();
+ eth_halt();
printf("\nAbort\n");
return (-1);
}
@@ -671,12 +671,12 @@ NetReceive(volatile uchar * pkt, int len)
case PROT_ARP:
/*
* We have to deal with two types of ARP packets:
- * - REQUEST packets will be answered by sending our
- * IP address - if we know it.
- * - REPLY packates are expected only after we asked
- * for the TFTP server's or the gateway's ethernet
- * address; so if we receive such a packet, we set
- * the server ethernet address
+ * - REQUEST packets will be answered by sending our
+ * IP address - if we know it.
+ * - REPLY packates are expected only after we asked
+ * for the TFTP server's or the gateway's ethernet
+ * address; so if we receive such a packet, we set
+ * the server ethernet address
*/
#ifdef ET_DEBUG
printf("Got ARP\n");
@@ -818,19 +818,19 @@ NetReceive(volatile uchar * pkt, int len)
/*
* watch for ICMP host redirects
*
- * There is no real handler code (yet). We just watch
- * for ICMP host redirect messages. In case anybody
- * sees these messages: please contact me
- * (wd@denx.de), or - even better - send me the
- * necessary fixes :-)
+ * There is no real handler code (yet). We just watch
+ * for ICMP host redirect messages. In case anybody
+ * sees these messages: please contact me
+ * (wd@denx.de), or - even better - send me the
+ * necessary fixes :-)
*
- * Note: in all cases where I have seen this so far
- * it was a problem with the router configuration,
- * for instance when a router was configured in the
- * BOOTP reply, but the TFTP server was on the same
- * subnet. So this is probably a warning that your
- * configuration might be wrong. But I'm not really
- * sure if there aren't any other situations.
+ * Note: in all cases where I have seen this so far
+ * it was a problem with the router configuration,
+ * for instance when a router was configured in the
+ * BOOTP reply, but the TFTP server was on the same
+ * subnet. So this is probably a warning that your
+ * configuration might be wrong. But I'm not really
+ * sure if there aren't any other situations.
*/
if (ip->ip_p == IPPROTO_ICMP) {
ICMP_t *icmph = (ICMP_t *)&(ip->udp_src);
@@ -918,7 +918,7 @@ static int net_check_prereq (proto_t protocol)
puts ("*** ERROR: `ethaddr' not set\n");
break;
default:
- printf ("*** ERROR: `eth%daddr' not set\n",
+ printf ("*** ERROR: `eth%daddr' not set\n",
num);
break;
}
@@ -1023,7 +1023,7 @@ void ip_to_string (IPaddr_t x, char *s)
{
x = ntohl(x);
sprintf (s,"%d.%d.%d.%d",
- (int)((x >> 24) & 0xff),
+ (int)((x >> 24) & 0xff),
(int)((x >> 16) & 0xff),
(int)((x >> 8) & 0xff),
(int)((x >> 0) & 0xff)