diff options
| author | Jes Sorensen <Jes.Sorensen@redhat.com> | 2010-10-26 10:39:24 +0200 |
|---|---|---|
| committer | Blue Swirl <blauwirbel@gmail.com> | 2010-10-30 08:02:38 +0000 |
| commit | ff753bb9a60780e7af93288ac55bf1277a30cff7 (patch) | |
| tree | 90cec65ff7e7d22babbf353db020bfbf40c13bfe | |
| parent | dc786bc9103801fac5b90511b0761255b4eab622 (diff) | |
Do not redefine reserved key-words TRUE/FALSE
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 <Jes.Sorensen@redhat.com>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
| -rw-r--r-- | 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 cc0bf2f9b3..cdf2d95d52 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, |