summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authormycroft <mycroft@NetBSD.org>1995-08-19 04:58:44 +0000
committermycroft <mycroft@NetBSD.org>1995-08-19 04:58:44 +0000
commit4fec83b441a57ef19897c2cb0732e488cec39ff6 (patch)
tree2cacef7802f3f3865a0f06419d4b4d090c837fee /sys/dev
parentb0dc5d3d7fa47e414b3a095c16c6aec00473de4e (diff)
Fix oversights in previous change.
Remove ugly casts and correct spelling.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/pci/if_de.c15
1 files changed, 10 insertions, 5 deletions
diff --git a/sys/dev/pci/if_de.c b/sys/dev/pci/if_de.c
index fdb9e663fe1..037f4657eca 100644
--- a/sys/dev/pci/if_de.c
+++ b/sys/dev/pci/if_de.c
@@ -108,6 +108,7 @@
#include <dev/pci/pcivar.h>
#include <dev/ic/dc21040reg.h>
#if defined(__i386__)
+#include <machine/pio.h>
#include <i386/isa/isa_machdep.h>
#endif
#endif /* __NetBSD__ */
@@ -136,7 +137,11 @@ typedef struct {
} tulip_ringinfo_t;
#ifdef TULIP_IOMAPPED
+#ifndef __NetBSD__
typedef tulip_uint16_t tulip_csrptr_t;
+#else
+typedef int tulip_csrptr_t;
+#endif
#define TULIP_EISA_CSRSIZE 16
#define TULIP_EISA_CSROFFSET 0
@@ -288,12 +293,12 @@ struct _tulip_softc_t {
#if defined(__bsdi__)
struct device tulip_dev; /* base device */
struct isadev tulip_id; /* ISA device */
- struct intrhand tulip_ih; /* intrrupt vectoring */
+ struct intrhand tulip_ih; /* interrupt vectoring */
struct atshutdown tulip_ats; /* shutdown hook */
#endif
#if defined(__NetBSD__)
struct device tulip_dev; /* base device */
- void *tulip_ih; /* intrrupt vectoring */
+ void *tulip_ih; /* interrupt vectoring */
void *tulip_ats; /* shutdown hook */
#endif
struct arpcom tulip_ac;
@@ -1767,13 +1772,13 @@ tulip_ioctl(
switch(ifa->ifa_addr->sa_family) {
#ifdef INET
case AF_INET: {
- ((struct arpcom *)ifp)->ac_ipaddr = IA_SIN(ifa)->sin_addr;
+ sc->tulip_ac.ac_ipaddr = IA_SIN(ifa)->sin_addr;
tulip_addr_filter(sc); /* reset multicast filtering */
tulip_init(sc);
#if defined(__FreeBSD__) || defined(__NetBSD__)
- arp_ifinit((struct arpcom *)ifp, ifa);
+ arp_ifinit(&sc->tulip_ac, ifa);
#elif defined(__bsdi__)
- arpwhohas((struct arpcom *)ifp, &IA_SIN(ifa)->sin_addr);
+ arpwhohas(&sc->tulip_ac, &IA_SIN(ifa)->sin_addr);
#endif
break;
}