Page MenuHomeFreeBSD
Files F144532478

D43349.1775281053.diff
No OneTemporary
Actions

Size
13 KB
Referenced Files
None
Subscribers
None

D43349.1775281053.diff
View Options

diff --git a/sys/dev/sound/pci/als4000.c b/sys/dev/sound/pci/als4000.c
--- a/sys/dev/sound/pci/als4000.c
+++ b/sys/dev/sound/pci/als4000.c
@@ -847,8 +847,9 @@
pcm_addchan(dev, PCMDIR_PLAY, &alspchan_class, sc);
pcm_addchan(dev, PCMDIR_REC, &alsrchan_class, sc);
- snprintf(status, SND_STATUSLEN, "at io 0x%jx irq %jd %s",
- rman_get_start(sc->reg), rman_get_start(sc->irq),PCM_KLDSTRING(snd_als4000));
+ snprintf(status, SND_STATUSLEN, "port 0x%jx irq %jd on %s",
+ rman_get_start(sc->reg), rman_get_start(sc->irq),
+ device_get_nameunit(device_get_parent(dev)));
pcm_setstatus(dev, status);
return 0;
diff --git a/sys/dev/sound/pci/atiixp.c b/sys/dev/sound/pci/atiixp.c
--- a/sys/dev/sound/pci/atiixp.c
+++ b/sys/dev/sound/pci/atiixp.c
@@ -1097,9 +1097,9 @@
"polling", CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_MPSAFE, sc->dev,
sizeof(sc->dev), sysctl_atiixp_polling, "I", "Enable polling mode");
- snprintf(status, SND_STATUSLEN, "at memory 0x%jx irq %jd %s",
+ snprintf(status, SND_STATUSLEN, "mem 0x%jx irq %jd on %s",
rman_get_start(sc->reg), rman_get_start(sc->irq),
- PCM_KLDSTRING(snd_atiixp));
+ device_get_nameunit(device_get_parent(sc->dev)));
pcm_setstatus(sc->dev, status);
diff --git a/sys/dev/sound/pci/cmi.c b/sys/dev/sound/pci/cmi.c
--- a/sys/dev/sound/pci/cmi.c
+++ b/sys/dev/sound/pci/cmi.c
@@ -990,8 +990,9 @@
pcm_addchan(dev, PCMDIR_PLAY, &cmichan_class, sc);
pcm_addchan(dev, PCMDIR_REC, &cmichan_class, sc);
- snprintf(status, SND_STATUSLEN, "at io 0x%jx irq %jd %s",
- rman_get_start(sc->reg), rman_get_start(sc->irq),PCM_KLDSTRING(snd_cmi));
+ snprintf(status, SND_STATUSLEN, "port 0x%jx irq %jd on %s",
+ rman_get_start(sc->reg), rman_get_start(sc->irq),
+ device_get_nameunit(device_get_parent(dev)));
pcm_setstatus(dev, status);
DEB(printf("cmi_attach: succeeded\n"));
diff --git a/sys/dev/sound/pci/cs4281.c b/sys/dev/sound/pci/cs4281.c
--- a/sys/dev/sound/pci/cs4281.c
+++ b/sys/dev/sound/pci/cs4281.c
@@ -845,9 +845,10 @@
pcm_addchan(dev, PCMDIR_PLAY, &cs4281chan_class, sc);
pcm_addchan(dev, PCMDIR_REC, &cs4281chan_class, sc);
- snprintf(status, SND_STATUSLEN, "at %s 0x%jx irq %jd %s",
- (sc->regtype == SYS_RES_IOPORT)? "io" : "memory",
- rman_get_start(sc->reg), rman_get_start(sc->irq),PCM_KLDSTRING(snd_cs4281));
+ snprintf(status, SND_STATUSLEN, "%s 0x%jx irq %jd on %s",
+ (sc->regtype == SYS_RES_IOPORT)? "port" : "mem",
+ rman_get_start(sc->reg), rman_get_start(sc->irq),
+ device_get_nameunit(device_get_parent(dev)));
pcm_setstatus(dev, status);
return 0;
diff --git a/sys/dev/sound/pci/csapcm.c b/sys/dev/sound/pci/csapcm.c
--- a/sys/dev/sound/pci/csapcm.c
+++ b/sys/dev/sound/pci/csapcm.c
@@ -819,8 +819,9 @@
return (ENXIO);
}
- snprintf(status, SND_STATUSLEN, "at irq %jd %s",
- rman_get_start(resp->irq),PCM_KLDSTRING(snd_csa));
+ snprintf(status, SND_STATUSLEN, "irq %jd on %s",
+ rman_get_start(resp->irq),
+ device_get_nameunit(device_get_parent(dev)));
/* Enable interrupt. */
if (snd_setup_intr(dev, resp->irq, 0, csa_intr, csa, &csa->ih)) {
diff --git a/sys/dev/sound/pci/emu10k1.c b/sys/dev/sound/pci/emu10k1.c
--- a/sys/dev/sound/pci/emu10k1.c
+++ b/sys/dev/sound/pci/emu10k1.c
@@ -2126,9 +2126,9 @@
goto bad;
}
- snprintf(status, SND_STATUSLEN, "at io 0x%jx irq %jd %s",
+ snprintf(status, SND_STATUSLEN, "port 0x%jx irq %jd on %s",
rman_get_start(sc->reg), rman_get_start(sc->irq),
- PCM_KLDSTRING(snd_emu10k1));
+ device_get_nameunit(device_get_parent(dev)));
if (pcm_register(dev, sc, sc->nchans, gotmic ? 3 : 2)) goto bad;
for (i = 0; i < sc->nchans; i++)
diff --git a/sys/dev/sound/pci/emu10kx-pcm.c b/sys/dev/sound/pci/emu10kx-pcm.c
--- a/sys/dev/sound/pci/emu10kx-pcm.c
+++ b/sys/dev/sound/pci/emu10kx-pcm.c
@@ -1477,7 +1477,8 @@
if (route == RT_MCHRECORD)
pcm_addchan(dev, PCMDIR_REC, &emufxrchan_class, sc);
- snprintf(status, SND_STATUSLEN, "on %s", device_get_nameunit(device_get_parent(dev)));
+ snprintf(status, SND_STATUSLEN, "on %s",
+ device_get_nameunit(device_get_parent(dev)));
pcm_setstatus(dev, status);
return (0);
diff --git a/sys/dev/sound/pci/envy24.c b/sys/dev/sound/pci/envy24.c
--- a/sys/dev/sound/pci/envy24.c
+++ b/sys/dev/sound/pci/envy24.c
@@ -2590,7 +2590,7 @@
/* set status iformation */
snprintf(status, SND_STATUSLEN,
- "at io 0x%jx:%jd,0x%jx:%jd,0x%jx:%jd,0x%jx:%jd irq %jd",
+ "port 0x%jx:%jd,0x%jx:%jd,0x%jx:%jd,0x%jx:%jd irq %jd on %s",
rman_get_start(sc->cs),
rman_get_end(sc->cs) - rman_get_start(sc->cs) + 1,
rman_get_start(sc->ddma),
@@ -2599,7 +2599,8 @@
rman_get_end(sc->ds) - rman_get_start(sc->ds) + 1,
rman_get_start(sc->mt),
rman_get_end(sc->mt) - rman_get_start(sc->mt) + 1,
- rman_get_start(sc->irq));
+ rman_get_start(sc->irq),
+ device_get_nameunit(device_get_parent(dev)));
pcm_setstatus(dev, status);
return 0;
diff --git a/sys/dev/sound/pci/envy24ht.c b/sys/dev/sound/pci/envy24ht.c
--- a/sys/dev/sound/pci/envy24ht.c
+++ b/sys/dev/sound/pci/envy24ht.c
@@ -2496,12 +2496,13 @@
/* set status iformation */
snprintf(status, SND_STATUSLEN,
- "at io 0x%jx:%jd,0x%jx:%jd irq %jd",
+ "port 0x%jx:%jd,0x%jx:%jd irq %jd on %s",
rman_get_start(sc->cs),
rman_get_end(sc->cs) - rman_get_start(sc->cs) + 1,
rman_get_start(sc->mt),
rman_get_end(sc->mt) - rman_get_start(sc->mt) + 1,
- rman_get_start(sc->irq));
+ rman_get_start(sc->irq),
+ device_get_nameunit(device_get_parent(dev)));
pcm_setstatus(dev, status);
return 0;
diff --git a/sys/dev/sound/pci/es137x.c b/sys/dev/sound/pci/es137x.c
--- a/sys/dev/sound/pci/es137x.c
+++ b/sys/dev/sound/pci/es137x.c
@@ -1856,10 +1856,10 @@
goto bad;
}
- snprintf(status, SND_STATUSLEN, "at %s 0x%jx irq %jd %s",
- (es->regtype == SYS_RES_IOPORT)? "io" : "memory",
+ snprintf(status, SND_STATUSLEN, "%s 0x%jx irq %jd on %s",
+ (es->regtype == SYS_RES_IOPORT)? "port" : "mem",
rman_get_start(es->reg), rman_get_start(es->irq),
- PCM_KLDSTRING(snd_es137x));
+ device_get_nameunit(device_get_parent(dev)));
if (pcm_register(dev, es, numplay, 1))
goto bad;
diff --git a/sys/dev/sound/pci/fm801.c b/sys/dev/sound/pci/fm801.c
--- a/sys/dev/sound/pci/fm801.c
+++ b/sys/dev/sound/pci/fm801.c
@@ -636,9 +636,10 @@
goto oops;
}
- snprintf(status, 64, "at %s 0x%jx irq %jd %s",
- (fm801->regtype == SYS_RES_IOPORT)? "io" : "memory",
- rman_get_start(fm801->reg), rman_get_start(fm801->irq),PCM_KLDSTRING(snd_fm801));
+ snprintf(status, SND_STATUSLEN, "%s 0x%jx irq %jd on %s",
+ (fm801->regtype == SYS_RES_IOPORT)? "port" : "mem",
+ rman_get_start(fm801->reg), rman_get_start(fm801->irq),
+ device_get_nameunit(device_get_parent(dev)));
#define FM801_MAXPLAYCH 1
if (pcm_register(dev, fm801, FM801_MAXPLAYCH, 1)) goto oops;
diff --git a/sys/dev/sound/pci/hda/hdaa.c b/sys/dev/sound/pci/hda/hdaa.c
--- a/sys/dev/sound/pci/hda/hdaa.c
+++ b/sys/dev/sound/pci/hda/hdaa.c
@@ -7114,9 +7114,8 @@
hdaa_unlock(devinfo);
}
- snprintf(status, SND_STATUSLEN, "on %s %s",
- device_get_nameunit(device_get_parent(dev)),
- PCM_KLDSTRING(snd_hda));
+ snprintf(status, SND_STATUSLEN, "on %s",
+ device_get_nameunit(device_get_parent(dev)));
pcm_setstatus(dev, status);
return (0);
diff --git a/sys/dev/sound/pci/hdspe-pcm.c b/sys/dev/sound/pci/hdspe-pcm.c
--- a/sys/dev/sound/pci/hdspe-pcm.c
+++ b/sys/dev/sound/pci/hdspe-pcm.c
@@ -727,10 +727,10 @@
scp->chnum++;
}
- snprintf(status, SND_STATUSLEN, "at io 0x%jx irq %jd %s",
+ snprintf(status, SND_STATUSLEN, "port 0x%jx irq %jd on %s",
rman_get_start(scp->sc->cs),
rman_get_start(scp->sc->irq),
- PCM_KLDSTRING(snd_hdspe));
+ device_get_nameunit(device_get_parent(dev)));
pcm_setstatus(dev, status);
mixer_init(dev, &hdspemixer_class, scp);
diff --git a/sys/dev/sound/pci/ich.c b/sys/dev/sound/pci/ich.c
--- a/sys/dev/sound/pci/ich.c
+++ b/sys/dev/sound/pci/ich.c
@@ -686,9 +686,10 @@
char status[SND_STATUSLEN];
snprintf(status, SND_STATUSLEN,
- "at io 0x%jx, 0x%jx irq %jd bufsz %u %s",
+ "port 0x%jx,0x%jx irq %jd on %s",
rman_get_start(sc->nambar), rman_get_start(sc->nabmbar),
- rman_get_start(sc->irq), sc->bufsz,PCM_KLDSTRING(snd_ich));
+ rman_get_start(sc->irq),
+ device_get_nameunit(device_get_parent(sc->dev)));
if (bootverbose && (sc->flags & ICH_DMA_NOCACHE))
device_printf(sc->dev,
diff --git a/sys/dev/sound/pci/maestro3.c b/sys/dev/sound/pci/maestro3.c
--- a/sys/dev/sound/pci/maestro3.c
+++ b/sys/dev/sound/pci/maestro3.c
@@ -1439,10 +1439,10 @@
goto bad;
}
}
- snprintf(status, SND_STATUSLEN, "at %s 0x%jx irq %jd %s",
- (sc->regtype == SYS_RES_IOPORT)? "io" : "memory",
+ snprintf(status, SND_STATUSLEN, "%s 0x%jx irq %jd on %s",
+ (sc->regtype == SYS_RES_IOPORT)? "port" : "mem",
rman_get_start(sc->reg), rman_get_start(sc->irq),
- PCM_KLDSTRING(snd_maestro3));
+ device_get_nameunit(device_get_parent(dev)));
if (pcm_setstatus(dev, status)) {
device_printf(dev, "attach: pcm_setstatus error\n");
goto bad;
diff --git a/sys/dev/sound/pci/neomagic.c b/sys/dev/sound/pci/neomagic.c
--- a/sys/dev/sound/pci/neomagic.c
+++ b/sys/dev/sound/pci/neomagic.c
@@ -702,9 +702,10 @@
goto bad;
}
- snprintf(status, SND_STATUSLEN, "at memory 0x%jx, 0x%jx irq %jd %s",
+ snprintf(status, SND_STATUSLEN, "mem 0x%jx,0x%jx irq %jd on %s",
rman_get_start(sc->buf), rman_get_start(sc->reg),
- rman_get_start(sc->irq),PCM_KLDSTRING(snd_neomagic));
+ rman_get_start(sc->irq),
+ device_get_nameunit(device_get_parent(dev)));
if (pcm_register(dev, sc, 1, 1)) goto bad;
pcm_addchan(dev, PCMDIR_REC, &nmchan_class, sc);
diff --git a/sys/dev/sound/pci/solo.c b/sys/dev/sound/pci/solo.c
--- a/sys/dev/sound/pci/solo.c
+++ b/sys/dev/sound/pci/solo.c
@@ -1022,9 +1022,10 @@
if (mixer_init(dev, &solomixer_class, sc))
goto no;
- snprintf(status, SND_STATUSLEN, "at io 0x%jx,0x%jx,0x%jx irq %jd %s",
+ snprintf(status, SND_STATUSLEN, "port 0x%jx,0x%jx,0x%jx irq %jd on %s",
rman_get_start(sc->io), rman_get_start(sc->sb), rman_get_start(sc->vc),
- rman_get_start(sc->irq),PCM_KLDSTRING(snd_solo));
+ rman_get_start(sc->irq),
+ device_get_nameunit(device_get_parent(dev)));
if (pcm_register(dev, sc, 1, 1))
goto no;
diff --git a/sys/dev/sound/pci/t4dwave.c b/sys/dev/sound/pci/t4dwave.c
--- a/sys/dev/sound/pci/t4dwave.c
+++ b/sys/dev/sound/pci/t4dwave.c
@@ -917,8 +917,9 @@
goto bad;
}
- snprintf(status, 64, "at io 0x%jx irq %jd %s",
- rman_get_start(tr->reg), rman_get_start(tr->irq),PCM_KLDSTRING(snd_t4dwave));
+ snprintf(status, SND_STATUSLEN, "port 0x%jx irq %jd on %s",
+ rman_get_start(tr->reg), rman_get_start(tr->irq),
+ device_get_nameunit(device_get_parent(dev)));
if (pcm_register(dev, tr, dacn, 1))
goto bad;
diff --git a/sys/dev/sound/pci/via8233.c b/sys/dev/sound/pci/via8233.c
--- a/sys/dev/sound/pci/via8233.c
+++ b/sys/dev/sound/pci/via8233.c
@@ -1347,9 +1347,9 @@
ac97_setextmode(via->codec, ext);
}
- snprintf(status, SND_STATUSLEN, "at io 0x%jx irq %jd %s",
+ snprintf(status, SND_STATUSLEN, "port 0x%jx irq %jd on %s",
rman_get_start(via->reg), rman_get_start(via->irq),
- PCM_KLDSTRING(snd_via8233));
+ device_get_nameunit(device_get_parent(dev)));
/* Register */
if (pcm_register(dev, via, via_dxs_chnum + via_sgd_chnum, NWRCHANS))
diff --git a/sys/dev/sound/pci/via82c686.c b/sys/dev/sound/pci/via82c686.c
--- a/sys/dev/sound/pci/via82c686.c
+++ b/sys/dev/sound/pci/via82c686.c
@@ -580,9 +580,9 @@
NSEGS * sizeof(struct via_dma_op), dma_cb, via, 0) != 0)
goto bad;
- snprintf(status, SND_STATUSLEN, "at io 0x%jx irq %jd %s",
+ snprintf(status, SND_STATUSLEN, "port 0x%jx irq %jd on %s",
rman_get_start(via->reg), rman_get_start(via->irq),
- PCM_KLDSTRING(snd_via82c686));
+ device_get_nameunit(device_get_parent(dev)));
/* Register */
if (pcm_register(dev, via, 1, 1)) goto bad;
diff --git a/sys/dev/sound/pci/vibes.c b/sys/dev/sound/pci/vibes.c
--- a/sys/dev/sound/pci/vibes.c
+++ b/sys/dev/sound/pci/vibes.c
@@ -874,8 +874,9 @@
pcm_addchan(dev, PCMDIR_PLAY, &svpchan_class, sc);
pcm_addchan(dev, PCMDIR_REC, &svrchan_class, sc);
- snprintf(status, SND_STATUSLEN, "at io 0x%jx irq %jd %s",
- rman_get_start(sc->enh_reg), rman_get_start(sc->irq),PCM_KLDSTRING(snd_vibes));
+ snprintf(status, SND_STATUSLEN, "port 0x%jx irq %jd on %s",
+ rman_get_start(sc->enh_reg), rman_get_start(sc->irq),
+ device_get_nameunit(device_get_parent(dev)));
pcm_setstatus(dev, status);
DEB(printf("sv_attach: succeeded\n"));
diff --git a/sys/dev/sound/pcm/sound.h b/sys/dev/sound/pcm/sound.h
--- a/sys/dev/sound/pcm/sound.h
+++ b/sys/dev/sound/pcm/sound.h
@@ -598,12 +598,6 @@
PCM_GIANT_EXIT(x); \
} while (0)
-#ifdef KLD_MODULE
-#define PCM_KLDSTRING(a) ("kld " # a)
-#else
-#define PCM_KLDSTRING(a) ""
-#endif
-
#endif /* _KERNEL */
#endif /* _OS_H_ */
diff --git a/sys/dev/sound/usb/uaudio.c b/sys/dev/sound/usb/uaudio.c
--- a/sys/dev/sound/usb/uaudio.c
+++ b/sys/dev/sound/usb/uaudio.c
@@ -1204,9 +1204,8 @@
usb_get_product(sc->sc_udev));
device_set_desc_copy(dev, desc);
- snprintf(status, sizeof(status), "at %s %s",
- device_get_nameunit(device_get_parent(dev)),
- PCM_KLDSTRING(snd_uaudio));
+ snprintf(status, sizeof(status), "on %s",
+ device_get_nameunit(device_get_parent(dev)));
if (pcm_register(dev, sc,
(sc->sc_play_chan[i].num_alt > 0) ? 1 : 0,

File Metadata

Mime Type
text/plain
Expires
Sat, Apr 4, 5:37 AM (52 m, 13 s)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28258052
Default Alt Text
D43349.1775281053.diff (13 KB)

Event Timeline