diff options
29 files changed, 80 insertions, 74 deletions
diff --git a/sys/dev/re/if_re.c b/sys/dev/re/if_re.c index 96931cde01e0..77f294296d43 100644 --- a/sys/dev/re/if_re.c +++ b/sys/dev/re/if_re.c @@ -841,7 +841,7 @@ re_probe(dev) RL_RID, sc->rl_res); if (t->rl_basetype == hwrev) { device_set_desc(dev, t->rl_name); - return (0); + return (BUS_PROBE_DEFAULT); } } t++; diff --git a/sys/dev/rp/rp_pci.c b/sys/dev/rp/rp_pci.c index 70aaa5b9d3ff..223cd83ea570 100644 --- a/sys/dev/rp/rp_pci.c +++ b/sys/dev/rp/rp_pci.c @@ -134,7 +134,7 @@ rp_pciprobe(device_t dev) if (s != NULL) { device_set_desc(dev, s); - return (0); + return (BUS_PROBE_DEFAULT); } return (ENXIO); diff --git a/sys/dev/safe/safe.c b/sys/dev/safe/safe.c index 828d67d78a4d..9d012f172de9 100644 --- a/sys/dev/safe/safe.c +++ b/sys/dev/safe/safe.c @@ -184,7 +184,7 @@ safe_probe(device_t dev) { if (pci_get_vendor(dev) == PCI_VENDOR_SAFENET && pci_get_device(dev) == PCI_PRODUCT_SAFEXCEL) - return (0); + return (BUS_PROBE_DEFAULT); return (ENXIO); } diff --git a/sys/dev/sbsh/if_sbsh.c b/sys/dev/sbsh/if_sbsh.c index 19292b1d3013..cf82619d0312 100644 --- a/sys/dev/sbsh/if_sbsh.c +++ b/sys/dev/sbsh/if_sbsh.c @@ -213,7 +213,7 @@ sbsh_probe(device_t dev) return (ENXIO); device_set_desc(dev, "Granch SBNI16 G.SHDSL Modem"); - return (0); + return (BUS_PROBE_DEFAULT); } static int diff --git a/sys/dev/si/si_pci.c b/sys/dev/si/si_pci.c index f6e2486b9f72..e1dbfe9d454b 100644 --- a/sys/dev/si/si_pci.c +++ b/sys/dev/si/si_pci.c @@ -51,7 +51,7 @@ si_pci_probe(device_t dev) } if (desc) { device_set_desc(dev, desc); - return 0; + return BUS_PROBE_DEFAULT; } return ENXIO; } diff --git a/sys/dev/sound/isa/ad1816.c b/sys/dev/sound/isa/ad1816.c index f34a5c623f65..696b1a37cb17 100644 --- a/sys/dev/sound/isa/ad1816.c +++ b/sys/dev/sound/isa/ad1816.c @@ -580,7 +580,7 @@ ad1816_probe(device_t dev) if (s) { device_set_desc(dev, s); - return 0; + return BUS_PROBE_DEFAULT; } return ENXIO; } diff --git a/sys/dev/sound/pci/als4000.c b/sys/dev/sound/pci/als4000.c index 6f909ccbb0ed..a7ebac1dc949 100644 --- a/sys/dev/sound/pci/als4000.c +++ b/sys/dev/sound/pci/als4000.c @@ -684,7 +684,7 @@ als_pci_probe(device_t dev) { if (pci_get_devid(dev) == ALS_PCI_ID0) { device_set_desc(dev, "Avance Logic ALS4000"); - return 0; + return BUS_PROBE_DEFAULT; } return ENXIO; } diff --git a/sys/dev/sound/pci/au88x0.c b/sys/dev/sound/pci/au88x0.c index c5f845b5f755..b1442245b77c 100644 --- a/sys/dev/sound/pci/au88x0.c +++ b/sys/dev/sound/pci/au88x0.c @@ -555,7 +555,7 @@ au88x0_pci_probe(device_t dev) for (auc = au88x0_chipsets; auc->auc_pci_id; ++auc) { if (auc->auc_pci_id == pci_id) { device_set_desc(dev, auc->auc_name); - return (0); + return BUS_PROBE_DEFAULT; } } return (ENXIO); diff --git a/sys/dev/sound/pci/aureal.c b/sys/dev/sound/pci/aureal.c index 8ff1b4057696..35f91f1b6309 100644 --- a/sys/dev/sound/pci/aureal.c +++ b/sys/dev/sound/pci/aureal.c @@ -537,7 +537,7 @@ au_pci_probe(device_t dev) { if (pci_get_devid(dev) == AU8820_PCI_ID) { device_set_desc(dev, "Aureal Vortex 8820"); - return 0; + return BUS_PROBE_DEFAULT; } return ENXIO; diff --git a/sys/dev/sound/pci/cmi.c b/sys/dev/sound/pci/cmi.c index 2ae837a54591..c6798d0534f1 100644 --- a/sys/dev/sound/pci/cmi.c +++ b/sys/dev/sound/pci/cmi.c @@ -812,16 +812,16 @@ cmi_probe(device_t dev) switch(pci_get_devid(dev)) { case CMI8338A_PCI_ID: device_set_desc(dev, "CMedia CMI8338A"); - return 0; + return BUS_PROBE_DEFAULT; case CMI8338B_PCI_ID: device_set_desc(dev, "CMedia CMI8338B"); - return 0; + return BUS_PROBE_DEFAULT; case CMI8738_PCI_ID: device_set_desc(dev, "CMedia CMI8738"); - return 0; + return BUS_PROBE_DEFAULT; case CMI8738B_PCI_ID: device_set_desc(dev, "CMedia CMI8738B"); - return 0; + return BUS_PROBE_DEFAULT; default: return ENXIO; } diff --git a/sys/dev/sound/pci/cs4281.c b/sys/dev/sound/pci/cs4281.c index f8da280cb43a..2859f3838230 100644 --- a/sys/dev/sound/pci/cs4281.c +++ b/sys/dev/sound/pci/cs4281.c @@ -742,7 +742,7 @@ cs4281_pci_probe(device_t dev) if (s) device_set_desc(dev, s); - return s ? 0 : ENXIO; + return s ? BUS_PROBE_DEFAULT : ENXIO; } static int diff --git a/sys/dev/sound/pci/csa.c b/sys/dev/sound/pci/csa.c index d9823d732e25..889ebf4aa295 100644 --- a/sys/dev/sound/pci/csa.c +++ b/sys/dev/sound/pci/csa.c @@ -226,7 +226,7 @@ csa_probe(device_t dev) card = csa_findcard(dev); if (card) { device_set_desc(dev, card->name); - return 0; + return BUS_PROBE_DEFAULT; } return ENXIO; } diff --git a/sys/dev/sound/pci/ds1.c b/sys/dev/sound/pci/ds1.c index fa70de1d149e..978ed14024e7 100644 --- a/sys/dev/sound/pci/ds1.c +++ b/sys/dev/sound/pci/ds1.c @@ -923,7 +923,7 @@ ds_pci_probe(device_t dev) i = ds_finddev(pci_get_devid(dev), subdev); if (i >= 0) { device_set_desc(dev, ds_devs[i].name); - return 0; + return BUS_PROBE_DEFAULT; } else return ENXIO; } diff --git a/sys/dev/sound/pci/emu10k1.c b/sys/dev/sound/pci/emu10k1.c index 3716cc07ff29..ec32226e7bc7 100644 --- a/sys/dev/sound/pci/emu10k1.c +++ b/sys/dev/sound/pci/emu10k1.c @@ -45,6 +45,7 @@ SND_DECLARE_FILE("$FreeBSD$"); #define EMUMAXPAGES (WAVEOUT_MAXBUFSIZE * NUM_G / EMUPAGESIZE) #define EMU10K1_PCI_ID 0x00021102 /* 1102 => Creative Labs Vendor ID */ #define EMU10K2_PCI_ID 0x00041102 +#define EMU10K3_PCI_ID 0x00081102 #define EMU_DEFAULT_BUFSZ 4096 #define EMU_MAX_CHANS 8 #define EMU_CHANS 4 @@ -1890,12 +1891,16 @@ emu_pci_probe(device_t dev) s = "Creative Audigy (EMU10K2)"; break; + case EMU10K3_PCI_ID: + s = "Creative Audigy 2 (EMU10K3)"; + break; + default: return ENXIO; } device_set_desc(dev, s); - return 0; + return BUS_PROBE_DEFAULT; } static int @@ -1916,7 +1921,7 @@ emu_pci_attach(device_t dev) sc->dev = dev; sc->type = pci_get_devid(dev); sc->rev = pci_get_revid(dev); - sc->audigy = (sc->type == EMU10K2_PCI_ID); + sc->audigy = sc->type == EMU10K2_PCI_ID || sc->type == EMU10K3_PCI_ID; sc->audigy2 = (sc->audigy && sc->rev == 0x04); sc->nchans = sc->audigy ? 8 : 4; sc->addrmask = sc->audigy ? A_PTR_ADDRESS_MASK : PTR_ADDRESS_MASK; @@ -2033,6 +2038,7 @@ static driver_t emu_driver = { }; DRIVER_MODULE(snd_emu10k1, pci, emu_driver, pcm_devclass, 0, 0); +DRIVER_MODULE(snd_emu10k1, cardbus, emu_driver, pcm_devclass, 0, 0); MODULE_DEPEND(snd_emu10k1, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER); MODULE_VERSION(snd_emu10k1, 1); diff --git a/sys/dev/sound/pci/es137x.c b/sys/dev/sound/pci/es137x.c index b23245e9328f..6153e88301b0 100644 --- a/sys/dev/sound/pci/es137x.c +++ b/sys/dev/sound/pci/es137x.c @@ -757,74 +757,74 @@ es_pci_probe(device_t dev) switch(pci_get_devid(dev)) { case ES1370_PCI_ID: device_set_desc(dev, "AudioPCI ES1370"); - return 0; + return BUS_PROBE_DEFAULT; case ES1371_PCI_ID: switch(pci_get_revid(dev)) { case ES1371REV_ES1371_A: device_set_desc(dev, "AudioPCI ES1371-A"); - return 0; + return BUS_PROBE_DEFAULT; case ES1371REV_ES1371_B: device_set_desc(dev, "AudioPCI ES1371-B"); - return 0; + return BUS_PROBE_DEFAULT; case ES1371REV_ES1373_A: device_set_desc(dev, "AudioPCI ES1373-A"); - return 0; + return BUS_PROBE_DEFAULT; case ES1371REV_ES1373_B: device_set_desc(dev, "AudioPCI ES1373-B"); - return 0; + return BUS_PROBE_DEFAULT; case ES1371REV_ES1373_8: device_set_desc(dev, "AudioPCI ES1373-8"); - return 0; + return BUS_PROBE_DEFAULT; case ES1371REV_CT5880_A: device_set_desc(dev, "Creative CT5880-A"); - return 0; + return BUS_PROBE_DEFAULT; default: device_set_desc(dev, "AudioPCI ES1371-?"); device_printf(dev, "unknown revision %d -- please report to cg@freebsd.org\n", pci_get_revid(dev)); - return 0; + return BUS_PROBE_DEFAULT; } case ES1371_PCI_ID2: device_set_desc(dev, "Strange AudioPCI ES1371-? (vid=3274)"); device_printf(dev, "unknown revision %d -- please report to cg@freebsd.org\n", pci_get_revid(dev)); - return 0; + return BUS_PROBE_DEFAULT; case CT4730_PCI_ID: switch(pci_get_revid(dev)) { case CT4730REV_CT4730_A: device_set_desc(dev, "Creative SB AudioPCI CT4730"); - return 0; + return BUS_PROBE_DEFAULT; default: device_set_desc(dev, "Creative SB AudioPCI CT4730-?"); device_printf(dev, "unknown revision %d -- please report to cg@freebsd.org\n", pci_get_revid(dev)); - return 0; + return BUS_PROBE_DEFAULT; } case CT5880_PCI_ID: switch(pci_get_revid(dev)) { case CT5880REV_CT5880_C: device_set_desc(dev, "Creative CT5880-C"); - return 0; + return BUS_PROBE_DEFAULT; case CT5880REV_CT5880_D: device_set_desc(dev, "Creative CT5880-D"); - return 0; + return BUS_PROBE_DEFAULT; case CT5880REV_CT5880_E: device_set_desc(dev, "Creative CT5880-E"); - return 0; + return BUS_PROBE_DEFAULT; default: device_set_desc(dev, "Creative CT5880-?"); device_printf(dev, "unknown revision %d -- please report to cg@freebsd.org\n", pci_get_revid(dev)); - return 0; + return BUS_PROBE_DEFAULT; } default: diff --git a/sys/dev/sound/pci/fm801.c b/sys/dev/sound/pci/fm801.c index 9875e0e4b2cd..63611805bf70 100644 --- a/sys/dev/sound/pci/fm801.c +++ b/sys/dev/sound/pci/fm801.c @@ -705,7 +705,7 @@ fm801_pci_probe( device_t dev ) if ((id = pci_get_devid(dev)) == PCI_DEVICE_FORTEMEDIA1 ) { device_set_desc(dev, "Forte Media FM801 Audio Controller"); - return 0; + return BUS_PROBE_DEFAULT; } /* if ((id = pci_get_devid(dev)) == PCI_DEVICE_FORTEMEDIA2 ) { diff --git a/sys/dev/sound/pci/ich.c b/sys/dev/sound/pci/ich.c index af27f810b8a3..73b9b032685e 100644 --- a/sys/dev/sound/pci/ich.c +++ b/sys/dev/sound/pci/ich.c @@ -612,67 +612,67 @@ ich_pci_probe(device_t dev) switch(pci_get_devid(dev)) { case 0x71958086: device_set_desc(dev, "Intel 443MX"); - return 0; + return BUS_PROBE_DEFAULT; case 0x24158086: device_set_desc(dev, "Intel ICH (82801AA)"); - return 0; + return BUS_PROBE_DEFAULT; case 0x24258086: device_set_desc(dev, "Intel ICH (82801AB)"); - return 0; + return BUS_PROBE_DEFAULT; case 0x24458086: device_set_desc(dev, "Intel ICH2 (82801BA)"); - return 0; + return BUS_PROBE_DEFAULT; case 0x24858086: device_set_desc(dev, "Intel ICH3 (82801CA)"); - return 0; + return BUS_PROBE_DEFAULT; case ICH4ID: device_set_desc(dev, "Intel ICH4 (82801DB)"); - return -1000; /* allow a better driver to override us */ + return BUS_PROBE_LOW_PRIORITY; case ICH5ID: device_set_desc(dev, "Intel ICH5 (82801EB)"); - return -1000; /* allow a better driver to override us */ + return BUS_PROBE_LOW_PRIORITY; case ICH6ID: device_set_desc(dev, "Intel ICH6 (82801FB)"); - return -1000; /* allow a better driver to override us */ + return BUS_PROBE_LOW_PRIORITY; case SIS7012ID: device_set_desc(dev, "SiS 7012"); - return 0; + return BUS_PROBE_DEFAULT; case 0x01b110de: device_set_desc(dev, "nVidia nForce"); - return 0; + return BUS_PROBE_DEFAULT; case 0x006a10de: device_set_desc(dev, "nVidia nForce2"); - return 0; + return BUS_PROBE_DEFAULT; case 0x008a10de: device_set_desc(dev, "nVidia nForce2 400"); - return 0; + return BUS_PROBE_DEFAULT; case 0x00da10de: device_set_desc(dev, "nVidia nForce3"); - return 0; + return BUS_PROBE_DEFAULT; case 0x00ea10de: device_set_desc(dev, "nVidia nForce3 250"); - return 0; + return BUS_PROBE_DEFAULT; case 0x74451022: device_set_desc(dev, "AMD-768"); - return 0; + return BUS_PROBE_DEFAULT; case 0x746d1022: device_set_desc(dev, "AMD-8111"); - return 0; + return BUS_PROBE_DEFAULT; default: return ENXIO; diff --git a/sys/dev/sound/pci/maestro.c b/sys/dev/sound/pci/maestro.c index d1b9b5bb8620..a1773491c8ca 100644 --- a/sys/dev/sound/pci/maestro.c +++ b/sys/dev/sound/pci/maestro.c @@ -1753,7 +1753,7 @@ agg_probe(device_t dev) if (s != NULL && pci_get_class(dev) == PCIC_MULTIMEDIA) { device_set_desc(dev, s); - return 0; + return BUS_PROBE_DEFAULT; } return ENXIO; } diff --git a/sys/dev/sound/pci/maestro3.c b/sys/dev/sound/pci/maestro3.c index 35d693772e34..a85c7a71c968 100644 --- a/sys/dev/sound/pci/maestro3.c +++ b/sys/dev/sound/pci/maestro3.c @@ -1070,7 +1070,7 @@ m3_pci_probe(device_t dev) for (card = m3_card_types ; card->pci_id ; card++) { if (pci_get_devid(dev) == card->pci_id) { device_set_desc(dev, card->name); - return 0; + return BUS_PROBE_DEFAULT; } } return ENXIO; diff --git a/sys/dev/sound/pci/solo.c b/sys/dev/sound/pci/solo.c index ed102753c1b8..8cbda9e66599 100644 --- a/sys/dev/sound/pci/solo.c +++ b/sys/dev/sound/pci/solo.c @@ -891,7 +891,7 @@ ess_probe(device_t dev) if (s) device_set_desc(dev, s); - return s? 0 : ENXIO; + return s ? BUS_PROBE_DEFAULT : ENXIO; } #define ESS_PCI_LEGACYCONTROL 0x40 diff --git a/sys/dev/sound/pci/t4dwave.c b/sys/dev/sound/pci/t4dwave.c index f570f0773472..9a6001195cf9 100644 --- a/sys/dev/sound/pci/t4dwave.c +++ b/sys/dev/sound/pci/t4dwave.c @@ -790,16 +790,16 @@ tr_pci_probe(device_t dev) switch (pci_get_devid(dev)) { case SPA_PCI_ID: device_set_desc(dev, "SiS 7018"); - return 0; + return BUS_PROBE_DEFAULT; case ALI_PCI_ID: device_set_desc(dev, "Acer Labs M5451"); - return 0; + return BUS_PROBE_DEFAULT; case TDX_PCI_ID: device_set_desc(dev, "Trident 4DWave DX"); - return 0; + return BUS_PROBE_DEFAULT; case TNX_PCI_ID: device_set_desc(dev, "Trident 4DWave NX"); - return 0; + return BUS_PROBE_DEFAULT; } return ENXIO; diff --git a/sys/dev/sound/pci/via8233.c b/sys/dev/sound/pci/via8233.c index 2c338685837f..241baea42bc9 100644 --- a/sys/dev/sound/pci/via8233.c +++ b/sys/dev/sound/pci/via8233.c @@ -623,25 +623,25 @@ via_probe(device_t dev) switch(pci_get_revid(dev)) { case VIA8233_REV_ID_8233PRE: device_set_desc(dev, "VIA VT8233 (pre)"); - return 0; + return BUS_PROBE_DEFAULT; case VIA8233_REV_ID_8233C: device_set_desc(dev, "VIA VT8233C"); - return 0; + return BUS_PROBE_DEFAULT; case VIA8233_REV_ID_8233: device_set_desc(dev, "VIA VT8233"); - return 0; + return BUS_PROBE_DEFAULT; case VIA8233_REV_ID_8233A: device_set_desc(dev, "VIA VT8233A"); - return 0; + return BUS_PROBE_DEFAULT; case VIA8233_REV_ID_8235: device_set_desc(dev, "VIA VT8235"); - return 0; + return BUS_PROBE_DEFAULT; case VIA8233_REV_ID_8237: device_set_desc(dev, "VIA VT8237"); - return 0; + return BUS_PROBE_DEFAULT; default: device_set_desc(dev, "VIA VT8233X"); /* Unknown */ - return 0; + return BUS_PROBE_DEFAULT; } } return ENXIO; diff --git a/sys/dev/sound/pci/via82c686.c b/sys/dev/sound/pci/via82c686.c index 6a94a1992fe7..0ae12041eb38 100644 --- a/sys/dev/sound/pci/via82c686.c +++ b/sys/dev/sound/pci/via82c686.c @@ -442,8 +442,8 @@ static int via_probe(device_t dev) { if (pci_get_devid(dev) == VIA_PCI_ID) { - device_set_desc(dev, "VIA VT82C686A"); - return 0; + device_set_desc(dev, "VIA VT82C686A"); + return BUS_PROBE_DEFAULT; } return ENXIO; } diff --git a/sys/dev/sound/pci/vibes.c b/sys/dev/sound/pci/vibes.c index 801a2edaab63..dd580acd7fb7 100644 --- a/sys/dev/sound/pci/vibes.c +++ b/sys/dev/sound/pci/vibes.c @@ -704,7 +704,7 @@ sv_probe(device_t dev) switch(pci_get_devid(dev)) { case SV_PCI_ID: device_set_desc(dev, "S3 Sonicvibes"); - return 0; + return BUS_PROBE_DEFAULT; default: return ENXIO; } diff --git a/sys/dev/sound/sbus/cs4231.c b/sys/dev/sound/sbus/cs4231.c index 11f6b0806bb2..2eddaa88ce65 100644 --- a/sys/dev/sound/sbus/cs4231.c +++ b/sys/dev/sound/sbus/cs4231.c @@ -312,7 +312,7 @@ cs4231_bus_probe(device_t dev) name = ofw_bus_get_name(dev); if (strcmp("SUNW,CS4231", name) == 0) { device_set_desc(dev, "Sun Audiocs"); - return (0); + return (BUS_PROBE_DEFAULT); } return (ENXIO); } diff --git a/sys/dev/sound/usb/uaudio_pcm.c b/sys/dev/sound/usb/uaudio_pcm.c index c71e58095d0e..7eea76c35473 100644 --- a/sys/dev/sound/usb/uaudio_pcm.c +++ b/sys/dev/sound/usb/uaudio_pcm.c @@ -290,7 +290,7 @@ ua_probe(device_t dev) s = "USB Audio"; device_set_desc(dev, s); - return 0; + return BUS_PROBE_DEFAULT; } static int diff --git a/sys/dev/sr/if_sr_pci.c b/sys/dev/sr/if_sr_pci.c index 389476126660..dbb8a83a46ba 100644 --- a/sys/dev/sr/if_sr_pci.c +++ b/sys/dev/sr/if_sr_pci.c @@ -86,7 +86,7 @@ sr_pci_probe(device_t device) switch(type) { case 0x556812aa: device_set_desc(device, "RISCom/N2pci"); - return (0); + return (BUS_PROBE_DEFAULT); break; case 0x55684778: case 0x55684877: @@ -94,7 +94,7 @@ sr_pci_probe(device_t device) * XXX This can probably be removed sometime. */ device_set_desc(device, "RISCom/N2pci (old id)"); - return (0); + return (BUS_PROBE_DEFAULT); break; default: break; diff --git a/sys/dev/stg/tmc18c30_pci.c b/sys/dev/stg/tmc18c30_pci.c index 8f8b24e4d0ab..cda2ed7e63d2 100644 --- a/sys/dev/stg/tmc18c30_pci.c +++ b/sys/dev/stg/tmc18c30_pci.c @@ -82,9 +82,9 @@ stg_pci_probe(device_t dev) ++stg; if (stg->desc) { device_set_desc(dev, stg->desc); - return 0; + return (BUS_PROBE_DEFAULT); } - return(ENXIO); + return (ENXIO); } static int diff --git a/sys/dev/sx/sx_pci.c b/sys/dev/sx/sx_pci.c index 49052947791f..79eb4d1717d8 100644 --- a/sys/dev/sx/sx_pci.c +++ b/sys/dev/sx/sx_pci.c @@ -60,7 +60,7 @@ sx_pci_probe( } if (desc) { device_set_desc(dev, desc); - return 0; + return BUS_PROBE_DEFAULT; } return ENXIO; } |