summaryrefslogtreecommitdiffstats
path: root/sys/pci/pcisupport.c
diff options
context:
space:
mode:
authordg <dg@FreeBSD.org>1995-02-02 13:12:18 +0000
committerdg <dg@FreeBSD.org>1995-02-02 13:12:18 +0000
commit57e383cd4cceec3dd87bf0ab3c3d7c42f919300b (patch)
tree8d1b00d546148364ba291540f1d0241cc58fde5e /sys/pci/pcisupport.c
parent1cfe037240f2abfa76630cc9c1f42f78096862df (diff)
downloadFreeBSD-src-57e383cd4cceec3dd87bf0ab3c3d7c42f919300b.zip
FreeBSD-src-57e383cd4cceec3dd87bf0ab3c3d7c42f919300b.tar.gz
Reapplied all of Stefan's changes. What a mess - the files were modified
and moved at the same time. This made it *very* difficult to fix the revision log lossage that happend when the files were moved. SIGH.
Diffstat (limited to 'sys/pci/pcisupport.c')
-rw-r--r--sys/pci/pcisupport.c25
1 files changed, 20 insertions, 5 deletions
diff --git a/sys/pci/pcisupport.c b/sys/pci/pcisupport.c
index 1669465..933ca54 100644
--- a/sys/pci/pcisupport.c
+++ b/sys/pci/pcisupport.c
@@ -1,6 +1,6 @@
/**************************************************************************
**
-** $Id: pcisupport.c,v 1.6 1994/12/22 21:20:39 se Exp $
+** $Id: pcisupport.c,v 1.7 1995/02/02 12:36:19 davidg Exp $
**
** Device driver for INTEL PCI chipsets.
**
@@ -50,7 +50,10 @@
*/
#include <sys/types.h>
+#include <sys/param.h>
+#include <sys/kernel.h>
+#include <pci/pcivar.h>
#include <pci/pcireg.h>
extern void printf();
@@ -69,12 +72,15 @@ static char* chipset_probe (pcici_t tag, pcidi_t type);
static void chipset_attach(pcici_t tag, int unit);
static u_long chipset_count;
-struct pci_driver chipset_device = {
+struct pci_device chipset_device = {
+ "chip",
chipset_probe,
chipset_attach,
&chipset_count
};
+DATA_SET (pcidevice_set, chipset_device);
+
static char confread(pcici_t config_id, int port);
struct condmsg {
@@ -296,12 +302,15 @@ static char* vga_probe (pcici_t tag, pcidi_t type);
static void vga_attach(pcici_t tag, int unit);
static u_long vga_count;
-struct pci_driver vga_device = {
+struct pci_device vga_device = {
+ "vga",
vga_probe,
vga_attach,
&vga_count
};
+DATA_SET (pcidevice_set, vga_device);
+
static char* vga_probe (pcici_t tag, pcidi_t type)
{
int data = pci_conf_read(tag, PCI_CLASS_REG);
@@ -345,12 +354,15 @@ static char* lkm_probe (pcici_t tag, pcidi_t type);
static void lkm_attach(pcici_t tag, int unit);
static u_long lkm_count;
-struct pci_driver lkm_device = {
+struct pci_device lkm_device = {
+ "lkm",
lkm_probe,
lkm_attach,
&lkm_count
};
+DATA_SET (pcidevice_set, lkm_device);
+
static char* lkm_probe (pcici_t tag, pcidi_t type)
{
/*
@@ -375,12 +387,15 @@ static char* ign_probe (pcici_t tag, pcidi_t type);
static void ign_attach(pcici_t tag, int unit);
static u_long ign_count;
-struct pci_driver ign_device = {
+struct pci_device ign_device = {
+ NULL,
ign_probe,
ign_attach,
&ign_count
};
+DATA_SET (pcidevice_set, ign_device);
+
static char* ign_probe (pcici_t tag, pcidi_t type)
{
switch (type) {
OpenPOWER on IntegriCloud