diff options
| author | Claudio Takahasi <claudio.takahasi@openbossa.org> | 2014-03-24 16:25:36 -0300 |
|---|---|---|
| committer | Johan Hedberg <johan.hedberg@intel.com> | 2014-03-24 22:08:02 +0200 |
| commit | 3f03ab5766de008f008fdd7cfb8679849accc51f (patch) | |
| tree | 96059836c66a64c40bf15b0eabc2cb53391a0069 | |
| parent | 0461b9d99c896657bb0265ae2b97af5221e48259 (diff) | |
| download | bluez-3f03ab5766de008f008fdd7cfb8679849accc51f.tar.gz | |
Replace att_get_uuid16() by get_le16()
| -rw-r--r-- | attrib/att.c | 6 | ||||
| -rw-r--r-- | attrib/gatt.c | 11 | ||||
| -rw-r--r-- | attrib/gatttool.c | 3 | ||||
| -rw-r--r-- | attrib/interactive.c | 3 |
4 files changed, 15 insertions, 8 deletions
diff --git a/attrib/att.c b/attrib/att.c index c408568b6..b35349991 100644 --- a/attrib/att.c +++ b/attrib/att.c @@ -168,7 +168,7 @@ uint16_t dec_read_by_grp_req(const uint8_t *pdu, size_t len, uint16_t *start, *start = att_get_u16(&pdu[1]); *end = att_get_u16(&pdu[3]); if (len == min_len + 2) - *uuid = att_get_uuid16(&pdu[5]); + bt_uuid16_create(uuid, get_le16(&pdu[5])); else *uuid = att_get_uuid128(&pdu[5]); @@ -297,7 +297,7 @@ uint16_t dec_find_by_type_req(const uint8_t *pdu, size_t len, uint16_t *start, /* Last requested handle number (2 octets) */ *end = att_get_u16(&pdu[3]); /* 16-bit UUID to find (2 octets) */ - *uuid = att_get_uuid16(&pdu[5]); + bt_uuid16_create(uuid, get_le16(&pdu[5])); /* Attribute value to find */ *vlen = len - 7; @@ -411,7 +411,7 @@ uint16_t dec_read_by_type_req(const uint8_t *pdu, size_t len, uint16_t *start, *end = att_get_u16(&pdu[3]); if (len == min_len + 2) - *uuid = att_get_uuid16(&pdu[5]); + bt_uuid16_create(uuid, get_le16(&pdu[5])); else *uuid = att_get_uuid128(&pdu[5]); diff --git a/attrib/gatt.c b/attrib/gatt.c index 9c6dee187..0d439136b 100644 --- a/attrib/gatt.c +++ b/attrib/gatt.c @@ -246,7 +246,9 @@ static void primary_all_cb(guint8 status, const guint8 *ipdu, guint16 iplen, end = att_get_u16(&data[2]); if (list->len == 6) { - bt_uuid_t uuid16 = att_get_uuid16(&data[4]); + bt_uuid_t uuid16; + + bt_uuid16_create(&uuid16, get_le16(&data[4])); bt_uuid_to_uuid128(&uuid16, &uuid); } else if (list->len == 20) { uuid = att_get_uuid128(&data[4]); @@ -385,8 +387,9 @@ static struct gatt_included *included_from_buf(const uint8_t *buf, gsize len) if (len == 8) { bt_uuid_t uuid128; - bt_uuid_t uuid16 = att_get_uuid16(&buf[6]); + bt_uuid_t uuid16; + bt_uuid16_create(&uuid16, get_le16(&buf[6])); bt_uuid_to_uuid128(&uuid16, &uuid128); bt_uuid_to_string(&uuid128, incl->uuid, sizeof(incl->uuid)); } @@ -505,7 +508,9 @@ static void char_discovered_cb(guint8 status, const guint8 *ipdu, guint16 iplen, last = att_get_u16(value); if (list->len == 7) { - bt_uuid_t uuid16 = att_get_uuid16(&value[5]); + bt_uuid_t uuid16; + + bt_uuid16_create(&uuid16, get_le16(&value[5])); bt_uuid_to_uuid128(&uuid16, &uuid); } else uuid = att_get_uuid128(&value[5]); diff --git a/attrib/gatttool.c b/attrib/gatttool.c index 9f2ead97f..10415a86d 100644 --- a/attrib/gatttool.c +++ b/attrib/gatttool.c @@ -35,6 +35,7 @@ #include <bluetooth/hci.h> #include <bluetooth/hci_lib.h> +#include "src/shared/util.h" #include "lib/uuid.h" #include "att.h" #include "btio/btio.h" @@ -426,7 +427,7 @@ static void char_desc_cb(guint8 status, const guint8 *pdu, guint16 plen, handle = att_get_u16(value); if (format == 0x01) - uuid = att_get_uuid16(&value[2]); + bt_uuid16_create(&uuid, get_le16(&value[2])); else uuid = att_get_uuid128(&value[2]); diff --git a/attrib/interactive.c b/attrib/interactive.c index 70c091c72..38403dd62 100644 --- a/attrib/interactive.c +++ b/attrib/interactive.c @@ -38,6 +38,7 @@ #include <readline/readline.h> #include <readline/history.h> +#include "src/shared/util.h" #include "lib/uuid.h" #include "btio/btio.h" #include "att.h" @@ -295,7 +296,7 @@ static void char_desc_cb(guint8 status, const guint8 *pdu, guint16 plen, handle = att_get_u16(value); if (format == 0x01) - uuid = att_get_uuid16(&value[2]); + bt_uuid16_create(&uuid, get_le16(&value[2])); else uuid = att_get_uuid128(&value[2]); |