diff options
| author | Matthew Xie <mattx@google.com> | 2014-06-28 10:58:27 -0700 |
|---|---|---|
| committer | Matthew Xie <mattx@google.com> | 2014-06-28 10:58:27 -0700 |
| commit | 4dcde90649cc51ca815a50d338a73adb408ab258 (patch) | |
| tree | c3de3a4661db326391b833172057857491c7475f /stack/gatt/gatt_attr.c | |
| parent | a7324778bb12390f4c8fead853a0eb7d9b558886 (diff) | |
| parent | b44cc59d286ad255e872c60df02e032bd8d9d75b (diff) | |
| download | android_system_bt-4dcde90649cc51ca815a50d338a73adb408ab258.tar.gz android_system_bt-4dcde90649cc51ca815a50d338a73adb408ab258.tar.bz2 android_system_bt-4dcde90649cc51ca815a50d338a73adb408ab258.zip | |
resolved conflicts for merge of b44cc59d to master
Change-Id: I74c86dd5a13d4cc0b225a4b1d516904c4382db74
Diffstat (limited to 'stack/gatt/gatt_attr.c')
| -rw-r--r-- | stack/gatt/gatt_attr.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/stack/gatt/gatt_attr.c b/stack/gatt/gatt_attr.c index 30fae3cf7..df852e387 100644 --- a/stack/gatt/gatt_attr.c +++ b/stack/gatt/gatt_attr.c @@ -191,16 +191,16 @@ static void gatt_profile_request_cback (UINT16 conn_id, UINT32 trans_id, tGATTS_ case GATTS_REQ_TYPE_WRITE_EXEC: case GATT_CMD_WRITE: ignore = TRUE; - GATT_TRACE_EVENT0("Ignore GATT_REQ_EXEC_WRITE/WRITE_CMD" ); + GATT_TRACE_EVENT("Ignore GATT_REQ_EXEC_WRITE/WRITE_CMD" ); break; case GATTS_REQ_TYPE_MTU: - GATT_TRACE_EVENT1("Get MTU exchange new mtu size: %d", p_data->mtu); + GATT_TRACE_EVENT("Get MTU exchange new mtu size: %d", p_data->mtu); ignore = TRUE; break; default: - GATT_TRACE_EVENT1("Unknown/unexpected LE GAP ATT request: 0x%02x", type); + GATT_TRACE_EVENT("Unknown/unexpected LE GAP ATT request: 0x%02x", type); break; } @@ -224,7 +224,7 @@ static void gatt_profile_connect_cback (tGATT_IF gatt_if, BD_ADDR bda, UINT16 co { UNUSED(gatt_if); - GATT_TRACE_EVENT5 ("gatt_profile_connect_cback: from %08x%04x connected:%d conn_id=%d reason = 0x%04x", + GATT_TRACE_EVENT ("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); @@ -232,7 +232,7 @@ static void gatt_profile_connect_cback (tGATT_IF gatt_if, BD_ADDR bda, UINT16 co { if (gatt_profile_clcb_alloc(conn_id, bda, transport) == NULL) { - GATT_TRACE_ERROR0 ("gatt_profile_connect_cback: no_resource"); + GATT_TRACE_ERROR ("gatt_profile_connect_cback: no_resource"); return; } } @@ -273,14 +273,14 @@ void gatt_profile_db_init (void) 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_DEBUG ("gatt_profile_db_init: handle of service changed%d", gatt_cb.handle_of_h_r ); /* start service */ status = GATTS_StartService (gatt_cb.gatt_if, service_handle, GATTP_TRANSPORT_SUPPORTED ); - GATT_TRACE_DEBUG2 ("gatt_profile_db_init: gatt_if=%d start status%d", + GATT_TRACE_DEBUG ("gatt_profile_db_init: gatt_if=%d start status%d", gatt_cb.gatt_if, status); } |