diff options
Diffstat (limited to 'sys/dev/isa')
| -rw-r--r-- | sys/dev/isa/if_eg.c | 13 | ||||
| -rw-r--r-- | sys/dev/isa/pcmcia_isa.c | 3 | ||||
| -rw-r--r-- | sys/dev/isa/pcmcia_pcic.c | 4 |
3 files changed, 14 insertions, 6 deletions
diff --git a/sys/dev/isa/if_eg.c b/sys/dev/isa/if_eg.c index c871ce1ffe5..ec89df2be3b 100644 --- a/sys/dev/isa/if_eg.c +++ b/sys/dev/isa/if_eg.c @@ -46,6 +46,7 @@ #include <sys/ioctl.h> #include <sys/errno.h> #include <sys/syslog.h> +#include <sys/systm.h> #include <sys/select.h> #include <sys/device.h> @@ -132,6 +133,14 @@ void egread __P((struct eg_softc *, caddr_t, int)); struct mbuf *egget __P((struct eg_softc *, caddr_t, int)); void egstop __P((struct eg_softc *)); +static inline void egprintpcb __P((struct eg_softc *)); +static inline void egprintstat __P((u_char)); +static int egoutPCB __P((struct eg_softc *, u_char)); +static int egreadPCBstat __P((struct eg_softc *, u_char)); +static int egreadPCBready __P((struct eg_softc *)); +static int egwritePCB __P((struct eg_softc *)); +static int egreadPCB __P((struct eg_softc *)); + /* * Support stuff */ @@ -297,7 +306,7 @@ egprobe(parent, match, aux) struct isa_attach_args *ia = aux; int i; - if (ia->ia_iobase & ~0x07f0 != 0) { + if ((ia->ia_iobase & ~0x07f0) != 0) { dprintf(("Weird iobase %x\n", ia->ia_iobase)); return 0; } @@ -351,7 +360,6 @@ egattach(parent, self, aux) struct eg_softc *sc = (void *)self; struct isa_attach_args *ia = aux; struct ifnet *ifp = &sc->sc_arpcom.ac_if; - int i; egstop(sc); @@ -734,7 +742,6 @@ egioctl(ifp, cmd, data) { struct eg_softc *sc = ifp->if_softc; struct ifaddr *ifa = (struct ifaddr *)data; - struct ifreq *ifr = (struct ifreq *)data; int s, error = 0; s = splnet(); diff --git a/sys/dev/isa/pcmcia_isa.c b/sys/dev/isa/pcmcia_isa.c index 6c62dcd3c35..e6c9f349cda 100644 --- a/sys/dev/isa/pcmcia_isa.c +++ b/sys/dev/isa/pcmcia_isa.c @@ -1,4 +1,4 @@ -/* $Id: pcmcia_isa.c,v 1.3 1996/05/03 07:59:36 deraadt Exp $ */ +/* $Id: pcmcia_isa.c,v 1.4 1996/10/16 12:36:02 deraadt Exp $ */ /* * Copyright (c) 1995,1996 John T. Kohl. All rights reserved. * Copyright (c) 1994 Stefan Grefen. All rights reserved. @@ -85,7 +85,6 @@ pcmcia_isa_init(parent, cf, aux, pca, flag) { struct pcmciabus_attach_args *pa = aux; bus_mem_handle_t memh; - vm_offset_t physaddr; #ifdef PCMCIA_ISA_DEBUG if (parent != NULL) diff --git a/sys/dev/isa/pcmcia_pcic.c b/sys/dev/isa/pcmcia_pcic.c index 60f5c065ae4..6f883c26db7 100644 --- a/sys/dev/isa/pcmcia_pcic.c +++ b/sys/dev/isa/pcmcia_pcic.c @@ -1,4 +1,4 @@ -/* $Id: pcmcia_pcic.c,v 1.6 1996/05/07 07:37:28 deraadt Exp $ */ +/* $Id: pcmcia_pcic.c,v 1.7 1996/10/16 12:36:04 deraadt Exp $ */ /* * Copyright (c) 1995, 1996 John T. Kohl * All rights reserved. @@ -221,6 +221,8 @@ pcic_wr(slot, reg, val) } } +static __inline int pcic_wait __P((struct slot *, int)); + static __inline int pcic_wait(slot, i) struct slot *slot; |