From 4ad7ed0b97f47157871a8baf16c5412dd66ae013 Mon Sep 17 00:00:00 2001 From: gwr Date: Tue, 11 Mar 1997 18:29:30 +0000 Subject: [PATCH] Moved dev_net.[ch] to sys/lib/libsa --- sys/arch/sun3/stand/netboot/Makefile | 16 +- sys/arch/sun3/stand/netboot/dev_net.c | 252 -------------------------- sys/arch/sun3/stand/netboot/dev_net.h | 6 - 3 files changed, 13 insertions(+), 261 deletions(-) delete mode 100644 sys/arch/sun3/stand/netboot/dev_net.c delete mode 100644 sys/arch/sun3/stand/netboot/dev_net.h diff --git a/sys/arch/sun3/stand/netboot/Makefile b/sys/arch/sun3/stand/netboot/Makefile index 8d024431190e..b761a38d5bb3 100644 --- a/sys/arch/sun3/stand/netboot/Makefile +++ b/sys/arch/sun3/stand/netboot/Makefile @@ -1,11 +1,21 @@ -# $NetBSD: Makefile,v 1.4 1995/11/17 23:23:55 gwr Exp $ +# $NetBSD: Makefile,v 1.5 1997/03/11 18:29:30 gwr Exp $ SA_PROG= netboot -SRCS= boot.c conf.c version.c dev_net.c +SRCS= boot.c conf.c version.c +OBJS= ${SRCS:S/.c/.o/g} -DEFS= -DSTANDALONE -DSUN_BOOTPARAMS +# Using local rules for these +OBJS+= dev_net.o globals.o + +DEFS= -DSTANDALONE all: ${SA_PROG}.bin .include +dev_net.o : ${S}/lib/libsa/dev_net.c + ${CC} ${CFLAGS} ${CPPFLAGS} -DSUN_BOOTPARAMS -c ${.IMPSRC} + +globals.o : ${S}/lib/libsa/globals.c + ${CC} ${CFLAGS} ${CPPFLAGS} -c ${.IMPSRC} + diff --git a/sys/arch/sun3/stand/netboot/dev_net.c b/sys/arch/sun3/stand/netboot/dev_net.c deleted file mode 100644 index e159174c267e..000000000000 --- a/sys/arch/sun3/stand/netboot/dev_net.c +++ /dev/null @@ -1,252 +0,0 @@ -/* $NetBSD: dev_net.c,v 1.4 1996/01/29 23:54:15 gwr Exp $ */ - -/* - * Copyright (c) 1995 Gordon W. Ross - * 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. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * 4. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by Gordon W. Ross - * - * 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 EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF 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. - */ - -/* - * This module implements a "raw device" interface suitable for - * use by the stand-alone I/O library NFS code. This interface - * does not support any "block" access, and exists only for the - * purpose of initializing the network interface, getting boot - * parameters, and performing the NFS mount. - * - * At open time, this does: - * - * find interface - netif_open() - * RARP for IP address - rarp_getipaddress() - * RPC/bootparams - callrpc(d, RPC_BOOTPARAMS, ...) - * RPC/mountd - nfs_mount(sock, ip, path) - * - * the root file handle from mountd is saved in a global - * for use by the NFS open code (NFS/lookup). - */ - -#include -#include -#include -#include -#include -#include -#include - -#include "stand.h" -#include "net.h" -#include "netif.h" -#include "bootparam.h" -#include "dev_net.h" - -extern int debug; -extern int nfs_root_node[]; /* XXX - get from nfs_mount() */ - -/* - * Various globals needed by the network code: - */ - -/* for arp.c, rarp.c */ -u_char bcea[6] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; - -struct in_addr myip; /* my ip address */ -struct in_addr rootip; /* root ip address */ -struct in_addr gateip; /* swap ip address */ -n_long netmask; /* subnet or net mask */ - -char rootpath[FNAME_SIZE]; - -int hostnamelen; -char hostname[FNAME_SIZE]; - -int domainnamelen; -char domainname[FNAME_SIZE]; - -/* - * Local things... - */ -static int netdev_sock = -1; -static int netdev_opens; - -/* - * Called by devopen after it sets f->f_dev to our devsw entry. - * This opens the low-level device and sets f->f_devdata. - * This is declared with variable arguments... - */ -int -net_open(struct open_file *f, ...) -{ - va_list ap; - char *devname; /* Device part of file name (or NULL). */ - int error = 0; - - va_start(ap, f); - devname = va_arg(ap, char*); - va_end(ap); - -#ifdef NETIF_DEBUG - if (debug) - printf("net_open: %s\n", devname); -#endif - - /* On first open, do netif open, mount, etc. */ - if (netdev_opens == 0) { - /* Find network interface. */ - if (netdev_sock < 0) { - netdev_sock = netif_open(devname); - if (netdev_sock < 0) { - printf("net_open: netif_open() failed\n"); - return (ENXIO); - } - if (debug) - printf("net_open: netif_open() succeeded\n"); - } - if (rootip.s_addr == 0) { - /* Get root IP address, and path, etc. */ - error = net_getparams(netdev_sock); - if (error) { - /* getparams makes its own noise */ - goto fail; - } - /* Get the NFS file handle (mountd). */ - error = nfs_mount(netdev_sock, rootip, rootpath); - if (error) { - printf("net_open: NFS mount error=%d\n", error); - rootip.s_addr = 0; - fail: - netif_close(netdev_sock); - netdev_sock = -1; - return (error); - } - if (debug) - printf("net_open: NFS mount succeeded\n"); - } - } - netdev_opens++; - f->f_devdata = nfs_root_node; - return (error); -} - -int -net_close(f) - struct open_file *f; -{ - -#ifdef NETIF_DEBUG - if (debug) - printf("net_close: opens=%d\n", netdev_opens); -#endif - - /* On last close, do netif close, etc. */ - f->f_devdata = NULL; - /* Extra close call? */ - if (netdev_opens <= 0) - return (0); - netdev_opens--; - /* Not last close? */ - if (netdev_opens > 0) - return(0); - rootip.s_addr = 0; - if (netdev_sock >= 0) { - if (debug) - printf("net_close: calling netif_close()\n"); - netif_close(netdev_sock); - netdev_sock = -1; - } - return (0); -} - -int -net_ioctl() -{ - return EIO; -} - -int -net_strategy() -{ - return EIO; -} - -int -net_getparams(sock) - int sock; -{ - /* - * Get info for NFS boot: our IP address, our hostname, - * server IP address, and our root path on the server. - * There are two ways to do this: The old, Sun way, - * and the more modern, BOOTP way. (RFC951, RFC1048) - */ - -#ifdef SUN_BOOTPARAMS - /* Get our IP address. (rarp.c) */ - if (rarp_getipaddress(sock)) { - printf("net_open: RARP failed\n"); - return (EIO); - } -#else /* BOOTPARAMS */ - /* - * Get boot info using BOOTP. (RFC951, RFC1048) - * This also gets the server IP address, gateway, - * root path, etc. - */ - bootp(sock); - if (myip.s_addr == 0) { - printf("net_open: BOOTP failed\n"); - return (EIO); - } -#endif /* BOOTPARAMS */ - - printf("boot: client addr: %s\n", inet_ntoa(myip)); - -#ifdef SUN_BOOTPARAMS - /* Get our hostname, server IP address, gateway. */ - if (bp_whoami(sock)) { - printf("net_open: bootparam/whoami RPC failed\n"); - return (EIO); - } -#endif /* BOOTPARAMS */ - - printf("boot: client name: %s\n", hostname); - if (gateip.s_addr) { - printf("boot: subnet mask: %s\n", intoa(netmask)); - printf("boot: net gateway: %s\n", inet_ntoa(gateip)); - } - -#ifdef SUN_BOOTPARAMS - /* Get the root pathname. */ - if (bp_getfile(sock, "root", &rootip, rootpath)) { - printf("net_open: bootparam/getfile RPC failed\n"); - return (EIO); - } -#endif /* BOOTPARAMS */ - - printf("boot: server addr: %s\n", inet_ntoa(rootip)); - printf("boot: server path: %s\n", rootpath); - - return (0); -} diff --git a/sys/arch/sun3/stand/netboot/dev_net.h b/sys/arch/sun3/stand/netboot/dev_net.h deleted file mode 100644 index 093ba193bfd3..000000000000 --- a/sys/arch/sun3/stand/netboot/dev_net.h +++ /dev/null @@ -1,6 +0,0 @@ - -int net_open __P((struct open_file *, ...)); -int net_close __P((struct open_file *)); -int net_ioctl(); -int net_strategy(); -