summaryrefslogtreecommitdiffstats
path: root/sys/pci
diff options
context:
space:
mode:
authordfr <dfr@FreeBSD.org>2000-02-19 09:44:06 +0000
committerdfr <dfr@FreeBSD.org>2000-02-19 09:44:06 +0000
commit545367f3927d9052cdeb31977bf61531c6fafc2d (patch)
tree6840306000f740de010c91a927f8bd28b61310c6 /sys/pci
parent271b80ec8106c02a935dda5224ad5cadf5b72146 (diff)
downloadFreeBSD-src-545367f3927d9052cdeb31977bf61531c6fafc2d.zip
FreeBSD-src-545367f3927d9052cdeb31977bf61531c6fafc2d.tar.gz
Remove the vga-pci driver. It serves no purpose and it hides the hardware
from useful drivers such as the 3D DRI drivers I will be porting for hardware accelerated OpenGL. The hardware will still be reported during boot using the nomatch system. Approved by: jkh
Diffstat (limited to 'sys/pci')
-rw-r--r--sys/pci/pci.c7
-rw-r--r--sys/pci/pcisupport.c49
-rw-r--r--sys/pci/pcivar.h1
3 files changed, 5 insertions, 52 deletions
diff --git a/sys/pci/pci.c b/sys/pci/pci.c
index ab051a6..e6c060d 100644
--- a/sys/pci/pci.c
+++ b/sys/pci/pci.c
@@ -1205,10 +1205,9 @@ pci_probe_nomatch(device_t dev, device_t child)
dinfo = device_get_ivars(child);
cfg = &dinfo->cfg;
desc = pci_ata_match(child);
- if (!desc)
- desc = pci_usb_match(child);
- if (!desc)
- desc = "unknown card";
+ if (!desc) desc = pci_usb_match(child);
+ if (!desc) desc = pci_vga_match(child);
+ if (!desc) desc = "unknown card";
device_printf(dev, desc);
printf(" (vendor=0x%04x, dev=0x%04x) at %d.%d",
cfg->vendor,
diff --git a/sys/pci/pcisupport.c b/sys/pci/pcisupport.c
index 6cb125b..143375f 100644
--- a/sys/pci/pcisupport.c
+++ b/sys/pci/pcisupport.c
@@ -1338,7 +1338,7 @@ DRIVER_MODULE(chip, pci, chip_driver, chip_devclass, 0, 0);
**---------------------------------------------------------
*/
-static const char* vga_match(device_t dev)
+const char* pci_vga_match(device_t dev)
{
u_int id = pci_get_devid(dev);
const char *vendor, *chip, *type;
@@ -1819,53 +1819,6 @@ static const char* vga_match(device_t dev)
return type;
}
-static int vga_probe(device_t dev)
-{
- const char *desc;
-
- desc = vga_match(dev);
- if (desc) {
- device_set_desc(dev, desc);
- return -10000; /* Low match priority */
- }
-
- return ENXIO;
-}
-
-static int vga_attach(device_t dev)
-{
-/*
-** If the assigned addresses are remapped,
-** the console driver has to be informed about the new address.
-*/
-#if 0
- vm_offset_t va;
- vm_offset_t pa;
- int reg;
- for (reg = PCI_MAP_REG_START; reg < PCI_MAP_REG_END; reg += 4)
- (void) pci_map_mem (tag, reg, &va, &pa);
-#endif
- return 0;
-}
-
-static device_method_t vga_methods[] = {
- /* Device interface */
- DEVMETHOD(device_probe, vga_probe),
- DEVMETHOD(device_attach, vga_attach),
-
- { 0, 0 }
-};
-
-static driver_t vga_driver = {
- "vga-pci",
- vga_methods,
- 1,
-};
-
-static devclass_t vga_devclass;
-
-DRIVER_MODULE(vga, pci, vga_driver, vga_devclass, 0, 0);
-
/*---------------------------------------------------------
**
** Devices to ignore
diff --git a/sys/pci/pcivar.h b/sys/pci/pcivar.h
index d066860..9c345c0 100644
--- a/sys/pci/pcivar.h
+++ b/sys/pci/pcivar.h
@@ -152,6 +152,7 @@ extern u_int32_t pci_numdevs;
const char *pci_ata_match(struct device *dev);
const char *pci_usb_match(struct device *dev);
+const char *pci_vga_match(struct device *dev);
/* low level PCI config register functions provided by pcibus.c */
OpenPOWER on IntegriCloud