Well folks, this is it - The second stage of the removal for build support

for LKM's..

3 files changed, 3 insertions, 63 deletions

diff --git a/sys/pci/if_tx.c b/sys/pci/if_tx.c
index cd17237..b58e44e 100644
--- a/sys/pci/if_tx.c
+++ b/sys/pci/if_tx.c
@@ -1,5 +1,5 @@
 /*	$OpenBSD: if_tx.c,v 1.3 1998/10/10 04:30:09 jason Exp $	*/
-/*	$Id: if_tx.c,v 1.22 1999/03/14 08:30:23 semenu Exp $ */
+/*	$Id: if_tx.c,v 1.23 1999/03/31 13:50:52 nsayer Exp $ */
 
 /*-
  * Copyright (c) 1997 Semen Ustimenko (semen@iclub.nsu.ru)
@@ -2036,10 +2036,4 @@ epic_dump_state __P((
 		);
 	}
 }
-#if 0
-static void epic_kldinit (void * a) {
-	pci_register_lkm (&txdevice, 0);
-}
-PSEUDO_SET(epic_kldinit,if_tx);
-#endif
 #endif /* NPCI > 0 */
diff --git a/sys/pci/pci_compat.c b/sys/pci/pci_compat.c
index bfa1d59..da25df4 100644
--- a/sys/pci/pci_compat.c
+++ b/sys/pci/pci_compat.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: pci_compat.c,v 1.21 1999/04/11 02:46:20 eivind Exp $
+ * $Id: pci_compat.c,v 1.22 1999/04/16 21:22:52 peter Exp $
  *
  */
 
@@ -340,23 +340,13 @@ pci_probedrv(pcicfgregs *cfg, struct pci_device *dvp)
 	return (NULL);
 }
 
-static struct pci_lkm *pci_lkm_head;
-
 static struct pci_device*
 pci_finddrv(pcicfgregs *cfg)
 {
 	struct pci_device **dvpp;
 	struct pci_device *dvp = NULL;
-	struct pci_lkm *lkm;
 
 	drvname = NULL;
-	lkm = pci_lkm_head;
-	while (drvname == NULL && lkm != NULL) {
-		dvp = lkm->dvp;
-		drvname = pci_probedrv(cfg, dvp);
-		lkm = lkm->next;
-	}
-
 	dvpp = (struct pci_device **)pcidevice_set.ls_items;
 	while (drvname == NULL && (dvp = *dvpp++) != NULL)
 		drvname = pci_probedrv(cfg, dvp);
@@ -417,43 +407,6 @@ pci_drvattach(struct pci_devinfo *dinfo)
 
 /* ------------------------------------------------------------------------- */
 
-static void
-pci_rescan(void)
-{
-	/* XXX do nothing, currently, soon to come ... */
-}
-
-int pci_register_lkm (struct pci_device *dvp, int if_revision)
-{
-	struct pci_lkm *lkm;
-
-	if (if_revision != 0) {
-		return (-1);
-	}
-	if (dvp == NULL || dvp->pd_probe == NULL || dvp->pd_attach == NULL) {
-		return (-1);
-	}
-	lkm = malloc (sizeof (*lkm), M_DEVBUF, M_NOWAIT);
-	if (lkm == NULL) {
-		return (-1);
-	}
-	bzero(lkm, sizeof (*lkm));
-
-	lkm->dvp = dvp;
-	lkm->next = pci_lkm_head;
-	pci_lkm_head = lkm;
-	pci_rescan();
-	return (0);
-}
-
-void
-pci_configure(void)
-{
-	pci_probe(NULL);
-}
-
-/* ------------------------------------------------------------------------- */
-
 #endif
 
 #endif /* PCI_COMPAT */
diff --git a/sys/pci/pcivar.h b/sys/pci/pcivar.h
index 55f72a1..3607132 100644
--- a/sys/pci/pcivar.h
+++ b/sys/pci/pcivar.h
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: pcivar.h,v 1.25 1999/01/19 23:29:20 se Exp $
+ * $Id: pcivar.h,v 1.26 1999/04/16 21:22:52 peter Exp $
  *
  */
 
@@ -282,11 +282,6 @@ struct pci_device {
     int    (*pd_shutdown) (int, int);
 };
 
-struct pci_lkm {
-	struct pci_device *dvp;
-	struct pci_lkm	*next;
-};
-
 #ifdef __i386__
 typedef u_short pci_port_t;
 #else
@@ -295,7 +290,6 @@ typedef u_int pci_port_t;
 
 u_long pci_conf_read (pcici_t tag, u_long reg);
 void pci_conf_write (pcici_t tag, u_long reg, u_long data);
-void pci_configure (void);
 int pci_map_port (pcici_t tag, u_long reg, pci_port_t* pa);
 int pci_map_mem (pcici_t tag, u_long reg, vm_offset_t* va, vm_offset_t* pa);
 int pci_map_dense (pcici_t tag, u_long reg, vm_offset_t* va, vm_offset_t* pa);
@@ -305,7 +299,6 @@ int pci_map_int (pcici_t tag, pci_inthand_t *handler, void *arg,
 int pci_map_int_right(pcici_t cfg, pci_inthand_t *handler, void *arg,
 		      intrmask_t *maskptr, u_int flags);
 int pci_unmap_int (pcici_t tag);
-int pci_register_lkm (struct pci_device *dvp, int if_revision);
 
 #endif /* PCI_COMPAT */
 #endif /* _PCIVAR_H_ */