From b568ea4e01d5c2d673621943d5cfe2dede9d069a Mon Sep 17 00:00:00 2001 From: Bruce Evans Date: Tue, 10 Sep 1996 23:31:13 +0000 Subject: [PATCH] Removed more devconf leftovers. --- sys/amd64/isa/isa.c | 3 +-- sys/dev/eisa/eisaconf.h | 4 ++-- sys/dev/pci/pci.c | 25 +------------------------ sys/dev/pci/pcivar.h | 17 +---------------- sys/i386/eisa/eisaconf.h | 4 ++-- sys/i386/isa/aha1542.c | 3 +-- sys/i386/isa/isa.c | 3 +-- sys/i386/isa/isa_device.h | 5 +---- sys/pci/pci.c | 25 +------------------------ sys/pci/pcivar.h | 17 +---------------- sys/scsi/scsiconf.c | 3 +-- sys/sys/sysctl.h | 6 ++---- 12 files changed, 15 insertions(+), 100 deletions(-) diff --git a/sys/amd64/isa/isa.c b/sys/amd64/isa/isa.c index f03e18b13f2f..0fa508ec9a74 100644 --- a/sys/amd64/isa/isa.c +++ b/sys/amd64/isa/isa.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)isa.c 7.2 (Berkeley) 5/13/91 - * $Id: isa.c,v 1.71 1996/06/25 20:30:36 bde Exp $ + * $Id: isa.c,v 1.72 1996/09/06 23:07:45 phk Exp $ */ /* @@ -51,7 +51,6 @@ #include #include -#include #include #include #include diff --git a/sys/dev/eisa/eisaconf.h b/sys/dev/eisa/eisaconf.h index 985a3ad7d85f..0634a4fbb812 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.10 1996/09/06 23:06:59 phk Exp $ + * $Id: eisaconf.h,v 1.11 1996/09/08 10:43:42 phk Exp $ */ #ifndef _I386_EISA_EISACONF_H_ @@ -79,7 +79,7 @@ struct eisa_driver { /* test whether device is present */ int (*attach) __P((struct eisa_device *)); /* setup driver for a device */ - int (*shutdown) __P((struct kern_devconf *, int)); + int (*shutdown) __P((int)); /* Return the device to a safe * state before shutdown */ diff --git a/sys/dev/pci/pci.c b/sys/dev/pci/pci.c index db97c8b399c6..e7d6f3dfab5f 100644 --- a/sys/dev/pci/pci.c +++ b/sys/dev/pci/pci.c @@ -1,6 +1,6 @@ /************************************************************************** ** -** $Id: pci.c,v 1.53 1996/09/05 21:28:51 se Exp $ +** $Id: pci.c,v 1.54 1996/09/06 23:08:58 phk Exp $ ** ** General subroutines for the PCI bus. ** pci_configure () @@ -51,7 +51,6 @@ #include #include #include -#include #include /* declaration of wakeup(), used by vm.h */ #include @@ -75,10 +74,6 @@ **======================================================== */ -struct pci_devconf { - struct pci_info pdc_pi; -}; - struct pcicb { struct pcicb *pcicb_next; struct pcicb *pcicb_up; @@ -433,8 +428,6 @@ pci_bus_config (void) struct pci_device *dvp; - struct pci_devconf *pdcp; - /* ** first initialize the bridge (bus controller chip) */ @@ -643,22 +636,6 @@ pci_bus_config (void) reg, map&7, addr, size); }; - /* - ** Allocate a devconf structure - ** We should, and eventually will, set the - ** parent pointer to a pci bus devconf structure, - ** and arrange to set the state field dynamically. - */ - - pdcp = (struct pci_devconf *) - malloc (sizeof (struct pci_devconf),M_DEVBUF,M_WAITOK); - bzero(pdcp, sizeof(struct pci_devconf)); - - pdcp -> pdc_pi.pi_bus = bus_no; - pdcp -> pdc_pi.pi_device = device; - pdcp -> pdc_pi.pi_func = func; - pdcp -> pdc_pi.pi_unit = unit; - /* ** attach device ** may produce additional log messages, diff --git a/sys/dev/pci/pcivar.h b/sys/dev/pci/pcivar.h index f8d2a95395f5..61127e16ecc3 100644 --- a/sys/dev/pci/pcivar.h +++ b/sys/dev/pci/pcivar.h @@ -1,6 +1,6 @@ /************************************************************************** ** -** $Id: pcivar.h,v 1.11 1996/09/06 23:09:01 phk Exp $ +** $Id: pcivar.h,v 1.12 1996/09/08 10:44:14 phk Exp $ ** ** Declarations for pci device drivers. ** @@ -147,21 +147,6 @@ extern unsigned pci_max_burst_len; /* log2 of safe burst transfer length */ extern unsigned pci_mechanism; extern unsigned pci_maxdevice; -/*----------------------------------------------------------------- -** -** The pci-devconf interface. -** -**----------------------------------------------------------------- -*/ - -struct pci_info { - u_char pi_bus; - u_char pi_device; - u_char pi_func; - u_char pi_dummy; - u_char pi_unit; -}; - /*----------------------------------------------------------------- ** ** Map a pci device to physical and virtual memory. diff --git a/sys/i386/eisa/eisaconf.h b/sys/i386/eisa/eisaconf.h index 985a3ad7d85f..0634a4fbb812 100644 --- a/sys/i386/eisa/eisaconf.h +++ b/sys/i386/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.10 1996/09/06 23:06:59 phk Exp $ + * $Id: eisaconf.h,v 1.11 1996/09/08 10:43:42 phk Exp $ */ #ifndef _I386_EISA_EISACONF_H_ @@ -79,7 +79,7 @@ struct eisa_driver { /* test whether device is present */ int (*attach) __P((struct eisa_device *)); /* setup driver for a device */ - int (*shutdown) __P((struct kern_devconf *, int)); + int (*shutdown) __P((int)); /* Return the device to a safe * state before shutdown */ diff --git a/sys/i386/isa/aha1542.c b/sys/i386/isa/aha1542.c index bb28b93d7014..3ccd1258bd2f 100644 --- a/sys/i386/isa/aha1542.c +++ b/sys/i386/isa/aha1542.c @@ -12,7 +12,7 @@ * on the understanding that TFS is not responsible for the correct * functioning of this software in any circumstances. * - * $Id: aha1542.c,v 1.60 1996/07/20 22:02:44 joerg Exp $ + * $Id: aha1542.c,v 1.61 1996/09/06 23:07:06 phk Exp $ */ /* @@ -341,7 +341,6 @@ static void ahaminphys __P((struct buf *bp)); static int aha_poll __P((struct aha_data *aha, struct scsi_xfer *xs, struct aha_ccb *ccb)); static int ahaprobe __P((struct isa_device *dev)); -static void aha_registerdev __P((struct isa_device *id)); static int32_t aha_scsi_cmd __P((struct scsi_xfer *xs)); static timeout_t aha_timeout; diff --git a/sys/i386/isa/isa.c b/sys/i386/isa/isa.c index f03e18b13f2f..0fa508ec9a74 100644 --- a/sys/i386/isa/isa.c +++ b/sys/i386/isa/isa.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)isa.c 7.2 (Berkeley) 5/13/91 - * $Id: isa.c,v 1.71 1996/06/25 20:30:36 bde Exp $ + * $Id: isa.c,v 1.72 1996/09/06 23:07:45 phk Exp $ */ /* @@ -51,7 +51,6 @@ #include #include -#include #include #include #include diff --git a/sys/i386/isa/isa_device.h b/sys/i386/isa/isa_device.h index 81e85656bb06..4b3f7f9d83d3 100644 --- a/sys/i386/isa/isa_device.h +++ b/sys/i386/isa/isa_device.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)isa_device.h 7.1 (Berkeley) 5/9/91 - * $Id: isa_device.h,v 1.31 1996/09/04 09:49:35 asami Exp $ + * $Id: isa_device.h,v 1.32 1996/09/08 10:44:12 phk Exp $ */ #ifndef _I386_ISA_ISA_DEVICE_H_ @@ -128,9 +128,6 @@ extern struct isa_device isa_devtab_net[]; extern struct isa_device isa_devtab_null[]; extern struct isa_device isa_devtab_tty[]; -struct kern_devconf; -struct sysctl_req; - inthand_t IDTVEC(fastintr0), IDTVEC(fastintr1), IDTVEC(fastintr2), IDTVEC(fastintr3), diff --git a/sys/pci/pci.c b/sys/pci/pci.c index db97c8b399c6..e7d6f3dfab5f 100644 --- a/sys/pci/pci.c +++ b/sys/pci/pci.c @@ -1,6 +1,6 @@ /************************************************************************** ** -** $Id: pci.c,v 1.53 1996/09/05 21:28:51 se Exp $ +** $Id: pci.c,v 1.54 1996/09/06 23:08:58 phk Exp $ ** ** General subroutines for the PCI bus. ** pci_configure () @@ -51,7 +51,6 @@ #include #include #include -#include #include /* declaration of wakeup(), used by vm.h */ #include @@ -75,10 +74,6 @@ **======================================================== */ -struct pci_devconf { - struct pci_info pdc_pi; -}; - struct pcicb { struct pcicb *pcicb_next; struct pcicb *pcicb_up; @@ -433,8 +428,6 @@ pci_bus_config (void) struct pci_device *dvp; - struct pci_devconf *pdcp; - /* ** first initialize the bridge (bus controller chip) */ @@ -643,22 +636,6 @@ pci_bus_config (void) reg, map&7, addr, size); }; - /* - ** Allocate a devconf structure - ** We should, and eventually will, set the - ** parent pointer to a pci bus devconf structure, - ** and arrange to set the state field dynamically. - */ - - pdcp = (struct pci_devconf *) - malloc (sizeof (struct pci_devconf),M_DEVBUF,M_WAITOK); - bzero(pdcp, sizeof(struct pci_devconf)); - - pdcp -> pdc_pi.pi_bus = bus_no; - pdcp -> pdc_pi.pi_device = device; - pdcp -> pdc_pi.pi_func = func; - pdcp -> pdc_pi.pi_unit = unit; - /* ** attach device ** may produce additional log messages, diff --git a/sys/pci/pcivar.h b/sys/pci/pcivar.h index f8d2a95395f5..61127e16ecc3 100644 --- a/sys/pci/pcivar.h +++ b/sys/pci/pcivar.h @@ -1,6 +1,6 @@ /************************************************************************** ** -** $Id: pcivar.h,v 1.11 1996/09/06 23:09:01 phk Exp $ +** $Id: pcivar.h,v 1.12 1996/09/08 10:44:14 phk Exp $ ** ** Declarations for pci device drivers. ** @@ -147,21 +147,6 @@ extern unsigned pci_max_burst_len; /* log2 of safe burst transfer length */ extern unsigned pci_mechanism; extern unsigned pci_maxdevice; -/*----------------------------------------------------------------- -** -** The pci-devconf interface. -** -**----------------------------------------------------------------- -*/ - -struct pci_info { - u_char pi_bus; - u_char pi_device; - u_char pi_func; - u_char pi_dummy; - u_char pi_unit; -}; - /*----------------------------------------------------------------- ** ** Map a pci device to physical and virtual memory. diff --git a/sys/scsi/scsiconf.c b/sys/scsi/scsiconf.c index 2b8439f0162f..60e747bfa64f 100644 --- a/sys/scsi/scsiconf.c +++ b/sys/scsi/scsiconf.c @@ -16,7 +16,7 @@ * * New configuration setup: dufault@hda.com * - * $Id: scsiconf.c,v 1.62 1996/09/06 23:09:15 phk Exp $ + * $Id: scsiconf.c,v 1.63 1996/09/08 10:44:16 phk Exp $ */ #include "opt_scsi.h" @@ -26,7 +26,6 @@ #include #include #include -#include #include #ifdef PC98 #include diff --git a/sys/sys/sysctl.h b/sys/sys/sysctl.h index 273c5dcb58b9..fb998dd25e6a 100644 --- a/sys/sys/sysctl.h +++ b/sys/sys/sysctl.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)sysctl.h 8.1 (Berkeley) 6/2/93 - * $Id: sysctl.h,v 1.42 1996/06/10 16:23:42 nate Exp $ + * $Id: sysctl.h,v 1.43 1996/07/25 18:02:14 wollman Exp $ */ #ifndef _SYS_SYSCTL_H_ @@ -296,8 +296,7 @@ int sysctl_handle_opaque SYSCTL_HANDLER_ARGS; #define HW_DISKNAMES 8 /* strings: disk drive names */ #define HW_DISKSTATS 9 /* struct: diskstats[] */ #define HW_FLOATINGPT 10 /* int: has HW floating point? */ -#define HW_DEVCONF 11 /* node: device configuration */ -#define HW_MAXID 12 /* number of valid hw ids */ +#define HW_MAXID 11 /* number of valid hw ids */ #define CTL_HW_NAMES { \ { 0, 0 }, \ @@ -311,7 +310,6 @@ int sysctl_handle_opaque SYSCTL_HANDLER_ARGS; { "disknames", CTLTYPE_STRUCT }, \ { "diskstats", CTLTYPE_STRUCT }, \ { "floatingpoint", CTLTYPE_INT }, \ - { "devconf", CTLTYPE_NODE }, \ } /*