diff options
author | rgrimes <rgrimes@FreeBSD.org> | 1995-05-30 08:16:23 +0000 |
---|---|---|
committer | rgrimes <rgrimes@FreeBSD.org> | 1995-05-30 08:16:23 +0000 |
commit | c86f0c7a71e7ade3e38b325c186a9cf374e0411e (patch) | |
tree | 176f04f674860c7cfae9ac5d2ff4d4e1d73cb2b7 /sys/i386/boot/netboot | |
parent | 423ba8f9bc23d93bfc244aca9b12563b1c9de90d (diff) | |
download | FreeBSD-src-c86f0c7a71e7ade3e38b325c186a9cf374e0411e.zip FreeBSD-src-c86f0c7a71e7ade3e38b325c186a9cf374e0411e.tar.gz |
Remove trailing whitespace.
Diffstat (limited to 'sys/i386/boot/netboot')
-rw-r--r-- | sys/i386/boot/netboot/3c509.c | 14 | ||||
-rw-r--r-- | sys/i386/boot/netboot/3c509.h | 26 | ||||
-rw-r--r-- | sys/i386/boot/netboot/bootmenu.c | 2 | ||||
-rw-r--r-- | sys/i386/boot/netboot/main.c | 8 | ||||
-rw-r--r-- | sys/i386/boot/netboot/ns8390.c | 4 |
5 files changed, 27 insertions, 27 deletions
diff --git a/sys/i386/boot/netboot/3c509.c b/sys/i386/boot/netboot/3c509.c index b729a46..9ebfe5d 100644 --- a/sys/i386/boot/netboot/3c509.c +++ b/sys/i386/boot/netboot/3c509.c @@ -8,7 +8,7 @@ Author: Martin Renters. Andres Vega Garcia's if_ep.c driver. Copyright (C) 1993-1994, David Greenman, Martin Renters. - Copyright (C) 1993-1995, Andres Vega Garcia. + Copyright (C) 1993-1995, Andres Vega Garcia. Copyright (C) 1995, Serge Babkin. This software may be used, modified, copied, distributed, and sold, in both source and binary form provided that the above copyright and these @@ -18,7 +18,7 @@ Author: Martin Renters. 3c509 support added by Serge Babkin (babkin@hq.icb.chel.su) -$Id: 3c509.c,v 1.1 1995/04/11 05:37:59 root Exp root $ +$Id: 3c509.c,v 1.1 1995/04/12 20:14:56 martin Exp $ ***************************************************************************/ @@ -158,7 +158,7 @@ eth_probe() eth_vendor=VENDOR_NONE; goto no3c509; } - + break; case 1: if(i & IS_AUI) @@ -168,7 +168,7 @@ eth_probe() eth_vendor=VENDOR_NONE; goto no3c509; } - + break; case 3: if(i & IS_BNC) { @@ -180,7 +180,7 @@ eth_probe() eth_vendor=VENDOR_NONE; goto no3c509; } - + break; default: printf("unknown connector\r\n"); @@ -240,8 +240,8 @@ eth_reset() outw(BASE + EP_COMMAND, SET_INTR_MASK); outw(BASE + EP_COMMAND, SET_RX_FILTER); - /* - /* initialize card + /* + /* initialize card */ while (inw(BASE + EP_STATUS) & S_COMMAND_IN_PROGRESS); diff --git a/sys/i386/boot/netboot/3c509.h b/sys/i386/boot/netboot/3c509.h index 049f235..8bfa368 100644 --- a/sys/i386/boot/netboot/3c509.h +++ b/sys/i386/boot/netboot/3c509.h @@ -1,13 +1,13 @@ /* * Copyright (c) 1993 Herb Peyerl (hpeyerl@novatel.ca) All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are * met: 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. 2. The name * of the author may not be used to endorse or promote products derived from * this software withough specific prior written permission - * + * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO @@ -18,15 +18,15 @@ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * + * * if_epreg.h,v 1.4 1994/11/13 10:12:37 gibbs Exp Modified by: - * + * October 2, 1994 - - Modified by: Andres Vega Garcia - INRIA - Sophia Antipolis, France - e-mail: avega@sophia.inria.fr + Modified by: Andres Vega Garcia + + INRIA - Sophia Antipolis, France + e-mail: avega@sophia.inria.fr finger: avega@pax.inria.fr */ @@ -284,7 +284,7 @@ #define S_COMMAND_IN_PROGRESS (u_short) (0x1000) /* - * FIFO Registers. + * FIFO Registers. * RX Status. Window 1/Port 08 * * 15: Incomplete or FIFO empty. @@ -310,7 +310,7 @@ #define ERR_RX_DRIBBLE (u_short) (0x2<<11) /* - * FIFO Registers. + * FIFO Registers. * TX Status. Window 1/Port 0B * * Reports the transmit status of a completed transmission. Writing this @@ -335,7 +335,7 @@ #define TXS_STATUS_OVERFLOW 0x4 /* - * Configuration control register. + * Configuration control register. * Window 0/Port 04 */ /* Read */ @@ -346,7 +346,7 @@ #define ENABLE_DRQ_IRQ 0x0001 #define W0_P4_CMD_RESET_ADAPTER 0x4 #define W0_P4_CMD_ENABLE_ADAPTER 0x1 -/* +/* * Media type and status. * Window 4/Port 0A */ @@ -360,7 +360,7 @@ #define SET_IRQ(i) ( ((i)<<12) | 0xF00) /* set IRQ i */ /* - * Receive status register + * Receive status register */ #define RX_BYTES_MASK (u_short) (0x07ff) diff --git a/sys/i386/boot/netboot/bootmenu.c b/sys/i386/boot/netboot/bootmenu.c index 32b266c..77a12ed 100644 --- a/sys/i386/boot/netboot/bootmenu.c +++ b/sys/i386/boot/netboot/bootmenu.c @@ -181,7 +181,7 @@ CMD_HOSTNAME - Set my hostname cmd_hostname(p) char *p; { - if (*p) + if (*p) hostnamelen = ((sprintf(&nfsdiskless.my_hostnam,"%s",p) - (char*)&nfsdiskless.my_hostnam) + 3) & ~3; else printf("Hostname is: %s\r\n",nfsdiskless.my_hostnam); diff --git a/sys/i386/boot/netboot/main.c b/sys/i386/boot/netboot/main.c index 5cadf8f..8ee6cf4 100644 --- a/sys/i386/boot/netboot/main.c +++ b/sys/i386/boot/netboot/main.c @@ -197,7 +197,7 @@ load() nfsdiskless.swap_saddr.sin_len = sizeof(struct sockaddr_in); nfsdiskless.swap_saddr.sin_family = AF_INET; nfsdiskless.swap_saddr.sin_port = htons(swap_nfs_port); - nfsdiskless.swap_saddr.sin_addr.s_addr = + nfsdiskless.swap_saddr.sin_addr.s_addr = htonl(arptable[ARP_SWAPSERVER].ipaddr); nfsdiskless.swap_args.timeo = 10; nfsdiskless.swap_args.retrans = 100; @@ -219,7 +219,7 @@ load() nfsdiskless.root_saddr.sin_len = sizeof(struct sockaddr_in); nfsdiskless.root_saddr.sin_family = AF_INET; nfsdiskless.root_saddr.sin_port = htons(root_nfs_port); - nfsdiskless.root_saddr.sin_addr.s_addr = + nfsdiskless.root_saddr.sin_addr.s_addr = htonl(arptable[ARP_ROOTSERVER].ipaddr); nfsdiskless.root_args.timeo = 10; nfsdiskless.root_args.retrans = 100; @@ -356,7 +356,7 @@ udp_transmit(destip, srcsock, destsock, len, buf) } else { long h_netmask = ntohl(netmask); /* Check to see if we need gateway */ - if (((destip & h_netmask) != + if (((destip & h_netmask) != (arptable[ARP_CLIENT].ipaddr & h_netmask)) && arptable[ARP_GATEWAY].ipaddr) destip = arptable[ARP_GATEWAY].ipaddr; @@ -507,7 +507,7 @@ await_reply(type, ival, ptr) if ((packetlen < protohdrlen) || (((packet[12] << 8) | packet[13]) != IP)) continue; ip = (struct iphdr *)&packet[ETHER_HDR_SIZE]; - if ((ip->verhdrlen != 0x45) || + if ((ip->verhdrlen != 0x45) || ipchksum(ip, sizeof(struct iphdr)) || (ip->protocol != IP_UDP)) continue; udp = (struct udphdr *)&packet[ETHER_HDR_SIZE + diff --git a/sys/i386/boot/netboot/ns8390.c b/sys/i386/boot/netboot/ns8390.c index 10e8862..14cca17 100644 --- a/sys/i386/boot/netboot/ns8390.c +++ b/sys/i386/boot/netboot/ns8390.c @@ -134,7 +134,7 @@ eth_probe() } } printf("\r\n"); - + } #endif #ifdef INCLUDE_3COM @@ -244,7 +244,7 @@ eth_probe() /* * Clear memory and verify that it worked (we use only 8K) */ - bzero(eth_bmem, 0x2000); + bzero(eth_bmem, 0x2000); for(i = 0; i < 0x2000; ++i) if (*((eth_bmem)+i)) { printf ("Failed to clear 3c503 shared mem.\r\n"); |