summaryrefslogtreecommitdiff
path: root/sys/dev/usb/uaudio.c
diff options
context:
space:
mode:
authorAlexandre Ratchov <ratchov@cvs.openbsd.org>2015-05-11 06:46:23 +0000
committerAlexandre Ratchov <ratchov@cvs.openbsd.org>2015-05-11 06:46:23 +0000
commitcb499c42facd77434ebac9a75c6bd41df9f1ed9d (patch)
treecc19762f9b558b3e3639e919167faf31200d4068 /sys/dev/usb/uaudio.c
parente7adfc42b4982d81907aac13902bddc965027d8d (diff)
Remove all audio format conversion code from the kernel (btw holding
the kernel_lock), as we already do better conversions in user-mode. Yet, no need for every single driver to fiddle with the conversion code as they are done transparently by common MI code. With help from armani and miod, support from mpi ok armani@
Diffstat (limited to 'sys/dev/usb/uaudio.c')
-rw-r--r--sys/dev/usb/uaudio.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/sys/dev/usb/uaudio.c b/sys/dev/usb/uaudio.c
index fed8a681876..e23915a4157 100644
--- a/sys/dev/usb/uaudio.c
+++ b/sys/dev/usb/uaudio.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uaudio.c,v 1.110 2015/03/14 03:38:49 jsg Exp $ */
+/* $OpenBSD: uaudio.c,v 1.111 2015/05/11 06:46:22 ratchov Exp $ */
/* $NetBSD: uaudio.c,v 1.90 2004/10/29 17:12:53 kent Exp $ */
/*
@@ -52,7 +52,6 @@
#include <sys/audioio.h>
#include <dev/audio_if.h>
-#include <dev/mulaw.h>
#include <dev/usb/usb.h>
#include <dev/usb/usbdevs.h>
@@ -2355,8 +2354,6 @@ uaudio_get_default_params(void *addr, int mode, struct audio_params *p)
p->bps = 2;
p->msb = 1;
p->channels = 2;
- p->sw_code = NULL;
- p->factor = 1;
/* If the device doesn't support the current mode, there's no
* need to find better parameters.
@@ -3493,9 +3490,6 @@ uaudio_set_params(void *addr, int setmode, int usemode,
continue;
}
- p->sw_code = NULL;
- p->factor = 1;
-
p->bps = sc->sc_alts[i].asf1desc->bSubFrameSize;
p->msb = 1;