diff options
Diffstat (limited to 'net')
| -rw-r--r-- | net/bootp.c | 10 | ||||
| -rw-r--r-- | net/net.c | 16 | ||||
| -rw-r--r-- | net/nfs.c | 11 | ||||
| -rw-r--r-- | net/rarp.c | 2 | ||||
| -rw-r--r-- | net/tftp.c | 2 |
5 files changed, 18 insertions, 23 deletions
diff --git a/net/bootp.c b/net/bootp.c index 9eae34fd4..21ce7b228 100644 --- a/net/bootp.c +++ b/net/bootp.c @@ -268,7 +268,7 @@ static void BootpVendorProcess (u8 * ext, int size) } #ifdef DEBUG_BOOTP_EXT - printf ("[BOOTP] Received fields: \n"); + puts ("[BOOTP] Received fields: \n"); if (NetOurSubnetMask) { puts ("NetOurSubnetMask : "); print_IPaddr (NetOurSubnetMask); @@ -585,7 +585,7 @@ BootpRequest (void) } } #ifdef DEBUG - printf("BootpRequest => Our Mac: "); + puts ("BootpRequest => Our Mac: "); for (reg=0; reg<6; reg++) { printf ("%x%c", bi_enetaddr[reg], @@ -887,9 +887,9 @@ DhcpHandler(uchar * pkt, unsigned dest, unsigned src, unsigned len) DhcpOptionsProcess(&bp->bp_vend[4]); BootpCopyNetParams(bp); /* Store net params from reply */ dhcp_state = BOUND; - printf("DHCP client bound to address "); + puts ("DHCP client bound to address "); print_IPaddr(NetOurIP); - printf("\n"); + putc ('\n'); /* Obey the 'autoload' setting */ if ((s = getenv("autoload")) != NULL) { @@ -915,7 +915,7 @@ DhcpHandler(uchar * pkt, unsigned dest, unsigned src, unsigned len) } break; default: - printf("DHCP: INVALID STATE\n"); + puts ("DHCP: INVALID STATE\n"); break; } @@ -422,7 +422,7 @@ restart: */ if (ctrlc()) { eth_halt(); - printf("\nAbort\n"); + puts ("\nAbort\n"); return (-1); } @@ -733,7 +733,7 @@ NetReceive(volatile uchar * pkt, int len) * the server ethernet address */ #ifdef ET_DEBUG - printf("Got ARP\n"); + puts ("Got ARP\n"); #endif arp = (ARP_t *)ip; if (len < ARP_HDR_SIZE) { @@ -764,7 +764,7 @@ NetReceive(volatile uchar * pkt, int len) switch (ntohs(arp->ar_op)) { case ARPOP_REQUEST: /* reply with our IP address */ #ifdef ET_DEBUG - printf("Got ARP REQUEST, return our IP\n"); + puts ("Got ARP REQUEST, return our IP\n"); #endif NetSetEther((uchar *)et, et->et_src, PROT_ARP); arp->ar_op = htons(ARPOP_REPLY); @@ -791,7 +791,7 @@ NetReceive(volatile uchar * pkt, int len) /* matched waiting packet's address */ if (tmp == NetArpWaitReplyIP) { #ifdef ET_DEBUG - printf("Got it\n"); + puts ("Got it\n"); #endif /* save address for later use */ memcpy(NetArpWaitPacketMAC, &arp->ar_data[0], 6); @@ -816,7 +816,7 @@ NetReceive(volatile uchar * pkt, int len) case PROT_RARP: #ifdef ET_DEBUG - printf("Got RARP\n"); + puts ("Got RARP\n"); #endif arp = (ARP_t *)ip; if (len < ARP_HDR_SIZE) { @@ -829,7 +829,7 @@ NetReceive(volatile uchar * pkt, int len) (ntohs(arp->ar_pro) != PROT_IP) || (arp->ar_hln != 6) || (arp->ar_pln != 4)) { - printf("invalid RARP header\n"); + puts ("invalid RARP header\n"); } else { NetCopyIP(&NetOurIP, &arp->ar_data[16]); if (NetServerIP == 0) @@ -842,7 +842,7 @@ NetReceive(volatile uchar * pkt, int len) case PROT_IP: #ifdef ET_DEBUG - printf("Got IP\n"); + puts ("Got IP\n"); #endif if (len < IP_HDR_SIZE) { debug ("len bad %d < %d\n", len, IP_HDR_SIZE); @@ -863,7 +863,7 @@ NetReceive(volatile uchar * pkt, int len) return; } if (!NetCksumOk((uchar *)ip, IP_HDR_SIZE_NO_UDP / 2)) { - printf("checksum bad\n"); + puts ("checksum bad\n"); return; } tmp = NetReadIP(&ip->ip_dst); @@ -746,19 +746,14 @@ NfsStart (void) print_IPaddr (NetOurGatewayIP) ; } } - putc ('\n'); - - printf ("Filename '%s/%s'.", nfs_path, nfs_filename); + printf ("\nFilename '%s/%s'.", nfs_path, nfs_filename); if (NetBootFileSize) { printf (" Size is 0x%x Bytes = ", NetBootFileSize<<9); print_size (NetBootFileSize<<9, ""); } - putc ('\n'); - - printf ("Load address: 0x%lx\n", load_addr); - - printf ("Loading: *\b"); + printf ("\nLoad address: 0x%lx\n" + "Loading: *\b", load_addr); NetSetTimeout (NFS_TIMEOUT * CFG_HZ, NfsTimeout); NetSetHandler (NfsHandler); diff --git a/net/rarp.c b/net/rarp.c index 5f18d8483..f9df07658 100644 --- a/net/rarp.c +++ b/net/rarp.c @@ -49,7 +49,7 @@ RarpHandler(uchar * dummi0, unsigned dummi1, unsigned dummi2, unsigned dummi3) { char *s; #ifdef DEBUG - printf("Got good RARP\n"); + puts ("Got good RARP\n"); #endif if ((s = getenv("autoload")) != NULL) { if (*s == 'n') { diff --git a/net/tftp.c b/net/tftp.c index fdf1770f0..2d3ee5f16 100644 --- a/net/tftp.c +++ b/net/tftp.c @@ -224,7 +224,7 @@ TftpHandler (uchar * pkt, unsigned dest, unsigned src, unsigned len) #ifdef ET_DEBUG if (TftpState == STATE_RRQ) { - printf("Server did not acknowledge timeout option!\n"); + puts ("Server did not acknowledge timeout option!\n"); } #endif |