OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

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>
This commit is contained in:
Jes Sorensen 2010-10-26 10:39:24 +02:00 committed by Blue Swirl
parent dc786bc910
commit ff753bb9a6
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
hw/bt-sdp.c
View File

@ -786,11 +786,11 @@ static void sdp_service_db_build(struct bt_l2cap_sdp_state_s *sdp,
.type = SDP_DTYPE_UUID | SDP_DSIZE_16, \ .type = SDP_DTYPE_UUID | SDP_DSIZE_16, \
.value.uint = val, \ .value.uint = val, \
}, },
#define TRUE { \ #define SDP_TRUE { \
.type = SDP_DTYPE_BOOL | SDP_DSIZE_1, \ .type = SDP_DTYPE_BOOL | SDP_DSIZE_1, \
.value.uint = 1, \ .value.uint = 1, \
}, },
#define FALSE { \ #define SDP_FALSE { \
.type = SDP_DTYPE_BOOL | SDP_DSIZE_1, \ .type = SDP_DTYPE_BOOL | SDP_DSIZE_1, \
.value.uint = 0, \ .value.uint = 0, \
}, },
@ -842,8 +842,8 @@ SERVICE(hid,
/* TODO: extract from l2cap_device->device.class[0] */ /* TODO: extract from l2cap_device->device.class[0] */
ATTRIBUTE(DEVICE_SUBCLASS, UINT8(0x40)) ATTRIBUTE(DEVICE_SUBCLASS, UINT8(0x40))
ATTRIBUTE(COUNTRY_CODE, UINT8(0x15)) ATTRIBUTE(COUNTRY_CODE, UINT8(0x15))
ATTRIBUTE(VIRTUAL_CABLE, TRUE) ATTRIBUTE(VIRTUAL_CABLE, SDP_TRUE)
ATTRIBUTE(RECONNECT_INITIATE, FALSE) ATTRIBUTE(RECONNECT_INITIATE, SDP_FALSE)
/* TODO: extract from hid->usbdev->report_desc */ /* TODO: extract from hid->usbdev->report_desc */
ATTRIBUTE(DESCRIPTOR_LIST, LIST( ATTRIBUTE(DESCRIPTOR_LIST, LIST(
LIST(UINT8(0x22) ARRAY( LIST(UINT8(0x22) ARRAY(
@ -883,12 +883,12 @@ SERVICE(hid,
ATTRIBUTE(LANG_ID_BASE_LIST, LIST( ATTRIBUTE(LANG_ID_BASE_LIST, LIST(
LIST(UINT16(0x0409) UINT16(0x0100)) LIST(UINT16(0x0409) UINT16(0x0100))
)) ))
ATTRIBUTE(SDP_DISABLE, FALSE) ATTRIBUTE(SDP_DISABLE, SDP_FALSE)
ATTRIBUTE(BATTERY_POWER, TRUE) ATTRIBUTE(BATTERY_POWER, SDP_TRUE)
ATTRIBUTE(REMOTE_WAKEUP, TRUE) ATTRIBUTE(REMOTE_WAKEUP, SDP_TRUE)
ATTRIBUTE(BOOT_DEVICE, TRUE) /* XXX: untested */ ATTRIBUTE(BOOT_DEVICE, SDP_TRUE) /* XXX: untested */
ATTRIBUTE(SUPERVISION_TIMEOUT, UINT16(0x0c80)) ATTRIBUTE(SUPERVISION_TIMEOUT, UINT16(0x0c80))
ATTRIBUTE(NORMALLY_CONNECTABLE, TRUE) ATTRIBUTE(NORMALLY_CONNECTABLE, SDP_TRUE)
ATTRIBUTE(PROFILE_VERSION, UINT16(0x0100)) ATTRIBUTE(PROFILE_VERSION, UINT16(0x0100))
) )
@ -936,7 +936,7 @@ SERVICE(pnp,
/* Profile specific */ /* Profile specific */
ATTRIBUTE(SPECIFICATION_ID, UINT16(0x0100)) ATTRIBUTE(SPECIFICATION_ID, UINT16(0x0100))
ATTRIBUTE(VERSION, 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, static int bt_l2cap_sdp_new_ch(struct bt_l2cap_device_s *dev,