mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-10-19 02:29:40 +00:00
Code Issues Releases Activity

Add a tunable sysctl, hw.usb.uaudio.handle_hid, to allow disabling the

Browse Source 
the HID volume keys support in the USB audio driver.

While at it re-organize the USB audio sysctls a bit.

Differential Revision:	https://reviews.freebsd.org/D27180
MFC after:	1 week
Sponsored by:	Mellanox Technologies // NVIDIA Networking
This commit is contained in:
Hans Petter Selasky 2020-11-12 09:26:01 +00:00
parent eb985e1802
commit f14436adc6
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=367615
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
sys/dev/sound/usb/uaudio.c
View File

@ -98,15 +98,12 @@ static int uaudio_default_rate = 0; /* use rate list */
static int uaudio_default_bits = 32;
static int uaudio_default_channels = 0; /* use default */
static int uaudio_buffer_ms = 8;
#ifdef USB_DEBUG
static int uaudio_debug;
static bool uaudio_handle_hid = true;
static SYSCTL_NODE(_hw_usb, OID_AUTO, uaudio, CTLFLAG_RW | CTLFLAG_MPSAFE, 0,
"USB uaudio");
SYSCTL_INT(_hw_usb_uaudio, OID_AUTO, debug, CTLFLAG_RWTUN,
&uaudio_debug, 0, "uaudio debug level");
SYSCTL_BOOL(_hw_usb_uaudio, OID_AUTO, handle_hid, CTLFLAG_RWTUN,
&uaudio_handle_hid, 0, "uaudio handles any HID volume/mute keys, if set");
SYSCTL_INT(_hw_usb_uaudio, OID_AUTO, default_rate, CTLFLAG_RWTUN,
&uaudio_default_rate, 0, "uaudio default sample rate");
SYSCTL_INT(_hw_usb_uaudio, OID_AUTO, default_bits, CTLFLAG_RWTUN,
@ -138,6 +135,12 @@ SYSCTL_PROC(_hw_usb_uaudio, OID_AUTO, buffer_ms,
CTLTYPE_INT | CTLFLAG_RWTUN | CTLFLAG_MPSAFE, 0, sizeof(int),
uaudio_buffer_ms_sysctl, "I",
"uaudio buffering delay from 2ms to 8ms");
#ifdef USB_DEBUG
static int uaudio_debug;
SYSCTL_INT(_hw_usb_uaudio, OID_AUTO, debug, CTLFLAG_RWTUN,
&uaudio_debug, 0, "uaudio debug level");
#else
#define uaudio_debug 0
#endif
@ -1116,10 +1119,12 @@ uaudio_attach(device_t dev)
goto detach;
}
if (uaudio_hid_probe(sc, uaa) == 0) {
device_printf(dev, "HID volume keys found.\n");
} else {
device_printf(dev, "No HID volume keys found.\n");
if (uaudio_handle_hid) {
if (uaudio_hid_probe(sc, uaa) == 0) {
device_printf(dev, "HID volume keys found.\n");
} else {
device_printf(dev, "No HID volume keys found.\n");
}
}
/* reload all mixer settings */