diff options
author | bde <bde@FreeBSD.org> | 1996-09-10 23:31:13 +0000 |
---|---|---|
committer | bde <bde@FreeBSD.org> | 1996-09-10 23:31:13 +0000 |
commit | 4b1a7c107d12dcaa90f1733628ef92b9daabf17d (patch) | |
tree | 694ee7f35a28ef2be59bd7a989e9073882d81ecd /sys/pci | |
parent | 059cd92beecd7b436c11af3f9ec6dd0b48b2eef5 (diff) | |
download | FreeBSD-src-4b1a7c107d12dcaa90f1733628ef92b9daabf17d.zip FreeBSD-src-4b1a7c107d12dcaa90f1733628ef92b9daabf17d.tar.gz |
Removed more devconf leftovers.
Diffstat (limited to 'sys/pci')
-rw-r--r-- | sys/pci/pci.c | 25 | ||||
-rw-r--r-- | sys/pci/pcivar.h | 17 |
2 files changed, 2 insertions, 40 deletions
diff --git a/sys/pci/pci.c b/sys/pci/pci.c index db97c8b..e7d6f3d 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 <sys/malloc.h> #include <sys/errno.h> #include <sys/kernel.h> -#include <sys/sysctl.h> #include <sys/proc.h> /* declaration of wakeup(), used by vm.h */ #include <vm/vm.h> @@ -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) */ @@ -644,22 +637,6 @@ pci_bus_config (void) }; /* - ** 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, ** i.e. when installing subdevices. diff --git a/sys/pci/pcivar.h b/sys/pci/pcivar.h index f8d2a95..61127e1 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. ** @@ -149,21 +149,6 @@ 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. ** ** Entry selects the register in the pci configuration |