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

Rename BIT(n) macro to _BIT(n) to avoid a conflict with forthcoming 

bit-twiddling macros.
This commit is contained in:
dyoung 2006-03-08 00:14:20 +00:00
parent 4cab041d0b
commit e9dba3e91c
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/dev/usb/uaudio.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: uaudio.c,v 1.100 2005/12/11 12:24:01 christos Exp $ */
/* $NetBSD: uaudio.c,v 1.101 2006/03/08 00:14:20 dyoung Exp $ */
/*
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@ -44,7 +44,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: uaudio.c,v 1.100 2005/12/11 12:24:01 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: uaudio.c,v 1.101 2006/03/08 00:14:20 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -762,7 +762,7 @@ uaudio_add_mixer(struct uaudio_softc *sc, const struct io_terminal *iot, int id)
uaudio_determine_class(&iot[id], &mix);
mix.type = MIX_SIGNED_16;
mix.ctlunit = AudioNvolume;
#define BIT(bno) ((bm[bno / 8] >> (7 - bno % 8)) & 1)
#define _BIT(bno) ((bm[bno / 8] >> (7 - bno % 8)) & 1)
for (p = i = 0; i < d->bNrInPins; i++) {
chs = uaudio_get_cluster(d->baSourceId[i], iot).bNrChannels;
mc = 0;
@ -770,7 +770,7 @@ uaudio_add_mixer(struct uaudio_softc *sc, const struct io_terminal *iot, int id)
mo = 0;
for (o = 0; o < ochs; o++) {
bno = (p + c) * ochs + o;
if (BIT(bno))
if (_BIT(bno))
mo++;
}
if (mo == 1)
@ -781,7 +781,7 @@ uaudio_add_mixer(struct uaudio_softc *sc, const struct io_terminal *iot, int id)
for (c = 0; c < chs; c++)
for (o = 0; o < ochs; o++) {
bno = (p + c) * ochs + o;
if (BIT(bno))
if (_BIT(bno))
mix.wValue[k++] =
MAKE(p+c+1, o+1);
}
@ -793,7 +793,7 @@ uaudio_add_mixer(struct uaudio_softc *sc, const struct io_terminal *iot, int id)
} else {
/* XXX */
}
#undef BIT
#undef _BIT
p += chs;
}