Module Name: src
Committed By: jmcneill
Date: Fri Dec 24 20:49:55 UTC 2010
Modified Files:
src/sys/dev/usb: uaudio.c
Log Message:
fill audio_info.config with the string "usb:<cookie>" instead of "uaudio",
where <cookie> comes from the usbd device handle:
$ audioctl -d /dev/sound1 config
config=usb:00000009
this can be used by software to find the audio device(s) associated with a
USB video capture device
To generate a diff of this commit:
cvs rdiff -u -r1.118 -r1.119 src/sys/dev/usb/uaudio.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/uaudio.c
diff -u src/sys/dev/usb/uaudio.c:1.118 src/sys/dev/usb/uaudio.c:1.119
--- src/sys/dev/usb/uaudio.c:1.118 Wed Nov 3 22:34:23 2010
+++ src/sys/dev/usb/uaudio.c Fri Dec 24 20:49:55 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: uaudio.c,v 1.118 2010/11/03 22:34:23 dyoung Exp $ */
+/* $NetBSD: uaudio.c,v 1.119 2010/12/24 20:49:55 jmcneill Exp $ */
/*
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uaudio.c,v 1.118 2010/11/03 22:34:23 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uaudio.c,v 1.119 2010/12/24 20:49:55 jmcneill Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -52,6 +52,7 @@
#include <sys/vnode.h>
#include <sys/poll.h>
#include <sys/module.h>
+#include <sys/bus.h>
#include <sys/audioio.h>
#include <dev/audio_if.h>
@@ -61,6 +62,7 @@
#include <dev/usb/usb.h>
#include <dev/usb/usbdi.h>
+#include <dev/usb/usbdivar.h>
#include <dev/usb/usbdi_util.h>
#include <dev/usb/usb_quirks.h>
@@ -179,6 +181,7 @@
struct audio_encoding_set *sc_encodings;
u_int sc_channel_config;
char sc_dying;
+ struct audio_device sc_adev;
};
struct terminal_list {
@@ -349,12 +352,6 @@
NULL,
};
-Static struct audio_device uaudio_device = {
- "USB audio",
- "",
- "uaudio"
-};
-
int uaudio_match(device_t, cfdata_t, void *);
void uaudio_attach(device_t, device_t, void *);
int uaudio_detach(device_t, int);
@@ -395,6 +392,11 @@
sc->sc_dev = self;
sc->sc_udev = uaa->device;
+ strlcpy(sc->sc_adev.name, "USB audio", sizeof(sc->sc_adev.name));
+ strlcpy(sc->sc_adev.version, "", sizeof(sc->sc_adev.version));
+ snprintf(sc->sc_adev.config, sizeof(sc->sc_adev.config), "usb:%08x",
+ sc->sc_udev->cookie.cookie);
+
aprint_naive("\n");
aprint_normal("\n");
@@ -2226,7 +2228,7 @@
if (sc->sc_dying)
return EIO;
- *retp = uaudio_device;
+ *retp = sc->sc_adev;
return 0;
}
