mirror of
https://git.FreeBSD.org/src.git
synced 2024-10-19 02:29:40 +00:00
Various cleanups for remanents of devconf.
This commit is contained in:
parent
fa630ea6eb
commit
40f3771f7f
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=18158
@ -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",
|
||||
|
@ -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_ */
|
||||
|
@ -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;
|
||||
|
@ -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
|
||||
|
@ -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.
|
||||
|
@ -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",
|
||||
|
@ -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_ */
|
||||
|
@ -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;
|
||||
|
@ -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
|
||||
|
@ -31,7 +31,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* from: @(#)isa_device.h 7.1 (Berkeley) 5/9/91
|
||||
* $Id: isa_device.h,v 1.30 1996/06/14 11:01:19 asami Exp $
|
||||
* $Id: isa_device.h,v 1.31 1996/09/04 09:49:35 asami Exp $
|
||||
*/
|
||||
|
||||
#ifndef _I386_ISA_ISA_DEVICE_H_
|
||||
@ -127,7 +127,6 @@ extern struct isa_device isa_devtab_bio[];
|
||||
extern struct isa_device isa_devtab_net[];
|
||||
extern struct isa_device isa_devtab_null[];
|
||||
extern struct isa_device isa_devtab_tty[];
|
||||
extern struct kern_devconf kdc_isa0;
|
||||
|
||||
struct kern_devconf;
|
||||
struct sysctl_req;
|
||||
@ -160,10 +159,6 @@ void isa_dmainit __P((int chan, u_int bouncebufsize));
|
||||
void isa_dmastart __P((int flags, caddr_t addr, u_int nbytes, int chan));
|
||||
int isa_dma_acquire __P((int chan));
|
||||
void isa_dma_release __P((int chan));
|
||||
int isa_externalize __P((struct isa_device *id, struct sysctl_req *req));
|
||||
int isa_generic_externalize __P((struct kern_devconf *kdc,
|
||||
struct sysctl_req *req));
|
||||
int isa_internalize __P((struct isa_device *id, struct sysctl_req *req));
|
||||
int isa_irq_pending __P((struct isa_device *dvp));
|
||||
int isa_nmi __P((int cd));
|
||||
void reconfig_isadev __P((struct isa_device *isdp, u_int *mp));
|
||||
|
@ -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.
|
||||
|
@ -35,7 +35,7 @@
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* $Id: scsi_driver.h,v 1.6 1996/03/10 07:13:08 gibbs Exp $
|
||||
* $Id: scsi_driver.h,v 1.7 1996/09/06 23:09:14 phk Exp $
|
||||
*
|
||||
*/
|
||||
#ifndef _SCSI__DRIVER_H_
|
||||
@ -45,7 +45,6 @@
|
||||
|
||||
#include <sys/conf.h>
|
||||
|
||||
struct kern_devconf;
|
||||
struct scsi_link;
|
||||
struct scsi_device;
|
||||
struct buf;
|
||||
|
@ -16,7 +16,7 @@
|
||||
*
|
||||
* New configuration setup: dufault@hda.com
|
||||
*
|
||||
* $Id: scsiconf.c,v 1.61 1996/07/12 04:12:05 bde Exp $
|
||||
* $Id: scsiconf.c,v 1.62 1996/09/06 23:09:15 phk Exp $
|
||||
*/
|
||||
|
||||
#include "opt_scsi.h"
|
||||
@ -1347,9 +1347,3 @@ scsi_selectdev(qualifier, type, remov, manu, model, rev)
|
||||
}
|
||||
return (bestmatch);
|
||||
}
|
||||
|
||||
int
|
||||
scsi_externalize(struct scsi_link *sl, struct sysctl_req *req)
|
||||
{
|
||||
return SYSCTL_OUT(req, sl, sizeof *sl);
|
||||
}
|
||||
|
@ -14,7 +14,7 @@
|
||||
*
|
||||
* Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992
|
||||
*
|
||||
* $Id: scsiconf.h,v 1.43 1996/06/23 15:02:02 bde Exp $
|
||||
* $Id: scsiconf.h,v 1.44 1996/06/24 04:54:31 gibbs Exp $
|
||||
*/
|
||||
#ifndef SCSI_SCSICONF_H
|
||||
#define SCSI_SCSICONF_H 1
|
||||
@ -122,9 +122,6 @@ struct proc;
|
||||
* instance down in the adapter drivers is removed.
|
||||
*/
|
||||
|
||||
/*
|
||||
* XXX <devconf.h> already includes too much; avoid including <conf.h>.
|
||||
*/
|
||||
typedef int yet_another_d_open_t __P((dev_t, int, int, struct proc *));
|
||||
|
||||
struct scsi_device
|
||||
@ -473,13 +470,8 @@ void sc_print_addr __P((struct scsi_link *));
|
||||
void sc_print_start __P((struct scsi_link *));
|
||||
void sc_print_finish __P((void));
|
||||
|
||||
struct sysctl_req;
|
||||
int scsi_externalize __P((struct scsi_link *, struct sysctl_req *));
|
||||
|
||||
void scsi_device_register __P((struct scsi_device *sd));
|
||||
|
||||
extern struct kern_devconf kdc_scbus0; /* XXX should go away */
|
||||
|
||||
void scsi_configure_start __P((void));
|
||||
void scsi_configure_finish __P((void));
|
||||
|
||||
|
@ -37,13 +37,7 @@
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* $Id: sctarg.c,v 1.15 1996/03/28 14:33:55 scrappy Exp $
|
||||
*/
|
||||
|
||||
/*
|
||||
* XXX dufault@hda.com: We need the "kern devconf" stuff, but I'm not
|
||||
* going to add it until it is done in a simple way that provides
|
||||
* base behavior in scsi_driver.c
|
||||
* $Id: sctarg.c,v 1.16 1996/07/14 10:46:52 joerg Exp $
|
||||
*/
|
||||
|
||||
#include "opt_bounce.h"
|
||||
|
@ -43,14 +43,10 @@
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* $Id: worm.c,v 1.27 1996/03/28 14:33:59 scrappy Exp $
|
||||
* $Id: worm.c,v 1.28 1996/07/14 10:46:56 joerg Exp $
|
||||
*/
|
||||
|
||||
/* XXX This is PRELIMINARY.
|
||||
*
|
||||
* We need the "kern devconf" stuff, but I'm not
|
||||
* going to add it until it is done in a simple way that provides
|
||||
* base behavior in scsi_driver.c
|
||||
*
|
||||
* Until Bruce finishes the slice stuff there will be no partitions.
|
||||
* When it is finished I hope to hoist the partition code up into
|
||||
|
Loading…
Reference in New Issue
Block a user