Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/arm/iomd Don't complain if we're asked for != 8 cha...



details:   https://anonhg.NetBSD.org/src/rev/6f1fbc8e2412
branches:  trunk
changeset: 556048:6f1fbc8e2412
user:      bjh21 <bjh21%NetBSD.org@localhost>
date:      Sat Dec 06 19:59:32 2003 +0000

description:
Don't complain if we're asked for != 8 channels.  There's no actual support
for fewer channels yet, but this is necessary just to avoid a boot-time panic.

diffstat:

 sys/arch/arm/iomd/vidcaudio.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (30 lines):

diff -r 866ff6f99b63 -r 6f1fbc8e2412 sys/arch/arm/iomd/vidcaudio.c
--- a/sys/arch/arm/iomd/vidcaudio.c     Sat Dec 06 19:34:21 2003 +0000
+++ b/sys/arch/arm/iomd/vidcaudio.c     Sat Dec 06 19:59:32 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vidcaudio.c,v 1.15 2003/10/26 11:45:46 jdolecek Exp $  */
+/*     $NetBSD: vidcaudio.c,v 1.16 2003/12/06 19:59:32 bjh21 Exp $     */
 
 /*
  * Copyright (c) 1995 Melvin Tang-Richardson
@@ -38,7 +38,7 @@
 
 #include <sys/param.h> /* proc.h */
 
-__KERNEL_RCSID(0, "$NetBSD: vidcaudio.c,v 1.15 2003/10/26 11:45:46 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vidcaudio.c,v 1.16 2003/12/06 19:59:32 bjh21 Exp $");
 
 #include <sys/conf.h>   /* autoconfig functions */
 #include <sys/device.h> /* device calls */
@@ -330,9 +330,9 @@
        int setmode, usemode;
        struct audio_params *p, *r;
 {
-       if (p->encoding != AUDIO_ENCODING_ULAW ||
-           p->channels != 8)
+       if (p->encoding != AUDIO_ENCODING_ULAW)
                return EINVAL;
+       /* FIXME Handle number of channels properly. */
        vidcaudio_rate(4 * p->sample_rate / (3 * 1024)); /* XXX probably wrong */
 
        return 0;



Home | Main Index | Thread Index | Old Index