From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758401AbbE3Pty (ORCPT ); Sat, 30 May 2015 11:49:54 -0400 Received: from mail.kapsi.fi ([217.30.184.167]:51317 "EHLO mail.kapsi.fi" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756969AbbE3Pk3 (ORCPT ); Sat, 30 May 2015 11:40:29 -0400 From: Mikko Rapeli To: linux-kernel@vger.kernel.org Cc: Mikko Rapeli , Jaroslav Kysela , Takashi Iwai , alsa-devel@alsa-project.org, linux-api@vger.kernel.org Subject: [PATCH 18/98] include/uapi/sound/emu10k1.h: added EMU10K1 version of DECLARE_BITMAP etc macros Date: Sat, 30 May 2015 17:38:10 +0200 Message-Id: <1433000370-19509-19-git-send-email-mikko.rapeli@iki.fi> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1433000370-19509-1-git-send-email-mikko.rapeli@iki.fi> References: <1433000370-19509-1-git-send-email-mikko.rapeli@iki.fi> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SA-Exim-Connect-IP: 2a02:8070:d18d:d800:7c0d:5e59:fd9c:b615 X-SA-Exim-Mail-From: mikko.rapeli@iki.fi X-SA-Exim-Scanned: No (on mail.kapsi.fi); SAEximRunCond expanded to false Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Fixes userspace compilation error: error: expected specifier-qualifier-list before ‘DECLARE_BITMAP’ DECLARE_BITMAP(gpr_valid, 0x200); /* bitmask of valid initializers */ DECLARE_BITMAP etc macros are not meant for userspace headers and thus added here as private copies for emu10k.h. Fix was suggested by Arnd Bergmann in message <2168807.4Yxh5gl11Q@wuerfel> on lkml. Signed-off-by: Mikko Rapeli --- include/uapi/sound/emu10k1.h | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/include/uapi/sound/emu10k1.h b/include/uapi/sound/emu10k1.h index ec1535b..7575f0f 100644 --- a/include/uapi/sound/emu10k1.h +++ b/include/uapi/sound/emu10k1.h @@ -34,6 +34,23 @@ #define EMU10K1_FX8010_PCM_COUNT 8 +/* + * Following definitions are copies from kernel headers to support compiling + * this header file in userspace. The definitions are not generally available + * in uapi headers so the needed things are copied here wtih __EMU10k1 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 * sizeof(long)) +/* From include/linux/types.h */ +#define __EMU10K1_DECLARE_BITMAP(name,bits) \ + unsigned long name[__EMU10K1_BITS_TO_LONGS(bits)] + /* instruction set */ #define iMAC0 0x00 /* R = A + (X * Y >> 31) ; saturation */ #define iMAC1 0x01 /* R = A + (-X * Y >> 31) ; saturation */ @@ -300,7 +317,7 @@ struct snd_emu10k1_fx8010_control_old_gpr { struct snd_emu10k1_fx8010_code { char name[128]; - DECLARE_BITMAP(gpr_valid, 0x200); /* bitmask of valid initializers */ + __EMU10K1_DECLARE_BITMAP(gpr_valid, 0x200); /* bitmask of valid initializers */ __u32 __user *gpr_map; /* initializers */ unsigned int gpr_add_control_count; /* count of GPR controls to add/replace */ @@ -313,11 +330,11 @@ struct snd_emu10k1_fx8010_code { unsigned int gpr_list_control_total; /* total count of GPR controls */ struct snd_emu10k1_fx8010_control_gpr __user *gpr_list_controls; /* listed GPR controls */ - DECLARE_BITMAP(tram_valid, 0x100); /* bitmask of valid initializers */ + __EMU10K1_DECLARE_BITMAP(tram_valid, 0x100); /* bitmask of valid initializers */ __u32 __user *tram_data_map; /* data initializers */ __u32 __user *tram_addr_map; /* map initializers */ - DECLARE_BITMAP(code_valid, 1024); /* bitmask of valid instructions */ + __EMU10K1_DECLARE_BITMAP(code_valid, 1024); /* bitmask of valid instructions */ __u32 __user *code; /* one instruction - 64 bits */ }; -- 2.1.4