diff options
Diffstat (limited to 'sys/arch/mvme88k/stand/netboot')
| -rw-r--r-- | sys/arch/mvme88k/stand/netboot/dev_net.c | 6 | ||||
| -rw-r--r-- | sys/arch/mvme88k/stand/netboot/devopen.c | 3 | ||||
| -rw-r--r-- | sys/arch/mvme88k/stand/netboot/if_ie.c | 15 |
3 files changed, 13 insertions, 11 deletions
diff --git a/sys/arch/mvme88k/stand/netboot/dev_net.c b/sys/arch/mvme88k/stand/netboot/dev_net.c index 35bb7fdd7c7..fc2922a293b 100644 --- a/sys/arch/mvme88k/stand/netboot/dev_net.c +++ b/sys/arch/mvme88k/stand/netboot/dev_net.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dev_net.c,v 1.3 1999/01/11 05:11:46 millert Exp $ */ +/* $OpenBSD: dev_net.c,v 1.4 2006/05/16 22:52:09 miod Exp $ */ /* * Copyright (c) 1995 Gordon W. Ross @@ -63,6 +63,7 @@ #include "netif.h" #include "config.h" #include "bootparam.h" +#include "nfs.h" extern int nfs_root_node[]; /* XXX - get from nfs_mount() */ @@ -72,6 +73,8 @@ char rootpath[FNAME_SIZE]; int netdev_sock = -1; static int open_count; +int net_mountroot(struct open_file *, char *); + /* * Called by devopen after it sets f->f_dev to our devsw entry. * This opens the low-level device and sets f->f_devdata. @@ -105,6 +108,7 @@ net_close(f) if (--open_count == 0) netif_close(netdev_sock); f->f_devdata = NULL; + return (0); } int diff --git a/sys/arch/mvme88k/stand/netboot/devopen.c b/sys/arch/mvme88k/stand/netboot/devopen.c index e8d4893bf24..36e38fee4b1 100644 --- a/sys/arch/mvme88k/stand/netboot/devopen.c +++ b/sys/arch/mvme88k/stand/netboot/devopen.c @@ -1,4 +1,4 @@ -/* $OpenBSD: devopen.c,v 1.2 2002/03/14 03:15:58 millert Exp $ */ +/* $OpenBSD: devopen.c,v 1.3 2006/05/16 22:52:09 miod Exp $ */ #include <sys/param.h> #include <stand.h> @@ -20,7 +20,6 @@ devopen(f, fname, file) char **file; { struct devsw *dp; - char *cp, *path, *devname; int error; *file = (char *)fname; diff --git a/sys/arch/mvme88k/stand/netboot/if_ie.c b/sys/arch/mvme88k/stand/netboot/if_ie.c index 0965facb7b7..cfcc47dea5f 100644 --- a/sys/arch/mvme88k/stand/netboot/if_ie.c +++ b/sys/arch/mvme88k/stand/netboot/if_ie.c @@ -1,8 +1,8 @@ -/* $OpenBSD: if_ie.c,v 1.7 2003/06/04 16:36:15 deraadt Exp $ */ +/* $OpenBSD: if_ie.c,v 1.8 2006/05/16 22:52:09 miod Exp $ */ /* * Copyright (c) 1995 Theo de Raadt - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -45,6 +45,7 @@ #include "libsa.h" #include "netif.h" #include "config.h" +#include "net.h" #include "i82586.h" #include "if_iereg.h" @@ -61,6 +62,7 @@ int ie_poll(struct iodesc *, void *, int); int ie_probe(struct netif *, void *); int ie_put(struct iodesc *, void *, size_t); void ie_reset(struct netif *, u_char *); +extern void machdep_common_ether(u_char *); struct netif_stats ie_stats; @@ -144,6 +146,7 @@ ie_error(nif, str, ier) panic("ie%d: unknown error", nif->nif_unit); } +void ieack(ier, iem) volatile struct iereg *ier; struct iemem *iem; @@ -162,7 +165,7 @@ ie_reset(nif, myea) { volatile struct iereg *ier = ie_softc.sc_reg; struct iemem *iem = ie_softc.sc_mem; - int timo = 10000, stat, i; + int timo = 10000, i; volatile int t; u_int a; @@ -290,10 +293,8 @@ ie_poll(desc, pkt, len) { volatile struct iereg *ier = ie_softc.sc_reg; struct iemem *iem = ie_softc.sc_mem; - u_char *p = pkt; static int slot; int length = 0; - u_int a; u_short status; asm(".word 0xf518\n"); @@ -359,8 +360,6 @@ ie_put(desc, pkt, len) volatile struct iereg *ier = ie_softc.sc_reg; struct iemem *iem = ie_softc.sc_mem; u_char *p = pkt; - int timo = 10000, stat, i; - volatile int t; u_int a; int xx = 0; @@ -400,7 +399,7 @@ ie_put(desc, pkt, len) ier->ie_attention = 1; /* chan attention! */ if (ie_debug) { - printf("ie%d: send %d to %x:%x:%x:%x:%x:%x\n", + printf("ie%d: send %ld to %x:%x:%x:%x:%x:%x\n", desc->io_netif->nif_unit, len, p[0], p[1], p[2], p[3], p[4], p[5]); } |