diff options
Diffstat (limited to 'sys/dev')
-rw-r--r-- | sys/dev/eisa/eisaconf.c | 7 | ||||
-rw-r--r-- | sys/dev/eisa/eisaconf.h | 10 | ||||
-rw-r--r-- | sys/dev/ep/if_epreg.h | 4 | ||||
-rw-r--r-- | sys/dev/fe/if_fe.c | 3 | ||||
-rw-r--r-- | sys/dev/pci/pcivar.h | 12 |
5 files changed, 5 insertions, 31 deletions
diff --git a/sys/dev/eisa/eisaconf.c b/sys/dev/eisa/eisaconf.c index 12b6335..762633b 100644 --- a/sys/dev/eisa/eisaconf.c +++ b/sys/dev/eisa/eisaconf.c @@ -28,7 +28,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: eisaconf.c,v 1.21 1996/08/31 14:47:30 bde Exp $ + * $Id: eisaconf.c,v 1.22 1996/09/06 23:06:57 phk Exp $ */ #include <sys/param.h> #include <sys/systm.h> @@ -347,11 +347,6 @@ eisa_reg_end(e_dev) { if( reg_state.in_registration ) { - /* - * The device should have called eisa_registerdev() - * during its probe. So hopefully we can use the kdc - * to weed out ISA/VL devices that use EISA id registers. - */ char string[25]; sprintf(string, " on %s0 slot %d", diff --git a/sys/dev/eisa/eisaconf.h b/sys/dev/eisa/eisaconf.h index 5bceffb..985a3ad 100644 --- a/sys/dev/eisa/eisaconf.h +++ b/sys/dev/eisa/eisaconf.h @@ -28,7 +28,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: eisaconf.h,v 1.9 1996/04/20 21:21:50 gibbs Exp $ + * $Id: eisaconf.h,v 1.10 1996/09/06 23:06:59 phk Exp $ */ #ifndef _I386_EISA_EISACONF_H_ @@ -71,7 +71,6 @@ struct eisa_ioconf { u_short irq; /* bitmask of interrupt */ }; -struct kern_devconf; struct eisa_device; struct eisa_driver { @@ -94,7 +93,6 @@ struct eisa_device { char* full_name; /* for use in the probe message */ struct eisa_ioconf ioconf; struct eisa_driver* driver; - struct kern_devconf* kdc; }; void eisa_configure __P((void)); @@ -112,10 +110,4 @@ int eisa_add_mspace __P((struct eisa_device *, u_long, u_long, int)); int eisa_reg_mspace __P((struct eisa_device *, resvaddr_t *)); int eisa_registerdev __P((struct eisa_device *, struct eisa_driver *)); - -struct sysctl_req; -int eisa_externalize (struct eisa_device *, struct sysctl_req*); - -#define EISA_EXTERNALLEN (sizeof(struct eisa_device)) - #endif /* _I386_EISA_EISACONF_H_ */ diff --git a/sys/dev/ep/if_epreg.h b/sys/dev/ep/if_epreg.h index 3767676..5685832 100644 --- a/sys/dev/ep/if_epreg.h +++ b/sys/dev/ep/if_epreg.h @@ -31,7 +31,7 @@ */ /* - * $Id: if_epreg.h,v 1.15 1996/07/19 13:20:05 amurai Exp $ + * $Id: if_epreg.h,v 1.16 1996/08/06 21:14:06 phk Exp $ * * Promiscuous mode added and interrupt logic slightly changed * to reduce the number of adapter failures. Transceiver select @@ -82,8 +82,6 @@ struct ep_softc { int unit; - struct kern_devconf* kdc; - #ifdef EP_LOCAL_STATS short tx_underrun; short rx_no_first; diff --git a/sys/dev/fe/if_fe.c b/sys/dev/fe/if_fe.c index 5d18329..13f798e 100644 --- a/sys/dev/fe/if_fe.c +++ b/sys/dev/fe/if_fe.c @@ -21,7 +21,7 @@ */ /* - * $Id: if_fe.c,v 1.17 1996/08/06 21:14:07 phk Exp $ + * $Id: if_fe.c,v 1.18 1996/09/06 23:07:34 phk Exp $ * * Device driver for Fujitsu MB86960A/MB86965A based Ethernet cards. * To be used with FreeBSD 2.x @@ -233,7 +233,6 @@ static struct fe_softc { } fe_softc[NFE]; -/* Frequently accessed members in arpcom and kdc. */ #define sc_if arpcom.ac_if #define sc_unit arpcom.ac_if.if_unit #define sc_enaddr arpcom.ac_enaddr diff --git a/sys/dev/pci/pcivar.h b/sys/dev/pci/pcivar.h index 51516ec..f8d2a95 100644 --- a/sys/dev/pci/pcivar.h +++ b/sys/dev/pci/pcivar.h @@ -1,6 +1,6 @@ /************************************************************************** ** -** $Id: pcivar.h,v 1.10 1996/03/19 15:02:58 bde Exp $ +** $Id: pcivar.h,v 1.11 1996/09/06 23:09:01 phk Exp $ ** ** Declarations for pci device drivers. ** @@ -125,8 +125,6 @@ void pci_conf_write (pcici_t tag, u_long reg, u_long data); **----------------------------------------------------------------- */ -struct kern_devconf; - struct pci_device { char* pd_name; char* (*pd_probe ) (pcici_t tag, pcidi_t type); @@ -164,14 +162,6 @@ struct pci_info { u_char pi_unit; }; -#define PCI_EXT_CONF_LEN (16) -#define PCI_EXTERNAL_LEN (sizeof(struct pci_externalize_buffer)) - -struct pci_externalize_buffer { - struct pci_info peb_pci_info; - u_long peb_config[PCI_EXT_CONF_LEN]; -}; - /*----------------------------------------------------------------- ** ** Map a pci device to physical and virtual memory. |