system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-07-22 18:56:38 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

sound: Fix oss_audioinfo's card_number, port_number and legacy_device

Browse source 
Although the docs advise against using them, it doesn't hurt to fill
them out correctly.

Sponsored by:	The FreeBSD Foundation
MFC after:	1 day
Reviewed by:	dev_submerge.ch, markj
Differential Revision:	https://reviews.freebsd.org/D45604
This commit is contained in:
Christos Margiolis 2024-06-18 15:19:07 +02:00
parent 8e36d21259
commit 0f878cdfc5
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
sys/dev/sound/pcm/dsp.c
View file

@ -2134,8 +2134,8 @@ dsp_oss_audioinfo(struct cdev *i_dev, oss_audioinfo *ai, bool ex)
strlcpy(ai->name, device_get_desc(d->dev), sizeof(ai->name)); strlcpy(ai->name, device_get_desc(d->dev), sizeof(ai->name));
ai->pid = -1; ai->pid = -1;
strlcpy(ai->cmd, CHN_COMM_UNKNOWN, sizeof(ai->cmd)); strlcpy(ai->cmd, CHN_COMM_UNKNOWN, sizeof(ai->cmd));
ai->card_number = -1; ai->card_number = unit;
ai->port_number = -1; ai->port_number = unit;
ai->mixer_dev = (d->mixer_dev != NULL) ? unit : -1; ai->mixer_dev = (d->mixer_dev != NULL) ? unit : -1;
ai->legacy_device = unit; ai->legacy_device = unit;
snprintf(ai->devnode, sizeof(ai->devnode), "/dev/dsp%d", unit); snprintf(ai->devnode, sizeof(ai->devnode), "/dev/dsp%d", unit);
@ -2371,20 +2371,20 @@ dsp_oss_engineinfo(struct cdev *i_dev, oss_audioinfo *ai)
* should normally not use this field for any * should normally not use this field for any
* purpose." * purpose."
*/ */
ai->card_number = -1; ai->card_number = unit;
/** /**
* @todo @c song_name - depends first on * @todo @c song_name - depends first on
* SNDCTL_[GS]ETSONG @todo @c label - depends * SNDCTL_[GS]ETSONG @todo @c label - depends
* on SNDCTL_[GS]ETLABEL * on SNDCTL_[GS]ETLABEL
* @todo @c port_number - routing information? * @todo @c port_number - routing information?
*/ */
ai->port_number = -1; ai->port_number = unit;
ai->mixer_dev = (d->mixer_dev != NULL) ? unit : -1; ai->mixer_dev = (d->mixer_dev != NULL) ? unit : -1;
/** /**
* @note * @note
* @c legacy_device - OSSv4 docs: "Obsolete." * @c legacy_device - OSSv4 docs: "Obsolete."
*/ */
ai->legacy_device = -1; ai->legacy_device = unit;
snprintf(ai->devnode, sizeof(ai->devnode), "/dev/dsp%d", unit); snprintf(ai->devnode, sizeof(ai->devnode), "/dev/dsp%d", unit);
ai->enabled = device_is_attached(d->dev) ? 1 : 0; ai->enabled = device_is_attached(d->dev) ? 1 : 0;
/** /**