summaryrefslogtreecommitdiffstats
path: root/sys/dev/pcic
diff options
context:
space:
mode:
authorimp <imp@FreeBSD.org>2000-11-30 23:30:47 +0000
committerimp <imp@FreeBSD.org>2000-11-30 23:30:47 +0000
commitca6ea62f39d25c60343185b49f7e6c655247720c (patch)
treef305583137c1788a72811e4923ae8f2098bbb6a8 /sys/dev/pcic
parent0b2373aa5cf1a6b78b59d24c40bfd4ea7e8b3b12 (diff)
downloadFreeBSD-src-ca6ea62f39d25c60343185b49f7e6c655247720c.zip
FreeBSD-src-ca6ea62f39d25c60343185b49f7e6c655247720c.tar.gz
Kill #define of DETACH_FORCE since it is now in card_if.m
Diffstat (limited to 'sys/dev/pcic')
-rw-r--r--sys/dev/pcic/i82365.c2
-rw-r--r--sys/dev/pcic/i82365var.h36
2 files changed, 2 insertions, 36 deletions
diff --git a/sys/dev/pcic/i82365.c b/sys/dev/pcic/i82365.c
index bee17c8..ea08b2f 100644
--- a/sys/dev/pcic/i82365.c
+++ b/sys/dev/pcic/i82365.c
@@ -72,8 +72,6 @@ int pcic_debug = 1;
#define VERBOSE(arg) if (bootverbose) printf arg; else ;
-#define DETACH_FORCE 0x1
-
#define PCIC_VENDOR_UNKNOWN 0
#define PCIC_VENDOR_I82365SLR0 1
#define PCIC_VENDOR_I82365SLR1 2
diff --git a/sys/dev/pcic/i82365var.h b/sys/dev/pcic/i82365var.h
index 249398e..1b6252f 100644
--- a/sys/dev/pcic/i82365var.h
+++ b/sys/dev/pcic/i82365var.h
@@ -136,40 +136,8 @@ char *pcic_vendor_to_string(int);
int pcic_attach(device_t dev);
-#if 0
-
-static __inline int pcic_read(struct pcic_handle *, int);
-static __inline int
-pcic_read(h, idx)
- struct pcic_handle *h;
- int idx;
-{
- if (idx != -1)
- bus_space_write_1(h->sc->iot, h->sc->ioh, PCIC_REG_INDEX,
- h->sock + idx);
- return (bus_space_read_1(h->sc->iot, h->sc->ioh, PCIC_REG_DATA));
-}
-
-static __inline void pcic_write(struct pcic_handle *, int, int);
-static __inline void
-pcic_write(h, idx, data)
- struct pcic_handle *h;
- int idx;
- int data;
-{
- if (idx != -1)
- bus_space_write_1(h->sc->iot, h->sc->ioh, PCIC_REG_INDEX,
- h->sock + idx);
- bus_space_write_1(h->sc->iot, h->sc->ioh, PCIC_REG_DATA, (data));
-}
-#else
-#define pcic_read(h, idx) \
- (*(h)->ph_read)((h), (idx))
-
-#define pcic_write(h, idx, data) \
- (*(h)->ph_write)((h), (idx), (data))
-
-#endif
+#define pcic_read(h, idx) (*(h)->ph_read)((h), (idx))
+#define pcic_write(h, idx, data) (*(h)->ph_write)((h), (idx), (data))
/*
* bus/device/etc routines
OpenPOWER on IntegriCloud