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

- Fail to probe if acpi0 probed ok as this driver basically tries to probe

Browse Source 
the ACPI timer and we shouldn't do that if ACPI is already around to do
  that for us.
- Set a description and tweak the order of checks in the probe function
  to more closely match other PCI drivers.

This should probably be moved to sys/dev/piix/piix.c at some point and
turned on for all i386 kernels rather than just SMP ones.
This commit is contained in:
jhb 2003-10-24 21:01:31 +00:00
parent 4d869251ec
commit 590951621b
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sys/i386/i386/mp_clock.c
View File

@ -101,17 +101,22 @@ piix_probe(device_t dev)
{
u_int32_t d;
if (devclass_get_device(devclass_find("acpi"), 0) != NULL)
return (ENXIO);
switch (pci_get_devid(dev)) {
case 0x71138086:
d = pci_read_config(dev, PCIR_COMMAND, 2);
if (d & PCIM_CMD_PORTEN)
return (0);
printf("PIIX I/O space not mapped\n");
return (ENXIO);
device_set_desc(dev, "PIIX Timecounter");
break;
default:
return (ENXIO);
};
}
d = pci_read_config(dev, PCIR_COMMAND, 2);
if (!(d & PCIM_CMD_PORTEN)) {
device_printf(dev, "PIIX I/O space not mapped\n");
return (ENXIO);
}
return (0);
}
static int