From patchwork Mon Oct 18 08:15:51 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jes Sorensen X-Patchwork-Id: 68139 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 4A877B70EF for ; Mon, 18 Oct 2010 19:26:42 +1100 (EST) Received: from localhost ([127.0.0.1]:43995 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1P7l3H-0007x9-A9 for incoming@patchwork.ozlabs.org; Mon, 18 Oct 2010 04:26:39 -0400 Received: from [140.186.70.92] (port=55299 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1P7kt8-0003xp-PI for qemu-devel@nongnu.org; Mon, 18 Oct 2010 04:16:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1P7kt6-0000wm-DD for qemu-devel@nongnu.org; Mon, 18 Oct 2010 04:16:10 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38848) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1P7kt6-0000wd-6S for qemu-devel@nongnu.org; Mon, 18 Oct 2010 04:16:08 -0400 Received: from int-mx08.intmail.prod.int.phx2.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o9I8G6PG022184 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 18 Oct 2010 04:16:07 -0400 Received: from localhost6.localdomain6 (ovpn-113-37.phx2.redhat.com [10.3.113.37]) by int-mx08.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o9I8FuO6012414; Mon, 18 Oct 2010 04:16:05 -0400 From: Jes.Sorensen@redhat.com To: qemu-devel@nongnu.org Date: Mon, 18 Oct 2010 10:15:51 +0200 Message-Id: <1287389754-985-7-git-send-email-Jes.Sorensen@redhat.com> In-Reply-To: <1287389754-985-1-git-send-email-Jes.Sorensen@redhat.com> References: <1287389754-985-1-git-send-email-Jes.Sorensen@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.21 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: blauwirbel@gmail.com, pbonzini@redhat.com Subject: [Qemu-devel] [PATCH 6/9] Do not redefine reserved key-words TRUE/FALSE X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Jes Sorensen TRUE/FALSE are generally reserved keywords and shouldn't be defined in a driver like this. Rename the macros to SDP_TRUE and SDP_FALSE respectively. Signed-off-by: Jes Sorensen --- hw/bt-sdp.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/hw/bt-sdp.c b/hw/bt-sdp.c index cc0bf2f..cdf2d95 100644 --- a/hw/bt-sdp.c +++ b/hw/bt-sdp.c @@ -786,11 +786,11 @@ static void sdp_service_db_build(struct bt_l2cap_sdp_state_s *sdp, .type = SDP_DTYPE_UUID | SDP_DSIZE_16, \ .value.uint = val, \ }, -#define TRUE { \ +#define SDP_TRUE { \ .type = SDP_DTYPE_BOOL | SDP_DSIZE_1, \ .value.uint = 1, \ }, -#define FALSE { \ +#define SDP_FALSE { \ .type = SDP_DTYPE_BOOL | SDP_DSIZE_1, \ .value.uint = 0, \ }, @@ -842,8 +842,8 @@ SERVICE(hid, /* TODO: extract from l2cap_device->device.class[0] */ ATTRIBUTE(DEVICE_SUBCLASS, UINT8(0x40)) ATTRIBUTE(COUNTRY_CODE, UINT8(0x15)) - ATTRIBUTE(VIRTUAL_CABLE, TRUE) - ATTRIBUTE(RECONNECT_INITIATE, FALSE) + ATTRIBUTE(VIRTUAL_CABLE, SDP_TRUE) + ATTRIBUTE(RECONNECT_INITIATE, SDP_FALSE) /* TODO: extract from hid->usbdev->report_desc */ ATTRIBUTE(DESCRIPTOR_LIST, LIST( LIST(UINT8(0x22) ARRAY( @@ -883,12 +883,12 @@ SERVICE(hid, ATTRIBUTE(LANG_ID_BASE_LIST, LIST( LIST(UINT16(0x0409) UINT16(0x0100)) )) - ATTRIBUTE(SDP_DISABLE, FALSE) - ATTRIBUTE(BATTERY_POWER, TRUE) - ATTRIBUTE(REMOTE_WAKEUP, TRUE) - ATTRIBUTE(BOOT_DEVICE, TRUE) /* XXX: untested */ + ATTRIBUTE(SDP_DISABLE, SDP_FALSE) + ATTRIBUTE(BATTERY_POWER, SDP_TRUE) + ATTRIBUTE(REMOTE_WAKEUP, SDP_TRUE) + ATTRIBUTE(BOOT_DEVICE, SDP_TRUE) /* XXX: untested */ ATTRIBUTE(SUPERVISION_TIMEOUT, UINT16(0x0c80)) - ATTRIBUTE(NORMALLY_CONNECTABLE, TRUE) + ATTRIBUTE(NORMALLY_CONNECTABLE, SDP_TRUE) ATTRIBUTE(PROFILE_VERSION, UINT16(0x0100)) ) @@ -936,7 +936,7 @@ SERVICE(pnp, /* Profile specific */ ATTRIBUTE(SPECIFICATION_ID, UINT16(0x0100)) ATTRIBUTE(VERSION, UINT16(0x0100)) - ATTRIBUTE(PRIMARY_RECORD, TRUE) + ATTRIBUTE(PRIMARY_RECORD, SDP_TRUE) ) static int bt_l2cap_sdp_new_ch(struct bt_l2cap_device_s *dev,