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

Augment /dev/sndstat with the module names, if applicable.

Browse Source 
Approved by:	  tanimura (mentor)
This commit is contained in:
matk 2004-03-06 15:52:42 +00:00
parent d763a3ee32
commit a8492f84bf
24 changed files with 58 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sys/dev/sound/isa/ad1816.c
View File

@ -621,12 +621,13 @@ ad1816_attach(device_t dev)
else
status2[0] = '\0';
snprintf(status, SND_STATUSLEN, "at io 0x%lx irq %ld drq %ld%s bufsz %u",
snprintf(status, SND_STATUSLEN, "at io 0x%lx irq %ld drq %ld%s bufsz %u %s",
rman_get_start(ad1816->io_base),
rman_get_start(ad1816->irq),
rman_get_start(ad1816->drq1),
status2,
ad1816->bufsize);
ad1816->bufsize,
PCM_KLDSTRING(snd_ad1816));
if (pcm_register(dev, ad1816, 1, 1)) goto no;
pcm_addchan(dev, PCMDIR_REC, &ad1816chan_class, ad1816);

5
sys/dev/sound/isa/ess.c
View File

@ -866,9 +866,10 @@ ess_attach(device_t dev)
else
buf[0] = '\0';
snprintf(status, SND_STATUSLEN, "at io 0x%lx irq %ld drq %ld%s bufsz %u",
snprintf(status, SND_STATUSLEN, "at io 0x%lx irq %ld drq %ld%s bufsz %u %s",
rman_get_start(sc->io_base), rman_get_start(sc->irq),
rman_get_start(sc->drq1), buf, sc->bufsize);
rman_get_start(sc->drq1), buf, sc->bufsize,
PCM_KLDSTRING(snd_ess));
if (pcm_register(dev, sc, 1, 1))
goto no;

5
sys/dev/sound/isa/sb16.c
View File

@ -824,9 +824,10 @@ sb16_attach(device_t dev)
else
status2[0] = '\0';
snprintf(status, SND_STATUSLEN, "at io 0x%lx irq %ld drq %ld%s bufsz %ud",
snprintf(status, SND_STATUSLEN, "at io 0x%lx irq %ld drq %ld%s bufsz %ud %s",
rman_get_start(sb->io_base), rman_get_start(sb->irq),
rman_get_start(sb->drq1), status2, sb->bufsize);
rman_get_start(sb->drq1), status2, sb->bufsize,
PCM_KLDSTRING(snd_sb16));
if (pcm_register(dev, sb, 1, 1))
goto no;

5
sys/dev/sound/isa/sb8.c
View File

@ -730,8 +730,9 @@ sb_attach(device_t dev)
goto no;
}
snprintf(status, SND_STATUSLEN, "at io 0x%lx irq %ld drq %ld bufsz %u",
rman_get_start(sb->io_base), rman_get_start(sb->irq), rman_get_start(sb->drq), sb->bufsize);
snprintf(status, SND_STATUSLEN, "at io 0x%lx irq %ld drq %ld bufsz %u %s",
rman_get_start(sb->io_base), rman_get_start(sb->irq),
rman_get_start(sb->drq), sb->bufsize, PCM_KLDSTRING(snd_sb8));
if (pcm_register(dev, sb, 1, 1))
goto no;

4
sys/dev/sound/pci/als4000.c
View File

@ -818,8 +818,8 @@ als_pci_attach(device_t dev)
pcm_addchan(dev, PCMDIR_PLAY, &alspchan_class, sc);
pcm_addchan(dev, PCMDIR_REC, &alsrchan_class, sc);
snprintf(status, SND_STATUSLEN, "at io 0x%lx irq %ld",
rman_get_start(sc->reg), rman_get_start(sc->irq));
snprintf(status, SND_STATUSLEN, "at io 0x%lx irq %ld %s",
rman_get_start(sc->reg), rman_get_start(sc->irq),PCM_KLDSTRING(snd_als4000));
pcm_setstatus(dev, status);
return 0;

4
sys/dev/sound/pci/au88x0.c
View File

@ -529,9 +529,9 @@ au88x0_set_status(device_t dev)
struct au88x0_info *aui;
aui = pcm_getdevinfo(dev);
snprintf(status, sizeof status, "at %s 0x%lx irq %ld",
snprintf(status, sizeof status, "at %s 0x%lx irq %ld %s",
(aui->aui_regtype == SYS_RES_IOPORT)? "io" : "memory",
rman_get_start(aui->aui_reg), rman_get_start(aui->aui_irq));
rman_get_start(aui->aui_reg), rman_get_start(aui->aui_irq),PCM_KLDSTRING(snd_au88x0));
pcm_setstatus(dev, status);
}

4
sys/dev/sound/pci/aureal.c
View File

@ -647,9 +647,9 @@ au_pci_attach(device_t dev)
goto bad;
}
snprintf(status, SND_STATUSLEN, "at %s 0x%lx irq %ld",
snprintf(status, SND_STATUSLEN, "at %s 0x%lx irq %ld %s",
(type[0] == SYS_RES_IOPORT)? "io" : "memory",
rman_get_start(reg[0]), rman_get_start(irq));
rman_get_start(reg[0]), rman_get_start(irq),PCM_KLDSTRING(snd_aureal));
if (pcm_register(dev, au, 1, 1)) goto bad;
/* pcm_addchan(dev, PCMDIR_REC, &au_chantemplate, au); */

4
sys/dev/sound/pci/cmi.c
View File

@ -898,8 +898,8 @@ cmi_attach(device_t dev)
pcm_addchan(dev, PCMDIR_PLAY, &cmichan_class, sc);
pcm_addchan(dev, PCMDIR_REC, &cmichan_class, sc);
snprintf(status, SND_STATUSLEN, "at io 0x%lx irq %ld",
rman_get_start(sc->reg), rman_get_start(sc->irq));
snprintf(status, SND_STATUSLEN, "at io 0x%lx irq %ld %s",
rman_get_start(sc->reg), rman_get_start(sc->irq),PCM_KLDSTRING(snd_cmi));
pcm_setstatus(dev, status);
DEB(printf("cmi_attach: succeeded\n"));

4
sys/dev/sound/pci/cs4281.c
View File

@ -858,9 +858,9 @@ cs4281_pci_attach(device_t dev)
pcm_addchan(dev, PCMDIR_PLAY, &cs4281chan_class, sc);
pcm_addchan(dev, PCMDIR_REC, &cs4281chan_class, sc);
snprintf(status, SND_STATUSLEN, "at %s 0x%lx irq %ld",
snprintf(status, SND_STATUSLEN, "at %s 0x%lx irq %ld %s",
(sc->regtype == SYS_RES_IOPORT)? "io" : "memory",
rman_get_start(sc->reg), rman_get_start(sc->irq));
rman_get_start(sc->reg), rman_get_start(sc->irq),PCM_KLDSTRING(snd_cs4281));
pcm_setstatus(dev, status);
return 0;

3
sys/dev/sound/pci/csapcm.c
View File

@ -788,7 +788,8 @@ pcmcsa_attach(device_t dev)
return (ENXIO);
}
snprintf(status, SND_STATUSLEN, "at irq %ld", rman_get_start(resp->irq));
snprintf(status, SND_STATUSLEN, "at irq %ld %s",
rman_get_start(resp->irq),PCM_KLDSTRING(snd_csa));
/* Enable interrupt. */
if (snd_setup_intr(dev, resp->irq, INTR_MPSAFE, csa_intr, csa, &csa->ih)) {

4
sys/dev/sound/pci/ds1.c
View File

@ -996,8 +996,8 @@ ds_pci_attach(device_t dev)
goto bad;
}
snprintf(status, SND_STATUSLEN, "at memory 0x%lx irq %ld",
rman_get_start(sc->reg), rman_get_start(sc->irq));
snprintf(status, SND_STATUSLEN, "at memory 0x%lx irq %ld %s",
rman_get_start(sc->reg), rman_get_start(sc->irq),PCM_KLDSTRING(snd_ds1));
if (pcm_register(dev, sc, DS1_CHANS, 2))
goto bad;

5
sys/dev/sound/pci/emu10k1.c
View File

@ -1950,8 +1950,9 @@ emu_pci_attach(device_t dev)
goto bad;
}
snprintf(status, SND_STATUSLEN, "at io 0x%lx irq %ld",
rman_get_start(sc->reg), rman_get_start(sc->irq));
snprintf(status, SND_STATUSLEN, "at io 0x%lx irq %ld %s",
rman_get_start(sc->reg), rman_get_start(sc->irq),
PCM_KLDSTRING(snd_emu10k1));
if (pcm_register(dev, sc, sc->nchans, gotmic ? 3 : 2)) goto bad;
for (i = 0; i < sc->nchans; i++)

4
sys/dev/sound/pci/es137x.c
View File

@ -924,9 +924,9 @@ es_pci_attach(device_t dev)
goto bad;
}
snprintf(status, SND_STATUSLEN, "at %s 0x%lx irq %ld",
snprintf(status, SND_STATUSLEN, "at %s 0x%lx irq %ld %s",
(es->regtype == SYS_RES_IOPORT)? "io" : "memory",
rman_get_start(es->reg), rman_get_start(es->irq));
rman_get_start(es->reg), rman_get_start(es->irq),PCM_KLDSTRING(snd_es137x));
if (pcm_register(dev, es, 1, 1)) goto bad;
pcm_addchan(dev, PCMDIR_REC, ct, es);

4
sys/dev/sound/pci/fm801.c
View File

@ -638,9 +638,9 @@ fm801_pci_attach(device_t dev)
goto oops;
}
snprintf(status, 64, "at %s 0x%lx irq %ld",
snprintf(status, 64, "at %s 0x%lx irq %ld %s",
(fm801->regtype == SYS_RES_IOPORT)? "io" : "memory",
rman_get_start(fm801->reg), rman_get_start(fm801->irq));
rman_get_start(fm801->reg), rman_get_start(fm801->irq),PCM_KLDSTRING(snd_fm801));
#define FM801_MAXPLAYCH 1
if (pcm_register(dev, fm801, FM801_MAXPLAYCH, 1)) goto oops;

4
sys/dev/sound/pci/ich.c
View File

@ -761,8 +761,8 @@ ich_pci_attach(device_t dev)
if (sc->hasmic)
pcm_addchan(dev, PCMDIR_REC, &ichchan_class, sc); /* record mic */
snprintf(status, SND_STATUSLEN, "at io 0x%lx, 0x%lx irq %ld bufsz %u",
rman_get_start(sc->nambar), rman_get_start(sc->nabmbar), rman_get_start(sc->irq), sc->bufsz);
snprintf(status, SND_STATUSLEN, "at io 0x%lx, 0x%lx irq %ld bufsz %u %s",
rman_get_start(sc->nambar), rman_get_start(sc->nabmbar), rman_get_start(sc->irq), sc->bufsz,PCM_KLDSTRING(snd_ich));
pcm_setstatus(dev, status);

4
sys/dev/sound/pci/maestro.c
View File

@ -1033,8 +1033,8 @@ agg_attach(device_t dev)
ess->irqid = irqid;
ess->ih = ih;
snprintf(status, SND_STATUSLEN, "at I/O port 0x%lx irq %ld",
rman_get_start(reg), rman_get_start(irq));
snprintf(status, SND_STATUSLEN, "at I/O port 0x%lx irq %ld %s",
rman_get_start(reg), rman_get_start(irq),PCM_KLDSTRING(snd_maestro));
if (pcm_register(dev, ess, AGG_MAXPLAYCH, 1))
goto bad;

4
sys/dev/sound/pci/maestro3.c
View File

@ -1189,9 +1189,9 @@ m3_pci_attach(device_t dev)
goto bad;
}
}
snprintf(status, SND_STATUSLEN, "at %s 0x%lx irq %ld",
snprintf(status, SND_STATUSLEN, "at %s 0x%lx irq %ld %s",
(sc->regtype == SYS_RES_IOPORT)? "io" : "memory",
rman_get_start(sc->reg), rman_get_start(sc->irq));
rman_get_start(sc->reg), rman_get_start(sc->irq),PCM_KLDSTRING(snd_maestro3));
if (pcm_setstatus(dev, status)) {
device_printf(dev, "attach: pcm_setstatus error\n");
goto bad;

4
sys/dev/sound/pci/neomagic.c
View File

@ -704,9 +704,9 @@ nm_pci_attach(device_t dev)
goto bad;
}
snprintf(status, SND_STATUSLEN, "at memory 0x%lx, 0x%lx irq %ld",
snprintf(status, SND_STATUSLEN, "at memory 0x%lx, 0x%lx irq %ld %s",
rman_get_start(sc->buf), rman_get_start(sc->reg),
rman_get_start(sc->irq));
rman_get_start(sc->irq),PCM_KLDSTRING(snd_neomagic));
if (pcm_register(dev, sc, 1, 1)) goto bad;
pcm_addchan(dev, PCMDIR_REC, &nmchan_class, sc);

4
sys/dev/sound/pci/solo.c
View File

@ -997,9 +997,9 @@ ess_attach(device_t dev)
goto no;
}
snprintf(status, SND_STATUSLEN, "at io 0x%lx,0x%lx,0x%lx irq %ld",
snprintf(status, SND_STATUSLEN, "at io 0x%lx,0x%lx,0x%lx irq %ld %s",
rman_get_start(sc->io), rman_get_start(sc->sb), rman_get_start(sc->vc),
rman_get_start(sc->irq));
rman_get_start(sc->irq),PCM_KLDSTRING(snd_solo));
if (pcm_register(dev, sc, 1, 1))
goto no;

4
sys/dev/sound/pci/t4dwave.c
View File

@ -860,8 +860,8 @@ tr_pci_attach(device_t dev)
goto bad;
}
snprintf(status, 64, "at io 0x%lx irq %ld",
rman_get_start(tr->reg), rman_get_start(tr->irq));
snprintf(status, 64, "at io 0x%lx irq %ld %s",
rman_get_start(tr->reg), rman_get_start(tr->irq),PCM_KLDSTRING(snd_t4dwave));
if (pcm_register(dev, tr, TR_MAXPLAYCH, 1)) goto bad;
pcm_addchan(dev, PCMDIR_REC, &trrchan_class, tr);

4
sys/dev/sound/pci/via8233.c
View File

@ -843,8 +843,8 @@ via_attach(device_t dev)
ac97_setextmode(via->codec, ext);
}
snprintf(status, SND_STATUSLEN, "at io 0x%lx irq %ld",
rman_get_start(via->reg), rman_get_start(via->irq));
snprintf(status, SND_STATUSLEN, "at io 0x%lx irq %ld %s",
rman_get_start(via->reg), rman_get_start(via->irq),PCM_KLDSTRING(snd_via8233));
/* Register */
if (pci_get_revid(dev) == VIA8233_REV_ID_8233A) {

4
sys/dev/sound/pci/via82c686.c
View File

@ -572,7 +572,9 @@ via_attach(device_t dev)
if (bus_dmamap_load(via->sgd_dmat, via->sgd_dmamap, via->sgd_table, NSEGS * sizeof(struct via_dma_op), dma_cb, via, 0))
goto bad;
snprintf(status, SND_STATUSLEN, "at io 0x%lx irq %ld", rman_get_start(via->reg), rman_get_start(via->irq));
snprintf(status, SND_STATUSLEN, "at io 0x%lx irq %ld %s",
rman_get_start(via->reg), rman_get_start(via->irq),
PCM_KLDSTRING(snd_via82c686));
/* Register */
if (pcm_register(dev, via, 1, 1)) goto bad;

4
sys/dev/sound/pci/vibes.c
View File

@ -878,8 +878,8 @@ sv_attach(device_t dev) {
pcm_addchan(dev, PCMDIR_PLAY, &svpchan_class, sc);
pcm_addchan(dev, PCMDIR_REC, &svrchan_class, sc);
snprintf(status, SND_STATUSLEN, "at io 0x%lx irq %ld",
rman_get_start(sc->enh_reg), rman_get_start(sc->irq));
snprintf(status, SND_STATUSLEN, "at io 0x%lx irq %ld %s",
rman_get_start(sc->enh_reg), rman_get_start(sc->irq),PCM_KLDSTRING(snd_vibes));
pcm_setstatus(dev, status);
DEB(printf("sv_attach: succeeded\n"));

6
sys/dev/sound/pcm/sound.h
View File

@ -314,6 +314,12 @@ void pcm_lock(struct snddev_info *d);
void pcm_unlock(struct snddev_info *d);
#endif
#ifdef KLD_MODULE
#define PCM_KLDSTRING(a) ("kld " # a)
#else
#define PCM_KLDSTRING(a) ""
#endif
#endif /* _KERNEL */
#endif /* _OS_H_ */