Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

audio.c: revert a part of previous change.

Browse Source 
auconv.c: correct handling of size parameter.
This commit is contained in:
kent 2002-03-15 14:55:03 +00:00
parent a5bad132ba
commit 569fb75aef
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/dev/auconv.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: auconv.c,v 1.9 2002/03/09 20:30:42 kent Exp $ */
/* $NetBSD: auconv.c,v 1.10 2002/03/15 14:55:03 kent Exp $ */
/*
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: auconv.c,v 1.9 2002/03/09 20:30:42 kent Exp $");
__KERNEL_RCSID(0, "$NetBSD: auconv.c,v 1.10 2002/03/15 14:55:03 kent Exp $");
#include <sys/types.h>
#include <sys/audioio.h>
@ -153,7 +153,7 @@ linear16_to_linear8_le(void *v, u_char *p, int cc)
{
u_char *q = p;
while ((cc -= 2) >= 0) {
while (--cc >= 0) {
*q++ = p[1];
p += 2;
}
@ -164,7 +164,7 @@ linear16_to_linear8_be(void *v, u_char *p, int cc)
{
u_char *q = p;
while ((cc -= 2) >= 0) {
while (--cc >= 0) {
*q++ = p[0];
p += 2;
}
@ -203,7 +203,7 @@ slinear16_to_ulinear8_le(void *v, u_char *p, int cc)
{
u_char *q = p;
while ((cc -= 2) >= 0) {
while (--cc >= 0) {
*q++ = p[1] ^ 0x80;
p += 2;
}
@ -214,7 +214,7 @@ slinear16_to_ulinear8_be(void *v, u_char *p, int cc)
{
u_char *q = p;
while ((cc -= 2) >= 0) {
while (--cc >= 0) {
*q++ = p[0] ^ 0x80;
p += 2;
}

8
sys/dev/audio.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: audio.c,v 1.150 2002/03/15 14:35:32 kent Exp $ */
/* $NetBSD: audio.c,v 1.151 2002/03/15 14:55:03 kent Exp $ */
/*
* Copyright (c) 1991-1993 Regents of the University of California.
@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.150 2002/03/15 14:35:32 kent Exp $");
__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.151 2002/03/15 14:55:03 kent Exp $");
#include "audio.h"
#if NAUDIO > 0
@ -1277,14 +1277,14 @@ audio_read(struct audio_softc *sc, struct uio *uio, int ioflag)
": cc=%d factor=%d\n", cc,
params->factor);
#endif
params->sw_code(sc->hw_hdl, sc->sc_rconvbuffer,
cc);
cc /= params->factor;
#ifdef DIAGNOSTIC
if (cc == 0)
printf("audio_read: cc=0 factor=%d\n",
params->factor);
#endif
params->sw_code(sc->hw_hdl, sc->sc_rconvbuffer,
cc);
sc->sc_rconvbuffer_end = cc;
}
sc->sc_rconvbuffer_begin = 0;