diff options
| -rw-r--r-- | sys/dev/pcic/i82365.c | 2 | ||||
| -rw-r--r-- | sys/dev/pcic/i82365var.h | 36 |
2 files changed, 2 insertions, 36 deletions
diff --git a/sys/dev/pcic/i82365.c b/sys/dev/pcic/i82365.c index bee17c858b19..ea08b2f1b902 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 249398e41845..1b6252f3bd28 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 |