From: Takashi Iwai Subject: Re: [PATCH 18/98] include/uapi/sound/emu10k1.h: added EMU10K1 version of DECLARE_BITMAP etc macros Date: Sun, 31 May 2015 10:12:07 +0200 Message-ID: References: <1433000370-19509-1-git-send-email-mikko.rapeli@iki.fi> <1433000370-19509-19-git-send-email-mikko.rapeli@iki.fi> Mime-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Return-path: In-Reply-To: Sender: linux-api-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: Mikko Rapeli Cc: linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Jaroslav Kysela , alsa-devel-K7yf7f+aM1XWsZ/bQMPhNw@public.gmane.org, linux-api-u79uwXL29TY76Z2rM5mHXA@public.gmane.org List-Id: alsa-devel@alsa-project.org At Sun, 31 May 2015 09:18:57 +0200, Takashi Iwai wrote: >=20 > At Sat, 30 May 2015 17:38:10 +0200, > Mikko Rapeli wrote: > >=20 > > Fixes userspace compilation error: > >=20 > > error: expected specifier-qualifier-list before =E2=80=98DECLARE_BI= TMAP=E2=80=99 > > DECLARE_BITMAP(gpr_valid, 0x200); /* bitmask of valid initializer= s */ > >=20 > > DECLARE_BITMAP etc macros are not meant for userspace headers and t= hus > > added here as private copies for emu10k.h. > >=20 > > Fix was suggested by Arnd Bergmann in message > > <2168807.4Yxh5gl11Q@wuerfel> on lkml. > >=20 > > Signed-off-by: Mikko Rapeli > > --- > > include/uapi/sound/emu10k1.h | 23 ++++++++++++++++++++--- > > 1 file changed, 20 insertions(+), 3 deletions(-) > >=20 > > diff --git a/include/uapi/sound/emu10k1.h b/include/uapi/sound/emu1= 0k1.h > > index ec1535b..7575f0f 100644 > > --- a/include/uapi/sound/emu10k1.h > > +++ b/include/uapi/sound/emu10k1.h > > @@ -34,6 +34,23 @@ > > =20 > > #define EMU10K1_FX8010_PCM_COUNT 8 > > =20 > > +/* > > + * Following definitions are copies from kernel headers to support= compiling > > + * this header file in userspace. The definitions are not generall= y available > > + * in uapi headers so the needed things are copied here wtih __EMU= 10k1 prefix. > > + */ > > + > > +/* From include/linux/bitops.h */ > > +#define __EMU10K1_BITS_PER_BYTE 8 > > +/* From include/linux/kernel.h */ > > +#define __EMU10K1_DIV_ROUND_UP(n,d) (((n) + (d) - 1) / (d)) > > +/* From include/linux/bitops.h */ > > +#define __EMU10K1_BITS_TO_LONGS(nr) \ > > + __EMU10K1_DIV_ROUND_UP(nr, __EMU10K1_BITS_PER_BYTE * sizeo= f(long)) > > +/* From include/linux/types.h */ > > +#define __EMU10K1_DECLARE_BITMAP(name,bits) \ > > + unsigned long name[__EMU10K1_BITS_TO_LONGS(bits)] >=20 > This is way too complicated just for a few expansion of the aligned > size arrays, IMO. Rather simplify it like below with a comment: >=20 > /* the array must be aligned to unsigned long (i.e. 4 or 8 bytes) */ > #define __EMU10K1_DECLARE_BITMAP(name) \ > unsigned long name[(bits) / sizeof(unsigned long)] Crap, of course, it must be multiplied with 8. /* the array must be aligned to unsigned long (i.e. 32 or 64) */ #define __EMU10K1_DECLARE_BITMAP(name) \ unsigned long name[(bits) / (sizeof(unsigned long) * 8)] Takashi