From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755124AbbJOGJK (ORCPT ); Thu, 15 Oct 2015 02:09:10 -0400 Received: from mail.kapsi.fi ([217.30.184.167]:37070 "EHLO mail.kapsi.fi" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932530AbbJOF6j (ORCPT ); Thu, 15 Oct 2015 01:58:39 -0400 From: Mikko Rapeli To: linux-kernel@vger.kernel.org Cc: mikko.rapeli@iki.fi, Jaroslav Kysela , Takashi Iwai , alsa-devel@alsa-project.org, linux-api@vger.kernel.org Subject: [PATCH v4 17/79] include/uapi/sound/emu10k1.h: added EMU10K1 version of DECLARE_BITMAP macro Date: Thu, 15 Oct 2015 07:55:55 +0200 Message-Id: <1444888618-4506-18-git-send-email-mikko.rapeli@iki.fi> X-Mailer: git-send-email 2.6.1 In-Reply-To: <1444888618-4506-1-git-send-email-mikko.rapeli@iki.fi> References: <1444888618-4506-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: 46.5.253.112 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 macro is not meant for userspace headers and thus added here as private copy for emu10k.h. Fix was suggested by Arnd Bergmann in message <2168807.4Yxh5gl11Q@wuerfel> and Takashi Iwai in message on lkml. Signed-off-by: Mikko Rapeli --- include/uapi/sound/emu10k1.h | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/include/uapi/sound/emu10k1.h b/include/uapi/sound/emu10k1.h index ec1535b..5175e16 100644 --- a/include/uapi/sound/emu10k1.h +++ b/include/uapi/sound/emu10k1.h @@ -34,6 +34,14 @@ #define EMU10K1_FX8010_PCM_COUNT 8 +/* + * Following definition is copied from linux/types.h to support compiling + * this header file in userspace since they are not generally available for + * uapi headers. + */ +#define __EMU10K1_DECLARE_BITMAP(name,bits) \ + unsigned long name[(bits) / (sizeof(unsigned long) * 8)] + /* instruction set */ #define iMAC0 0x00 /* R = A + (X * Y >> 31) ; saturation */ #define iMAC1 0x01 /* R = A + (-X * Y >> 31) ; saturation */ @@ -300,7 +308,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 +321,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.5.0 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mikko Rapeli Subject: [PATCH v4 17/79] include/uapi/sound/emu10k1.h: added EMU10K1 version of DECLARE_BITMAP macro Date: Thu, 15 Oct 2015 07:55:55 +0200 Message-ID: <1444888618-4506-18-git-send-email-mikko.rapeli@iki.fi> References: <1444888618-4506-1-git-send-email-mikko.rapeli@iki.fi> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1444888618-4506-1-git-send-email-mikko.rapeli@iki.fi> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org To: linux-kernel@vger.kernel.org Cc: mikko.rapeli@iki.fi, alsa-devel@alsa-project.org, linux-api@vger.kernel.org, Takashi Iwai List-Id: linux-api@vger.kernel.org Rml4ZXMgdXNlcnNwYWNlIGNvbXBpbGF0aW9uIGVycm9yOgoKZXJyb3I6IGV4cGVjdGVkIHNwZWNp Zmllci1xdWFsaWZpZXItbGlzdCBiZWZvcmUg4oCYREVDTEFSRV9CSVRNQVDigJkKICBERUNMQVJF X0JJVE1BUChncHJfdmFsaWQsIDB4MjAwKTsgLyogYml0bWFzayBvZiB2YWxpZCBpbml0aWFsaXpl cnMgKi8KCkRFQ0xBUkVfQklUTUFQIG1hY3JvIGlzIG5vdCBtZWFudCBmb3IgdXNlcnNwYWNlIGhl YWRlcnMgYW5kIHRodXMKYWRkZWQgaGVyZSBhcyBwcml2YXRlIGNvcHkgZm9yIGVtdTEway5oLgoK Rml4IHdhcyBzdWdnZXN0ZWQgYnkgQXJuZCBCZXJnbWFubiA8YXJuZEBhcm5kYi5kZT4gaW4gbWVz c2FnZQo8MjE2ODgwNy40WXhoNWdsMTFRQHd1ZXJmZWw+IGFuZCBUYWthc2hpIEl3YWkgPHRpd2Fp QHN1c2UuZGU+CmluIG1lc3NhZ2UgPHM1aDF0aHg4OHRrLndsLXRpd2FpQHN1c2UuZGU+IG9uIGxr bWwuCgpTaWduZWQtb2ZmLWJ5OiBNaWtrbyBSYXBlbGkgPG1pa2tvLnJhcGVsaUBpa2kuZmk+Ci0t LQogaW5jbHVkZS91YXBpL3NvdW5kL2VtdTEwazEuaCB8IDE0ICsrKysrKysrKysrLS0tCiAxIGZp bGUgY2hhbmdlZCwgMTEgaW5zZXJ0aW9ucygrKSwgMyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQg YS9pbmNsdWRlL3VhcGkvc291bmQvZW11MTBrMS5oIGIvaW5jbHVkZS91YXBpL3NvdW5kL2VtdTEw azEuaAppbmRleCBlYzE1MzViLi41MTc1ZTE2IDEwMDY0NAotLS0gYS9pbmNsdWRlL3VhcGkvc291 bmQvZW11MTBrMS5oCisrKyBiL2luY2x1ZGUvdWFwaS9zb3VuZC9lbXUxMGsxLmgKQEAgLTM0LDYg KzM0LDE0IEBACiAKICNkZWZpbmUgRU1VMTBLMV9GWDgwMTBfUENNX0NPVU5UCQk4CiAKKy8qCisg KiBGb2xsb3dpbmcgZGVmaW5pdGlvbiBpcyBjb3BpZWQgZnJvbSBsaW51eC90eXBlcy5oIHRvIHN1 cHBvcnQgY29tcGlsaW5nCisgKiB0aGlzIGhlYWRlciBmaWxlIGluIHVzZXJzcGFjZSBzaW5jZSB0 aGV5IGFyZSBub3QgZ2VuZXJhbGx5IGF2YWlsYWJsZSBmb3IKKyAqIHVhcGkgaGVhZGVycy4KKyAq LworI2RlZmluZSBfX0VNVTEwSzFfREVDTEFSRV9CSVRNQVAobmFtZSxiaXRzKSBcCisJdW5zaWdu ZWQgbG9uZyBuYW1lWyhiaXRzKSAvIChzaXplb2YodW5zaWduZWQgbG9uZykgKiA4KV0KKwogLyog aW5zdHJ1Y3Rpb24gc2V0ICovCiAjZGVmaW5lIGlNQUMwCSAweDAwCS8qIFIgPSBBICsgKFggKiBZ ID4+IDMxKSAgIDsgc2F0dXJhdGlvbiAqLwogI2RlZmluZSBpTUFDMQkgMHgwMQkvKiBSID0gQSAr ICgtWCAqIFkgPj4gMzEpICA7IHNhdHVyYXRpb24gKi8KQEAgLTMwMCw3ICszMDgsNyBAQCBzdHJ1 Y3Qgc25kX2VtdTEwazFfZng4MDEwX2NvbnRyb2xfb2xkX2dwciB7CiBzdHJ1Y3Qgc25kX2VtdTEw azFfZng4MDEwX2NvZGUgewogCWNoYXIgbmFtZVsxMjhdOwogCi0JREVDTEFSRV9CSVRNQVAoZ3By X3ZhbGlkLCAweDIwMCk7IC8qIGJpdG1hc2sgb2YgdmFsaWQgaW5pdGlhbGl6ZXJzICovCisJX19F TVUxMEsxX0RFQ0xBUkVfQklUTUFQKGdwcl92YWxpZCwgMHgyMDApOyAvKiBiaXRtYXNrIG9mIHZh bGlkIGluaXRpYWxpemVycyAqLwogCV9fdTMyIF9fdXNlciAqZ3ByX21hcDsJCS8qIGluaXRpYWxp emVycyAqLwogCiAJdW5zaWduZWQgaW50IGdwcl9hZGRfY29udHJvbF9jb3VudDsgLyogY291bnQg b2YgR1BSIGNvbnRyb2xzIHRvIGFkZC9yZXBsYWNlICovCkBAIC0zMTMsMTEgKzMyMSwxMSBAQCBz dHJ1Y3Qgc25kX2VtdTEwazFfZng4MDEwX2NvZGUgewogCXVuc2lnbmVkIGludCBncHJfbGlzdF9j b250cm9sX3RvdGFsOyAvKiB0b3RhbCBjb3VudCBvZiBHUFIgY29udHJvbHMgKi8KIAlzdHJ1Y3Qg c25kX2VtdTEwazFfZng4MDEwX2NvbnRyb2xfZ3ByIF9fdXNlciAqZ3ByX2xpc3RfY29udHJvbHM7 IC8qIGxpc3RlZCBHUFIgY29udHJvbHMgKi8KIAotCURFQ0xBUkVfQklUTUFQKHRyYW1fdmFsaWQs IDB4MTAwKTsgLyogYml0bWFzayBvZiB2YWxpZCBpbml0aWFsaXplcnMgKi8KKwlfX0VNVTEwSzFf REVDTEFSRV9CSVRNQVAodHJhbV92YWxpZCwgMHgxMDApOyAvKiBiaXRtYXNrIG9mIHZhbGlkIGlu aXRpYWxpemVycyAqLwogCV9fdTMyIF9fdXNlciAqdHJhbV9kYXRhX21hcDsJICAvKiBkYXRhIGlu aXRpYWxpemVycyAqLwogCV9fdTMyIF9fdXNlciAqdHJhbV9hZGRyX21hcDsJICAvKiBtYXAgaW5p dGlhbGl6ZXJzICovCiAKLQlERUNMQVJFX0JJVE1BUChjb2RlX3ZhbGlkLCAxMDI0KTsgLyogYml0 bWFzayBvZiB2YWxpZCBpbnN0cnVjdGlvbnMgKi8KKwlfX0VNVTEwSzFfREVDTEFSRV9CSVRNQVAo Y29kZV92YWxpZCwgMTAyNCk7IC8qIGJpdG1hc2sgb2YgdmFsaWQgaW5zdHJ1Y3Rpb25zICovCiAJ X191MzIgX191c2VyICpjb2RlOwkJICAvKiBvbmUgaW5zdHJ1Y3Rpb24gLSA2NCBiaXRzICovCiB9 OwogCi0tIAoyLjUuMAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX18KQWxzYS1kZXZlbCBtYWlsaW5nIGxpc3QKQWxzYS1kZXZlbEBhbHNhLXByb2plY3Qub3Jn Cmh0dHA6Ly9tYWlsbWFuLmFsc2EtcHJvamVjdC5vcmcvbWFpbG1hbi9saXN0aW5mby9hbHNhLWRl dmVsCg==