V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

convert print_IPaddr() to %pI4 

Now that our printf functions support the %pI4 modifier like the kernel,
let's drop the inflexible print_IPaddr() function and covert over to the
%pI4 modifier.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
CC: Ben Warren <biggerbadderben@gmail.com>
This commit is contained in:
Mike Frysinger 2009-02-17 00:00:53 -05:00 committed by Wolfgang Denk
parent 6c6166f529
commit b6446b6775
6 changed files with 33 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
common/cmd_bdinfo.c
View File

@ -26,7 +26,6 @@
*/ */
#include <common.h> #include <common.h>
#include <command.h> #include <command.h>
#include <net.h> /* for print_IPaddr */
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
@ -134,8 +133,8 @@ int do_bdinfo ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
#ifdef CONFIG_HERMES #ifdef CONFIG_HERMES
print_str ("ethspeed", strmhz(buf, bd->bi_ethspeed)); print_str ("ethspeed", strmhz(buf, bd->bi_ethspeed));
#endif #endif
puts ("\nIP addr = "); print_IPaddr (bd->bi_ip_addr); printf ("IP addr = %pI4\n", &bd->bi_ip_addr);
printf ("\nbaudrate = %6ld bps\n", bd->bi_baudrate ); printf ("baudrate = %6ld bps\n", bd->bi_baudrate );
return 0; return 0;
} }
@ -156,9 +155,8 @@ int do_bdinfo ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
for (i=0; i<6; ++i) { for (i=0; i<6; ++i) {
printf ("%c%02X", i ? ':' : ' ', bd->bi_enetaddr[i]); printf ("%c%02X", i ? ':' : ' ', bd->bi_enetaddr[i]);
} }
puts ("\nip_addr = "); printf ("ip_addr = %pI4\n", &bd->bi_ip_addr);
print_IPaddr (bd->bi_ip_addr); printf ("baudrate = %ld bps\n", bd->bi_baudrate);
printf ("\nbaudrate = %ld bps\n", bd->bi_baudrate);
return 0; return 0;
} }
@ -188,11 +186,10 @@ int do_bdinfo ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
for (i=0; i<6; ++i) { for (i=0; i<6; ++i) {
printf ("%c%02X", i ? ':' : ' ', bd->bi_enetaddr[i]); printf ("%c%02X", i ? ':' : ' ', bd->bi_enetaddr[i]);
} }
puts ("\nip_addr = "); printf ("ip_addr = %pI4\n", &bd->bi_ip_addr);
print_IPaddr (bd->bi_ip_addr);
#endif #endif
printf ("\nbaudrate = %ld bps\n", bd->bi_baudrate); printf ("baudrate = %ld bps\n", bd->bi_baudrate);
return 0; return 0;
} }
@ -216,10 +213,9 @@ int do_bdinfo ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
for (i=0; i<6; ++i) { for (i=0; i<6; ++i) {
printf ("%c%02X", i ? ':' : ' ', bd->bi_enetaddr[i]); printf ("%c%02X", i ? ':' : ' ', bd->bi_enetaddr[i]);
} }
puts ("\nip_addr = "); printf ("ip_addr = %pI4\n", &bd->bi_ip_addr);
print_IPaddr (bd->bi_ip_addr);
#endif #endif
printf ("\nbaudrate = %ld bps\n", (ulong)bd->bi_baudrate); printf ("baudrate = %ld bps\n", (ulong)bd->bi_baudrate);
return 0; return 0;
} }
@ -255,10 +251,9 @@ int do_bdinfo(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
for (i = 0; i < 6; ++i) { for (i = 0; i < 6; ++i) {
printf("%c%02X", i ? ':' : ' ', bd->bi_enetaddr[i]); printf("%c%02X", i ? ':' : ' ', bd->bi_enetaddr[i]);
} }
puts("\nIP addr = "); printf("ip_addr = %pI4\n", &bd->bi_ip_addr);
print_IPaddr(bd->bi_ip_addr);
#endif #endif
printf("\nbaudrate = %6ld bps\n", bd->bi_baudrate); printf("baudrate = %6ld bps\n", bd->bi_baudrate);
return 0; return 0;
} }
@ -320,10 +315,9 @@ int do_bdinfo ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
} }
#endif #endif
puts ("\nip_addr = "); printf ("ip_addr = %pI4\n", &bd->bi_ip_addr);
print_IPaddr (bd->bi_ip_addr);
#endif #endif
printf ("\nbaudrate = %ld bps\n", bd->bi_baudrate); printf ("baudrate = %ld bps\n", bd->bi_baudrate);
return 0; return 0;
} }
@ -354,9 +348,8 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
puts("ethaddr ="); puts("ethaddr =");
for (i = 0; i < 6; ++i) for (i = 0; i < 6; ++i)
printf("%c%02X", i ? ':' : ' ', bd->bi_enetaddr[i]); printf("%c%02X", i ? ':' : ' ', bd->bi_enetaddr[i]);
puts("\nip_addr = "); printf("ip_addr = %pI4\n", &bd->bi_ip_addr);
print_IPaddr(bd->bi_ip_addr); printf("baudrate = %d bps\n", bd->bi_baudrate);
printf("\nbaudrate = %d bps\n", bd->bi_baudrate);
return 0; return 0;
} }
@ -379,9 +372,8 @@ int do_bdinfo ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
for (i=0; i<6; ++i) { for (i=0; i<6; ++i) {
printf ("%c%02X", i ? ':' : ' ', bd->bi_enetaddr[i]); printf ("%c%02X", i ? ':' : ' ', bd->bi_enetaddr[i]);
} }
puts ("\nip_addr = "); printf ("ip_addr = %pI4\n", &bd->bi_ip_addr);
print_IPaddr (bd->bi_ip_addr); printf ("baudrate = %d bps\n", bd->bi_baudrate);
printf ("\nbaudrate = %d bps\n", bd->bi_baudrate);
return 0; return 0;
} }
@ -409,12 +401,10 @@ int do_bdinfo ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
for (i=0; i<6; ++i) { for (i=0; i<6; ++i) {
printf ("%c%02X", i ? ':' : ' ', bd->bi_enetaddr[i]); printf ("%c%02X", i ? ':' : ' ', bd->bi_enetaddr[i]);
} }
puts ( "\n" puts ( "\n" );
"ip_addr = "); printf ("ip_addr = %pI4\n", &bd->bi_ip_addr);
print_IPaddr (bd->bi_ip_addr);
#endif #endif
printf ("\n" printf ("baudrate = %d bps\n", bd->bi_baudrate);
"baudrate = %d bps\n", bd->bi_baudrate);
return 0; return 0;
} }

3
include/net.h
View File

@ -408,9 +408,6 @@ extern int NetSendUDPPacket(uchar *ether, IPaddr_t dest, int dport, int sport, i
/* Processes a received packet */ /* Processes a received packet */
extern void NetReceive(volatile uchar *, int); extern void NetReceive(volatile uchar *, int);
/* Print an IP address on the console */
extern void print_IPaddr (IPaddr_t);
/* /*
* The following functions are a bit ugly, but necessary to deal with * The following functions are a bit ugly, but necessary to deal with
* alignment restrictions on ARM. * alignment restrictions on ARM.

18
net/bootp.c
View File

@ -271,17 +271,11 @@ static void BootpVendorProcess (u8 * ext, int size)
#ifdef DEBUG_BOOTP_EXT #ifdef DEBUG_BOOTP_EXT
puts ("[BOOTP] Received fields: \n"); puts ("[BOOTP] Received fields: \n");
if (NetOurSubnetMask) { if (NetOurSubnetMask)
puts ("NetOurSubnetMask : "); printf ("NetOurSubnetMask : %pI4\n", &NetOurSubnetMask);
print_IPaddr (NetOurSubnetMask);
putc ('\n');
}
if (NetOurGatewayIP) { if (NetOurGatewayIP)
puts ("NetOurGatewayIP : "); printf ("NetOurGatewayIP : %pI4", &NetOurGatewayIP);
print_IPaddr (NetOurGatewayIP);
putc ('\n');
}
if (NetBootFileSize) { if (NetBootFileSize) {
printf ("NetBootFileSize : %d\n", NetBootFileSize); printf ("NetBootFileSize : %d\n", NetBootFileSize);
@ -942,9 +936,7 @@ DhcpHandler(uchar * pkt, unsigned dest, unsigned src, unsigned len)
DhcpOptionsProcess((u8 *)&bp->bp_vend[4], bp); DhcpOptionsProcess((u8 *)&bp->bp_vend[4], bp);
BootpCopyNetParams(bp); /* Store net params from reply */ BootpCopyNetParams(bp); /* Store net params from reply */
dhcp_state = BOUND; dhcp_state = BOUND;
puts ("DHCP client bound to address "); printf ("DHCP client bound to address %pI4\n", &NetOurIP);
print_IPaddr(NetOurIP);
putc ('\n');
/* Obey the 'autoload' setting */ /* Obey the 'autoload' setting */
if ((s = getenv("autoload")) != NULL) { if ((s = getenv("autoload")) != NULL) {

13
net/net.c
View File

@ -1461,9 +1461,7 @@ NetReceive(volatile uchar * inpkt, int len)
case ICMP_REDIRECT: case ICMP_REDIRECT:
if (icmph->code != ICMP_REDIR_HOST) if (icmph->code != ICMP_REDIR_HOST)
return; return;
puts (" ICMP Host Redirect to "); printf (" ICMP Host Redirect to %pI4 ", &icmph->un.gateway);
print_IPaddr(icmph->un.gateway);
putc(' ');
return; return;
#if defined(CONFIG_CMD_PING) #if defined(CONFIG_CMD_PING)
case ICMP_ECHO_REPLY: case ICMP_ECHO_REPLY:
@ -1805,15 +1803,6 @@ ushort string_to_VLAN(char *s)
return htons(id); return htons(id);
} }
void print_IPaddr (IPaddr_t x)
{
char tmp[16];
ip_to_string (x, tmp);
puts (tmp);
}
IPaddr_t getenv_IPaddr (char *var) IPaddr_t getenv_IPaddr (char *var)
{ {
return (string_to_ip(getenv(var))); return (string_to_ip(getenv(var)));

10
net/nfs.c
View File

@ -741,18 +741,16 @@ NfsStart (void)
printf ("Using %s device\n", eth_get_name()); printf ("Using %s device\n", eth_get_name());
#endif #endif
puts ("File transfer via NFS from server "); print_IPaddr (NfsServerIP); printf("File transfer via NFS from server %pI4"
puts ("; our IP address is "); print_IPaddr (NetOurIP); "; our IP address is %pI4", &NfsServerIP, &NetOurIP);
/* Check if we need to send across this subnet */ /* Check if we need to send across this subnet */
if (NetOurGatewayIP && NetOurSubnetMask) { if (NetOurGatewayIP && NetOurSubnetMask) {
IPaddr_t OurNet = NetOurIP & NetOurSubnetMask; IPaddr_t OurNet = NetOurIP & NetOurSubnetMask;
IPaddr_t ServerNet = NetServerIP & NetOurSubnetMask; IPaddr_t ServerNet = NetServerIP & NetOurSubnetMask;
if (OurNet != ServerNet) { if (OurNet != ServerNet)
puts ("; sending through gateway "); printf("; sending through gateway %pI4", &NetOurGatewayIP);
print_IPaddr (NetOurGatewayIP) ;
}
} }
printf ("\nFilename '%s/%s'.", nfs_path, nfs_filename); printf ("\nFilename '%s/%s'.", nfs_path, nfs_filename);

10
net/tftp.c
View File

@ -508,18 +508,16 @@ TftpStart (void)
#if defined(CONFIG_NET_MULTI) #if defined(CONFIG_NET_MULTI)
printf ("Using %s device\n", eth_get_name()); printf ("Using %s device\n", eth_get_name());
#endif #endif
puts ("TFTP from server "); print_IPaddr (TftpServerIP); printf("TFTP from server %pI4"
puts ("; our IP address is "); print_IPaddr (NetOurIP); "; our IP address is %pI4", &TftpServerIP, &NetOurIP);
/* Check if we need to send across this subnet */ /* Check if we need to send across this subnet */
if (NetOurGatewayIP && NetOurSubnetMask) { if (NetOurGatewayIP && NetOurSubnetMask) {
IPaddr_t OurNet = NetOurIP & NetOurSubnetMask; IPaddr_t OurNet = NetOurIP & NetOurSubnetMask;
IPaddr_t ServerNet = TftpServerIP & NetOurSubnetMask; IPaddr_t ServerNet = TftpServerIP & NetOurSubnetMask;
if (OurNet != ServerNet) { if (OurNet != ServerNet)
puts ("; sending through gateway "); printf("; sending through gateway %pI4", &NetOurGatewayIP);
print_IPaddr (NetOurGatewayIP) ;
}
} }
putc ('\n'); putc ('\n');