summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Janssen <jamuraa@chromium.org>2014-11-05 18:15:09 -0800
committerLuiz Augusto von Dentz <luiz.von.dentz@intel.com>2014-11-06 17:39:14 +0200
commitc6cd3f52e4dd505cd7f265ee783ae975065a90dc (patch)
tree0ccb0897aa05d4f5676d643f42062aa168a080d7
parent7353c6a4de4978ebc29fea6ae5f9399fb0d2aa5e (diff)
downloadbluez-c6cd3f52e4dd505cd7f265ee783ae975065a90dc.tar.gz
gattrib: Remove unused GATTRIB_ALL_EVENTS
In prep to use shared stack, this is unused and not functionally supported by bt_att.
-rw-r--r--attrib/gattrib.c3
-rw-r--r--attrib/gattrib.h1
-rw-r--r--unit/test-gattrib.c16
3 files changed, 0 insertions, 20 deletions
diff --git a/attrib/gattrib.c b/attrib/gattrib.c
index f67843534..fa51b6d49 100644
--- a/attrib/gattrib.c
+++ b/attrib/gattrib.c
@@ -391,9 +391,6 @@ static bool match_event(struct event *evt, const uint8_t *pdu, gsize len)
{
guint16 handle;
- if (evt->expected == GATTRIB_ALL_EVENTS)
- return true;
-
if (is_request(pdu[0]) && evt->expected == GATTRIB_ALL_REQS)
return true;
diff --git a/attrib/gattrib.h b/attrib/gattrib.h
index 1557b9991..2ed57c12a 100644
--- a/attrib/gattrib.h
+++ b/attrib/gattrib.h
@@ -28,7 +28,6 @@
extern "C" {
#endif
-#define GATTRIB_ALL_EVENTS 0xFF
#define GATTRIB_ALL_REQS 0xFE
#define GATTRIB_ALL_HANDLES 0x0000
diff --git a/unit/test-gattrib.c b/unit/test-gattrib.c
index 228ef5b24..109e51608 100644
--- a/unit/test-gattrib.c
+++ b/unit/test-gattrib.c
@@ -425,8 +425,6 @@ static void test_register(struct context *cxt, gconstpointer user_data)
guint reg_id;
gboolean canceled;
struct test_pdu pdus[] = {
- /* Unmatched by any (GATTRIB_ALL_EVENTS) */
- PDU_MTU_RESP,
/*
* Unmatched PDU opcode
* Unmatched handle (GATTRIB_ALL_REQS) */
@@ -461,22 +459,8 @@ static void test_register(struct context *cxt, gconstpointer user_data)
/*
* Without registering anything, should be able to ignore everything but
* an unexpected response. */
- send_test_pdus(cxt, pdus + 1);
-
- expect.expected = pdus;
- reg_id = g_attrib_register(cxt->att, GATTRIB_ALL_EVENTS,
- GATTRIB_ALL_HANDLES, notify_canary_expect,
- &expect, NULL);
-
send_test_pdus(cxt, pdus);
- canceled = g_attrib_unregister(cxt->att, reg_id);
-
- g_assert(canceled);
-
- for (current_pdu = pdus; current_pdu->valid; current_pdu++)
- g_assert(current_pdu->received);
-
if (g_test_verbose())
g_print("ALL_REQS, ALL_HANDLES\r\n");