Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/next68k/stand/boot tweaks to compile with egcs -Werror
details: https://anonhg.NetBSD.org/src/rev/ece02b947dce
branches: trunk
changeset: 467589:ece02b947dce
user: dbj <dbj%NetBSD.org@localhost>
date: Fri Mar 26 06:54:40 1999 +0000
description:
tweaks to compile with egcs -Werror
minor changes to scsi driver register accesses.
diffstat:
sys/arch/next68k/stand/boot/Makefile | 13 +-
sys/arch/next68k/stand/boot/dev_net.c | 263 ----------------------------------
sys/arch/next68k/stand/boot/dev_net.h | 7 -
sys/arch/next68k/stand/boot/devopen.c | 7 +-
sys/arch/next68k/stand/boot/en.c | 4 +-
sys/arch/next68k/stand/boot/machdep.c | 4 +-
sys/arch/next68k/stand/boot/rtc.c | 7 +-
sys/arch/next68k/stand/boot/scsi.c | 46 ++++-
sys/arch/next68k/stand/boot/sd.c | 6 +-
9 files changed, 67 insertions(+), 290 deletions(-)
diffs (truncated from 528 to 300 lines):
diff -r 3912c3c2c017 -r ece02b947dce sys/arch/next68k/stand/boot/Makefile
--- a/sys/arch/next68k/stand/boot/Makefile Fri Mar 26 06:48:40 1999 +0000
+++ b/sys/arch/next68k/stand/boot/Makefile Fri Mar 26 06:54:40 1999 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 1999/02/13 02:54:48 lukem Exp $
+# $NetBSD: Makefile,v 1.7 1999/03/26 06:54:40 dbj Exp $
S= ${.CURDIR}/../../../..
@@ -22,7 +22,7 @@
# XXX make defs arch-indep.
INCLUDES+= -I${.CURDIR} -I${.CURDIR}/obj.${MACHINE} -I${S}/arch -I${S} -I${S}/lib/libsa -I${S}/lib/libkern
-DEFS+= -D_STANDALONE -DMC68040 -DSUPPORT_BOOTP -DSUPPORT_DHCP -DDEBUG # -DEN_DEBUG -DNETIF_DEBUG # -DSD_DEBUG -DSCSI_DEBUG
+DEFS+= -D_STANDALONE -DMC68040 -DSUPPORT_BOOTP -DSUPPORT_DHCP -DDEBUG -DSD_DEBUG -DSCSI_DEBUG # -DEN_DEBUG -DNETIF_DEBUG
SAMISCCPPFLAGS= -DSUPPORT_DHCP -DSUPPORT_BOOTP -DINSECURE # -DBOOTP_DEBUG -DETHER_DEBUG -DNET_DEBUG # -DNETIF_DEBUG -DNFS_DEBUG -DARP_DEBUG
WARNS=1
HAVE_GCC28!= ${CC} --version | egrep "^(2\.8|egcs)" ; echo
@@ -33,7 +33,7 @@
LIBCRT0=
PROG= boot
-SRCS= boot.c machdep.c conf.c devopen.c rtc.c sd.c scsi.c en.c dev_net.c
+SRCS= boot.c machdep.c conf.c devopen.c rtc.c sd.c scsi.c en.c
# @@@ dev_net.c should really be in libsa, but it doesn't
# declare ip_convertaddr correctly, so I put it here _temporarily_.
@@ -41,7 +41,8 @@
BINDIR= /usr/mdec
#LIBS= ${SALIB} ${KERNLIB} ${ZLIB}
LIBS= ${SALIB} ${KERNLIB}
-#OBJS+= dev_net.o
+
+OBJS+= dev_net.o
${PROG}: links srt0.o ${OBJS} vers.o ${LIBS}
${LD} -N -Ttext ${RELOC} -e start srt0.o ${OBJS} ${LIBS} vers.o -o $@
@@ -49,8 +50,8 @@
# this looks useful to me ... let's see when it will be an official part
# of libsa
-#dev_net.o : ${S}/lib/libsa/dev_net.c
-# ${COMPILE.c} -DSUPPORT_BOOTP ${.IMPSRC}
+dev_net.o : ${S}/lib/libsa/dev_net.c
+ ${COMPILE.c} ${.IMPSRC}
# startup
diff -r 3912c3c2c017 -r ece02b947dce sys/arch/next68k/stand/boot/dev_net.c
--- a/sys/arch/next68k/stand/boot/dev_net.c Fri Mar 26 06:48:40 1999 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,263 +0,0 @@
-/* $NetBSD: dev_net.c,v 1.1.1.1 1998/06/09 07:53:06 dbj Exp $ */
-
-/*-
- * Copyright (c) 1997 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Gordon W. Ross.
- *
- * 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. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the NetBSD
- * Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``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 FOUNDATION OR CONTRIBUTORS
- * 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 <machine/stdarg.h>
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <net/if.h>
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-
-#include "stand.h"
-#include "net.h"
-#include "netif.h"
-#include "nfs.h"
-#include "bootparam.h"
-#include "dev_net.h"
-
-extern int nfs_root_node[]; /* XXX - get from nfs_mount() */
-
-static int netdev_sock = -1;
-static int netdev_opens;
-
-static int net_getparams __P((int sock));
-
-n_long ip_convertaddr __P((char *p));
-
-/*
- * 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;
-}
-
-
-/*
- * 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)
- *
- * The default is to use the Sun bootparams RPC
- * (because that is what the kernel will do).
- * MD code can make try_bootp initialied data,
- * which will override this common definition.
- */
-#ifdef SUPPORT_BOOTP
-int try_bootp;
-int bootp __P((int sock));
-#endif
-
-static int
-net_getparams(sock)
- int sock;
-{
- char buf[MAXHOSTNAMELEN];
- n_long smask;
-
-#ifdef SUPPORT_BOOTP
- /*
- * Try to get boot info using BOOTP. If we succeed, then
- * the server IP address, gateway, and root path will all
- * be initialized. If any remain uninitialized, we will
- * use RARP and RPC/bootparam (the Sun way) to get them.
- */
- if (try_bootp)
- bootp(sock);
- if (myip.s_addr != 0)
- return (0);
- if (debug)
- printf("net_open: BOOTP failed, trying RARP/RPC...\n");
-#endif
-
- /*
- * Use RARP to get our IP address. This also sets our
- * netmask to the "natural" default for our address.
- */
- if (rarp_getipaddress(sock)) {
- printf("net_open: RARP failed\n");
- return (EIO);
- }
- printf("net_open: client addr: %s\n", inet_ntoa(myip));
-
- /* Get our hostname, server IP address, gateway. */
- if (bp_whoami(sock)) {
- printf("net_open: bootparam/whoami RPC failed\n");
- return (EIO);
- }
- printf("net_open: client name: %s\n", hostname);
-
- /*
- * Ignore the gateway from whoami (unreliable).
- * Use the "gateway" parameter instead.
- */
- smask = 0;
- gateip.s_addr = 0;
- if (bp_getfile(sock, "gateway", &gateip, buf) == 0) {
- /* Got it! Parse the netmask. */
- smask = ip_convertaddr(buf);
- }
- if (smask) {
- netmask = smask;
- printf("net_open: subnet mask: %s\n", intoa(netmask));
Home |
Main Index |
Thread Index |
Old Index