diff options
author | Michael Janssen <jamuraa@chromium.org> | 2014-11-13 09:39:15 -0800 |
---|---|---|
committer | Luiz Augusto von Dentz <luiz.von.dentz@intel.com> | 2014-11-14 13:00:09 +0200 |
commit | 6c20c1df858ede48515bd72315007b68b18eac57 (patch) | |
tree | 554c7f4583f4afe8413b7471977cfa4d4d65e504 /android/tester-gatt.c | |
parent | e6b93dd2f576e210c15b6d74209a8ef91853663f (diff) | |
download | bluez-6c20c1df858ede48515bd72315007b68b18eac57.tar.gz |
android/tester-gatt: deduplicate read-by-type PDUs
These read-by-type PDUs are repeated multiple times throughout the code.
Diffstat (limited to 'android/tester-gatt.c')
-rw-r--r-- | android/tester-gatt.c | 63 |
1 files changed, 18 insertions, 45 deletions
diff --git a/android/tester-gatt.c b/android/tester-gatt.c index b88eeff23..ebfa005c7 100644 --- a/android/tester-gatt.c +++ b/android/tester-gatt.c @@ -836,7 +836,13 @@ static struct send_resp_data send_resp_data_2 = { raw_pdu(0x10, 0x01, 0x00, 0xff, 0xff, 0x00, 0x28), \ raw_pdu(0x11, 0x06, 0x01, 0x00, 0x10, 0x00, 0x00, 0x18), \ raw_pdu(0x10, 0x11, 0x00, 0xff, 0xff, 0x00, 0x28), \ - raw_pdu(0x01, 0x10, 0x11, 0x00, 0x0a) \ + raw_pdu(0x01, 0x10, 0x11, 0x00, 0x0a) + +#define READ_BY_TYPE_SINGLE_CHARACTERISTIC_PDUS \ + raw_pdu(0x08, 0x01, 0x00, 0x10, 0x00, 0x03, 0x28), \ + raw_pdu(0x09, 0x07, 0x02, 0x00, 0x04, 0x00, 0x00, 0x19, 0x00), \ + raw_pdu(0x08, 0x03, 0x00, 0x10, 0x00, 0x03, 0x28), \ + raw_pdu(0x01, 0x08, 0x03, 0x00, 0x0a) static struct iovec search_service[] = { SEARCH_SERVICE_SINGLE_SUCCESS_PDUS, @@ -861,19 +867,13 @@ static struct iovec search_service_3[] = { static struct iovec get_characteristic_1[] = { SEARCH_SERVICE_SINGLE_SUCCESS_PDUS, - raw_pdu(0x08, 0x01, 0x00, 0x10, 0x00, 0x03, 0x28), - raw_pdu(0x09, 0x07, 0x02, 0x00, 0x04, 0x00, 0x00, 0x19, 0x00), - raw_pdu(0x08, 0x03, 0x00, 0x10, 0x00, 0x03, 0x28), - raw_pdu(0x01, 0x08, 0x03, 0x00, 0x0a), + READ_BY_TYPE_SINGLE_CHARACTERISTIC_PDUS, end_pdu }; static struct iovec get_descriptor_1[] = { SEARCH_SERVICE_SINGLE_SUCCESS_PDUS, - raw_pdu(0x08, 0x01, 0x00, 0x10, 0x00, 0x03, 0x28), - raw_pdu(0x09, 0x07, 0x02, 0x00, 0x04, 0x00, 0x00, 0x19, 0x00), - raw_pdu(0x08, 0x03, 0x00, 0x10, 0x00, 0x03, 0x28), - raw_pdu(0x01, 0x08, 0x03, 0x00, 0x0a), + READ_BY_TYPE_SINGLE_CHARACTERISTIC_PDUS, raw_pdu(0x04, 0x01, 0x00, 0x10, 0x00), raw_pdu(0x05, 0x01, 0x04, 0x00, 0x00, 0x29), raw_pdu(0x04, 0x05, 0x00, 0x10, 0x00), @@ -883,10 +883,7 @@ static struct iovec get_descriptor_1[] = { static struct iovec get_descriptor_2[] = { SEARCH_SERVICE_SINGLE_SUCCESS_PDUS, - raw_pdu(0x08, 0x01, 0x00, 0x10, 0x00, 0x03, 0x28), - raw_pdu(0x09, 0x07, 0x02, 0x00, 0x04, 0x00, 0x00, 0x19, 0x00), - raw_pdu(0x08, 0x03, 0x00, 0x10, 0x00, 0x03, 0x28), - raw_pdu(0x01, 0x08, 0x03, 0x00, 0x0a), + READ_BY_TYPE_SINGLE_CHARACTERISTIC_PDUS, raw_pdu(0x04, 0x01, 0x00, 0x10, 0x00), raw_pdu(0x05, 0x01, 0x04, 0x00, 0x00, 0x29, 0x05, 0x00, 0x01, 0x29), raw_pdu(0x04, 0x06, 0x00, 0x10, 0x00), @@ -896,10 +893,7 @@ static struct iovec get_descriptor_2[] = { static struct iovec get_descriptor_3[] = { SEARCH_SERVICE_SINGLE_SUCCESS_PDUS, - raw_pdu(0x08, 0x01, 0x00, 0x10, 0x00, 0x03, 0x28), - raw_pdu(0x09, 0x07, 0x02, 0x00, 0x04, 0x00, 0x00, 0x19, 0x00), - raw_pdu(0x08, 0x03, 0x00, 0x10, 0x00, 0x03, 0x28), - raw_pdu(0x01, 0x08, 0x03, 0x00, 0x0a), + READ_BY_TYPE_SINGLE_CHARACTERISTIC_PDUS, raw_pdu(0x04, 0x01, 0x00, 0x10, 0x00), raw_pdu(0x01, 0x04, 0x01, 0x00, 0x0a), end_pdu @@ -957,10 +951,7 @@ static struct iovec read_characteristic_2[] = { static struct iovec read_descriptor_1[] = { SEARCH_SERVICE_SINGLE_SUCCESS_PDUS, - raw_pdu(0x08, 0x01, 0x00, 0x10, 0x00, 0x03, 0x28), - raw_pdu(0x09, 0x07, 0x02, 0x00, 0x04, 0x00, 0x00, 0x19, 0x00), - raw_pdu(0x08, 0x03, 0x00, 0x10, 0x00, 0x03, 0x28), - raw_pdu(0x01, 0x08, 0x03, 0x00, 0x0a), + READ_BY_TYPE_SINGLE_CHARACTERISTIC_PDUS, raw_pdu(0x04, 0x01, 0x00, 0x10, 0x00), raw_pdu(0x05, 0x01, 0x04, 0x00, 0x00, 0x29), raw_pdu(0x04, 0x05, 0x00, 0x10, 0x00), @@ -972,10 +963,7 @@ static struct iovec read_descriptor_1[] = { static struct iovec read_descriptor_2[] = { SEARCH_SERVICE_SINGLE_SUCCESS_PDUS, - raw_pdu(0x08, 0x01, 0x00, 0x10, 0x00, 0x03, 0x28), - raw_pdu(0x09, 0x07, 0x02, 0x00, 0x04, 0x00, 0x00, 0x19, 0x00), - raw_pdu(0x08, 0x03, 0x00, 0x10, 0x00, 0x03, 0x28), - raw_pdu(0x01, 0x08, 0x03, 0x00, 0x0a), + READ_BY_TYPE_SINGLE_CHARACTERISTIC_PDUS, raw_pdu(0x04, 0x01, 0x00, 0x10, 0x00), raw_pdu(0x05, 0x01, 0x04, 0x00, 0x00, 0x29), raw_pdu(0x04, 0x05, 0x00, 0x10, 0x00), @@ -1019,10 +1007,7 @@ static struct iovec write_characteristic_3[] = { static struct iovec write_descriptor_1[] = { SEARCH_SERVICE_SINGLE_SUCCESS_PDUS, - raw_pdu(0x08, 0x01, 0x00, 0x10, 0x00, 0x03, 0x28), - raw_pdu(0x09, 0x07, 0x02, 0x00, 0x04, 0x00, 0x00, 0x19, 0x00), - raw_pdu(0x08, 0x03, 0x00, 0x10, 0x00, 0x03, 0x28), - raw_pdu(0x01, 0x08, 0x03, 0x00, 0x0a), + READ_BY_TYPE_SINGLE_CHARACTERISTIC_PDUS, raw_pdu(0x04, 0x01, 0x00, 0x10, 0x00), raw_pdu(0x05, 0x01, 0x04, 0x00, 0x00, 0x29), raw_pdu(0x04, 0x05, 0x00, 0x10, 0x00), @@ -1034,10 +1019,7 @@ static struct iovec write_descriptor_1[] = { static struct iovec write_descriptor_2[] = { SEARCH_SERVICE_SINGLE_SUCCESS_PDUS, - raw_pdu(0x08, 0x01, 0x00, 0x10, 0x00, 0x03, 0x28), - raw_pdu(0x09, 0x07, 0x02, 0x00, 0x04, 0x00, 0x00, 0x19, 0x00), - raw_pdu(0x08, 0x03, 0x00, 0x10, 0x00, 0x03, 0x28), - raw_pdu(0x01, 0x08, 0x03, 0x00, 0x0a), + READ_BY_TYPE_SINGLE_CHARACTERISTIC_PDUS, raw_pdu(0x04, 0x01, 0x00, 0x10, 0x00), raw_pdu(0x05, 0x01, 0x04, 0x00, 0x00, 0x29), raw_pdu(0x04, 0x05, 0x00, 0x10, 0x00), @@ -1049,19 +1031,13 @@ static struct iovec write_descriptor_2[] = { static struct iovec notification_1[] = { SEARCH_SERVICE_SINGLE_SUCCESS_PDUS, - raw_pdu(0x08, 0x01, 0x00, 0x10, 0x00, 0x03, 0x28), - raw_pdu(0x09, 0x07, 0x02, 0x00, 0x04, 0x00, 0x00, 0x19, 0x00), - raw_pdu(0x08, 0x03, 0x00, 0x10, 0x00, 0x03, 0x28), - raw_pdu(0x01, 0x08, 0x03, 0x00, 0x0a), + READ_BY_TYPE_SINGLE_CHARACTERISTIC_PDUS, end_pdu }; static struct iovec notification_2[] = { SEARCH_SERVICE_SINGLE_SUCCESS_PDUS, - raw_pdu(0x08, 0x01, 0x00, 0x10, 0x00, 0x03, 0x28), - raw_pdu(0x09, 0x07, 0x02, 0x00, 0x04, 0x00, 0x00, 0x19, 0x00), - raw_pdu(0x08, 0x03, 0x00, 0x10, 0x00, 0x03, 0x28), - raw_pdu(0x01, 0x08, 0x03, 0x00, 0x0a), + READ_BY_TYPE_SINGLE_CHARACTERISTIC_PDUS, raw_pdu(0x1d, 0x03, 0x00, 0x01), raw_pdu(0x1e), end_pdu @@ -1069,10 +1045,7 @@ static struct iovec notification_2[] = { static struct iovec notification_3[] = { SEARCH_SERVICE_SINGLE_SUCCESS_PDUS, - raw_pdu(0x08, 0x01, 0x00, 0x10, 0x00, 0x03, 0x28), - raw_pdu(0x09, 0x07, 0x02, 0x00, 0x04, 0x00, 0x00, 0x19, 0x00), - raw_pdu(0x08, 0x03, 0x00, 0x10, 0x00, 0x03, 0x28), - raw_pdu(0x01, 0x08, 0x03, 0x00, 0x0a), + READ_BY_TYPE_SINGLE_CHARACTERISTIC_PDUS, raw_pdu(0x1b, 0x03, 0x00, 0x01), end_pdu }; |