From e9dba3e91ce54c6c72a092208665e4a58039a219 Mon Sep 17 00:00:00 2001 From: dyoung Date: Wed, 8 Mar 2006 00:14:20 +0000 Subject: [PATCH] Rename BIT(n) macro to _BIT(n) to avoid a conflict with forthcoming bit-twiddling macros. --- sys/dev/usb/uaudio.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/dev/usb/uaudio.c b/sys/dev/usb/uaudio.c index 9b62e2c1262e..9652bd723901 100644 --- a/sys/dev/usb/uaudio.c +++ b/sys/dev/usb/uaudio.c @@ -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 -__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 #include @@ -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; }