system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-10-15 12:54:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Give generic AHCI driver lower priority than device-specific drivers.

Browse source 
- Consistently use BUS_PROBE_GENERIC instead of -100.
This commit is contained in:
Jung-uk Kim 2009-04-27 21:34:15 +00:00
parent f4ad3139bb
commit c6b8ee96f6
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=191600
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
sys/dev/ata/ata-pci.c
View file

@ -70,18 +70,18 @@ ata_pci_probe(device_t dev)
/* is this a storage class device ? */
if (pci_get_class(dev) != PCIC_STORAGE)
return ENXIO;
return (ENXIO);
/* is this an IDE/ATA type device ? */
if (pci_get_subclass(dev) != PCIS_STORAGE_IDE)
return ENXIO;
return (ENXIO);
sprintf(buffer, "%s ATA controller", ata_pcivendor2str(dev));
device_set_desc_copy(dev, buffer);
ctlr->chipinit = ata_generic_chipinit;
/* we are a low priority handler */
return -100;
return (BUS_PROBE_GENERIC);
}
int

4
sys/dev/ata/chipsets/ata-ahci.c
View file

@ -85,7 +85,7 @@ ata_ahci_probe(device_t dev)
/* is this PCI device flagged as an AHCI compliant chip ? */
if (pci_read_config(dev, PCIR_PROGIF, 1) != PCIP_STORAGE_SATA_AHCI_1_0)
return ENXIO;
return (ENXIO);
if (bootverbose)
sprintf(buffer, "%s (ID=%08x) AHCI controller",
@ -94,7 +94,7 @@ ata_ahci_probe(device_t dev)
sprintf(buffer, "%s AHCI controller", ata_pcivendor2str(dev));
device_set_desc_copy(dev, buffer);
ctlr->chipinit = ata_ahci_chipinit;
return 0;
return (BUS_PROBE_GENERIC);
}
int