diff options
author | Matthew Xie <mattx@google.com> | 2012-09-18 16:19:52 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-18 16:19:53 -0700 |
commit | f80d3d045eab5f002be4b5e8a3d2d376fdf7581a (patch) | |
tree | 4a1f17241e1af019e8d3328852bf93423258a23c /stack/gatt/gatt_attr.c | |
parent | d659d3ca8cbb1edc5d1dd42ef367e9336f0f269b (diff) | |
parent | ad2d45b15aae80ba254277c3d1fa036207d8b926 (diff) | |
download | external_bluetooth_bluedroid-f80d3d045eab5f002be4b5e8a3d2d376fdf7581a.zip external_bluetooth_bluedroid-f80d3d045eab5f002be4b5e8a3d2d376fdf7581a.tar.gz external_bluetooth_bluedroid-f80d3d045eab5f002be4b5e8a3d2d376fdf7581a.tar.bz2 |
Merge "Revert "Header file and whitespace cleanups"" into jb-mr1-dev
Diffstat (limited to 'stack/gatt/gatt_attr.c')
-rw-r--r-- | stack/gatt/gatt_attr.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/stack/gatt/gatt_attr.c b/stack/gatt/gatt_attr.c index fdd2984..d8b417f 100644 --- a/stack/gatt/gatt_attr.c +++ b/stack/gatt/gatt_attr.c @@ -28,7 +28,7 @@ static void gatt_profile_request_cback (UINT16 conn_id, UINT32 trans_id, UINT8 op_code, tGATTS_DATA *p_data); static void gatt_profile_connect_cback (tGATT_IF gatt_if, BD_ADDR bda, UINT16 conn_id, BOOLEAN connected, tGATT_DISCONN_REASON reason); -static tGATT_CBACK gatt_profile_cback = +static tGATT_CBACK gatt_profile_cback = { gatt_profile_connect_cback, NULL, @@ -144,14 +144,14 @@ BOOLEAN gatt_profile_clcb_dealloc (UINT16 conn_id) ** ** Function gatt_profile_request_cback ** -** Description GATT profile attribute access request callback. +** Description GATT profile attribute access request callback. ** ** Returns void. ** *******************************************************************************/ -static void gatt_profile_request_cback (UINT16 conn_id, UINT32 trans_id, tGATTS_REQ_TYPE type, +static void gatt_profile_request_cback (UINT16 conn_id, UINT32 trans_id, tGATTS_REQ_TYPE type, tGATTS_DATA *p_data) -{ +{ UINT8 status = GATT_INVALID_PDU; tGATTS_RSP rsp_msg ; BOOLEAN ignore = FALSE; @@ -165,7 +165,7 @@ static void gatt_profile_request_cback (UINT16 conn_id, UINT32 trans_id, tGATTS_ break; case GATTS_REQ_TYPE_WRITE: - status = GATT_WRITE_NOT_PERMIT; + status = GATT_WRITE_NOT_PERMIT; break; case GATTS_REQ_TYPE_WRITE_EXEC: @@ -198,11 +198,11 @@ static void gatt_profile_request_cback (UINT16 conn_id, UINT32 trans_id, tGATTS_ ** Returns void ** *******************************************************************************/ -static void gatt_profile_connect_cback (tGATT_IF gatt_if, BD_ADDR bda, UINT16 conn_id, +static void gatt_profile_connect_cback (tGATT_IF gatt_if, BD_ADDR bda, UINT16 conn_id, BOOLEAN connected, tGATT_DISCONN_REASON reason) { - GATT_TRACE_EVENT5 ("gatt_profile_connect_cback: from %08x%04x connected:%d conn_id=%d reason = 0x%04x", - (bda[0]<<24)+(bda[1]<<16)+(bda[2]<<8)+bda[3], + GATT_TRACE_EVENT5 ("gatt_profile_connect_cback: from %08x%04x connected:%d conn_id=%d reason = 0x%04x", + (bda[0]<<24)+(bda[1]<<16)+(bda[2]<<8)+bda[3], (bda[4]<<8)+bda[5], connected, conn_id, reason); if (connected) @@ -243,21 +243,21 @@ void gatt_profile_db_init (void) GATT_StartIf(gatt_cb.gatt_if); service_handle = GATTS_CreateService (gatt_cb.gatt_if , &uuid, 0, GATTP_MAX_ATTR_NUM, TRUE); - /* add Service Changed characteristic + /* add Service Changed characteristic */ - uuid.uu.uuid16 = gatt_cb.gattp_attr.uuid = GATT_UUID_GATT_SRV_CHGD; + uuid.uu.uuid16 = gatt_cb.gattp_attr.uuid = GATT_UUID_GATT_SRV_CHGD; gatt_cb.gattp_attr.service_change = 0; - gatt_cb.gattp_attr.handle = + gatt_cb.gattp_attr.handle = gatt_cb.handle_of_h_r = GATTS_AddCharacteristic(service_handle, &uuid, 0, GATT_CHAR_PROP_BIT_INDICATE); - GATT_TRACE_DEBUG1 ("gatt_profile_db_init: handle of service changed%d", + GATT_TRACE_DEBUG1 ("gatt_profile_db_init: handle of service changed%d", gatt_cb.handle_of_h_r ); - /* start service + /* start service */ status = GATTS_StartService (gatt_cb.gatt_if, service_handle, GATT_TRANSPORT_LE_BR_EDR); - GATT_TRACE_DEBUG2 ("gatt_profile_db_init: gatt_if=%d start status%d", + GATT_TRACE_DEBUG2 ("gatt_profile_db_init: gatt_if=%d start status%d", gatt_cb.gatt_if, status); } |