d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Make pci_load_vendor_data() static and do it during MOD_LOAD instead of

Browse Source 
when the first PCI bus attaches.
- Create /dev/pci during MOD_LOAD as well.
- Destroy /dev/pci during MOD_UNLOAD (not that you can kldunload pci, but
  might as well get the code right)
This commit is contained in:
John Baldwin 2002-09-04 03:13:16 +00:00
parent 9ed79ecadf
commit 1d62131385
3 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/dev/acpica/acpi_pci.c
View File

@ -226,10 +226,8 @@ acpi_pci_attach(device_t dev)
* these devices.
*/
pci_add_children(dev, busno, sizeof(struct acpi_pci_devinfo));
(void) AcpiWalkNamespace(ACPI_TYPE_DEVICE, acpi_get_handle(dev), 1,
acpi_pci_save_handle, dev, NULL);
pci_load_vendor_data();
return (bus_generic_attach(dev));
}

30
sys/dev/pci/pci.c
View File

@ -76,6 +76,7 @@ static int pci_add_map(device_t pcib, int b, int s, int f, int reg,
static void pci_add_resources(device_t pcib, device_t dev);
static int pci_probe(device_t dev);
static int pci_attach(device_t dev);
static void pci_load_vendor_data(void);
static int pci_describe_parse_line(char **ptr, int *vendor,
int *device, char **desc);
static char *pci_describe_device(device_t dev);
@ -840,28 +841,21 @@ pci_attach(device_t dev)
pci_add_children(dev, busno, sizeof(struct pci_devinfo));
pci_load_vendor_data();
return (bus_generic_attach(dev));
}
void
static void
pci_load_vendor_data(void)
{
caddr_t vendordata, info;
static int once;
if (!once) {
make_dev(&pcicdev, 0, UID_ROOT, GID_WHEEL, 0644, "pci");
if ((vendordata = preload_search_by_type("pci_vendor_data"))
!= NULL) {
info = preload_search_info(vendordata, MODINFO_ADDR);
pci_vendordata = *(char **)info;
info = preload_search_info(vendordata, MODINFO_SIZE);
pci_vendordata_size = *(size_t *)info;
/* terminate the database */
pci_vendordata[pci_vendordata_size] = '\n';
}
once++;
if ((vendordata = preload_search_by_type("pci_vendor_data")) != NULL) {
info = preload_search_info(vendordata, MODINFO_ADDR);
pci_vendordata = *(char **)info;
info = preload_search_info(vendordata, MODINFO_SIZE);
pci_vendordata_size = *(size_t *)info;
/* terminate the database */
pci_vendordata[pci_vendordata_size] = '\n';
}
}
@ -1396,13 +1390,19 @@ pci_write_config_method(device_t dev, device_t child, int reg,
static int
pci_modevent(module_t mod, int what, void *arg)
{
static dev_t pci_cdev;
switch (what) {
case MOD_LOAD:
STAILQ_INIT(&pci_devq);
pci_generation = 0;
pci_cdev = make_dev(&pcicdev, 0, UID_ROOT, GID_WHEEL, 0644,
"pci");
pci_load_vendor_data();
break;
case MOD_UNLOAD:
destroy_dev(pci_cdev);
break;
}

1
sys/dev/pci/pci_private.h
View File

@ -68,6 +68,5 @@ struct pci_devinfo *pci_read_device(device_t pcib, int b, int s, int f,
size_t size);
void pci_print_verbose(struct pci_devinfo *dinfo);
int pci_freecfg(struct pci_devinfo *dinfo);
void pci_load_vendor_data(void);
#endif /* _PCI_PRIVATE_H_ */