This closes #160. Merge remote-tracking branch 'andrzej-kaczmarek/nimble/uuid' into develop
* andrzej-kaczmarek/nimble/uuid: nimble: Refactor UUID handling (ATT/GATT) Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/commit/0266b224 Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/0266b224 Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/0266b224 Branch: refs/heads/develop Commit: 0266b224925bbf37059900baff63b7f7d1557c81 Parents: 38d5ca8 b1c14f3 Author: Christopher Collins <[email protected]> Authored: Wed Jan 18 12:22:48 2017 -0800 Committer: Christopher Collins <[email protected]> Committed: Wed Jan 18 12:22:48 2017 -0800 ---------------------------------------------------------------------- apps/blecent/src/blecent.h | 12 +- apps/blecent/src/main.c | 14 +- apps/blecent/src/misc.c | 26 +- apps/blecent/src/peer.c | 20 +- apps/bleprph/src/gatt_svr.c | 66 ++--- apps/bleprph_oic/src/gatt_svr.c | 79 +++--- apps/bleprph_oic/src/main.c | 3 +- apps/bletiny/src/bletiny.h | 10 +- apps/bletiny/src/cmd.c | 24 +- apps/bletiny/src/gatt_svr.c | 150 +++++------- apps/bletiny/src/main.c | 16 +- apps/bletiny/src/misc.c | 20 +- apps/bletiny/src/parse.c | 27 ++- apps/bleuart/src/main.c | 2 +- mgmt/newtmgr/transport/ble/src/newtmgr_ble.c | 18 +- net/nimble/host/include/host/ble_gatt.h | 39 +-- net/nimble/host/include/host/ble_uuid.h | 92 +++++-- net/nimble/host/profiles/lls/src/ble_svc_lls.c | 4 +- net/nimble/host/services/ans/src/ble_svc_ans.c | 14 +- .../services/bleuart/include/bleuart/bleuart.h | 2 +- net/nimble/host/services/bleuart/src/bleuart.c | 28 +-- net/nimble/host/services/gap/src/ble_svc_gap.c | 16 +- .../host/services/gatt/src/ble_svc_gatt.c | 4 +- net/nimble/host/services/ias/src/ble_svc_ias.c | 4 +- net/nimble/host/services/lls/src/ble_svc_lls.c | 4 +- net/nimble/host/services/tps/src/ble_svc_tps.c | 4 +- net/nimble/host/src/ble_att_clt.c | 14 +- net/nimble/host/src/ble_att_priv.h | 16 +- net/nimble/host/src/ble_att_svr.c | 199 ++++++--------- net/nimble/host/src/ble_gattc.c | 146 ++++------- net/nimble/host/src/ble_gatts.c | 138 +++++------ net/nimble/host/src/ble_uuid.c | 240 ++++++++++++------- net/nimble/host/src/ble_uuid_priv.h | 9 +- net/nimble/host/test/src/ble_att_svr_test.c | 169 +++++++------ net/nimble/host/test/src/ble_gatt_conn_test.c | 16 +- net/nimble/host/test/src/ble_gatt_disc_c_test.c | 150 ++++++------ net/nimble/host/test/src/ble_gatt_disc_d_test.c | 74 +++--- net/nimble/host/test/src/ble_gatt_disc_s_test.c | 119 ++++----- net/nimble/host/test/src/ble_gatt_find_s_test.c | 56 ++--- net/nimble/host/test/src/ble_gatt_read_test.c | 12 +- .../host/test/src/ble_gatts_notify_test.c | 16 +- net/nimble/host/test/src/ble_gatts_read_test.c | 8 +- net/nimble/host/test/src/ble_gatts_reg_test.c | 190 +++++++-------- net/nimble/host/test/src/ble_hs_test_util.c | 76 ++---- net/nimble/host/test/src/ble_hs_test_util.h | 10 +- net/nimble/host/test/src/ble_uuid_test.c | 93 ++++--- net/oic/include/oic/oc_gatt.h | 8 +- net/oic/src/port/mynewt/ble_adaptor.c | 26 +- 48 files changed, 1165 insertions(+), 1318 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/0266b224/apps/bletiny/src/gatt_svr.c ---------------------------------------------------------------------- diff --cc apps/bletiny/src/gatt_svr.c index cce15e4,354ff9f..936546f --- a/apps/bletiny/src/gatt_svr.c +++ b/apps/bletiny/src/gatt_svr.c @@@ -132,11 -128,11 +128,11 @@@ static const struct ble_gatt_svc_def ga .access_cb = gatt_svr_access_test, .flags = BLE_GATT_CHR_F_WRITE | BLE_GATT_CHR_F_RELIABLE_WRITE, }, { - .uuid128 = PTS_UUID(PTS_CHR_WRITE_NO_RSP), + .uuid = PTS_UUID_DECLARE(PTS_CHR_WRITE_NO_RSP), .access_cb = gatt_svr_access_test, - .flags = BLE_GATT_CHR_F_WRITE_NO_RSP, + .flags = BLE_GATT_CHR_F_READ | BLE_GATT_CHR_F_WRITE_NO_RSP, }, { - .uuid128 = PTS_UUID(PTS_CHR_READ_WRITE), + .uuid = PTS_UUID_DECLARE(PTS_CHR_READ_WRITE), .access_cb = gatt_svr_access_test, .flags = BLE_GATT_CHR_F_READ | BLE_GATT_CHR_F_WRITE, }, { http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/0266b224/net/nimble/host/src/ble_gatts.c ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/0266b224/net/nimble/host/test/src/ble_hs_test_util.c ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/0266b224/net/oic/src/port/mynewt/ble_adaptor.c ----------------------------------------------------------------------
