diff options
| author | Vinayak Chettimada <vinayak.kariappa.chettimada@nordicsemi.no> | 2017-04-28 10:44:22 +0200 |
|---|---|---|
| committer | Johan Hedberg <johan.hedberg@intel.com> | 2017-04-28 16:06:25 +0300 |
| commit | 1914fc34ce2013dc12fc1b5f895d6c40e5520c0c (patch) | |
| tree | 1407d0c12eaaa8dd20fafeee57ce4cdced3e95e7 | |
| parent | a39fbf68e7096a37e8b9fcbd325c964ffcf01400 (diff) | |
Bluetooth: controller: Rename ll_address_* to ll_addr_*bluetooth
Rename ll_address_* to ll_addr_*. Also, update ll_addr_get
to return reference to stored public or random address.
Change-id: I22cb0135d2223f679c4d9321f4724f8b7de0aede
Signed-off-by: Vinayak Chettimada <vinayak.kariappa.chettimada@nordicsemi.no>
| -rw-r--r-- | subsys/bluetooth/controller/hci/hci.c | 4 | ||||
| -rw-r--r-- | subsys/bluetooth/controller/include/ll.h | 4 | ||||
| -rw-r--r-- | subsys/bluetooth/controller/ll_sw/ll.c | 22 |
3 files changed, 19 insertions, 11 deletions
diff --git a/subsys/bluetooth/controller/hci/hci.c b/subsys/bluetooth/controller/hci/hci.c index 4dd97e746..4709057d9 100644 --- a/subsys/bluetooth/controller/hci/hci.c +++ b/subsys/bluetooth/controller/hci/hci.c @@ -273,7 +273,7 @@ static void read_bd_addr(struct net_buf *buf, struct net_buf **evt) rp = cmd_complete(evt, sizeof(*rp)); rp->status = 0x00; - ll_address_get(0, &rp->bdaddr.val[0]); + ll_addr_get(0, &rp->bdaddr.val[0]); } static int info_cmd_handle(u8_t ocf, struct net_buf *cmd, @@ -345,7 +345,7 @@ static void le_set_random_address(struct net_buf *buf, struct net_buf **evt) struct bt_hci_cp_le_set_random_address *cmd = (void *)buf->data; struct bt_hci_evt_cc_status *ccst; - ll_address_set(1, &cmd->bdaddr.val[0]); + ll_addr_set(1, &cmd->bdaddr.val[0]); ccst = cmd_complete(evt, sizeof(*ccst)); ccst->status = 0x00; diff --git a/subsys/bluetooth/controller/include/ll.h b/subsys/bluetooth/controller/include/ll.h index b1bf0584d..e67f0cec1 100644 --- a/subsys/bluetooth/controller/include/ll.h +++ b/subsys/bluetooth/controller/include/ll.h @@ -10,8 +10,8 @@ int ll_init(struct k_sem *sem_rx); void ll_reset(void); -void ll_address_get(u8_t addr_type, u8_t *p_bdaddr); -void ll_address_set(u8_t addr_type, u8_t const *const p_bdaddr); +u8_t *ll_addr_get(u8_t addr_type, u8_t *p_bdaddr); +void ll_addr_set(u8_t addr_type, u8_t const *const p_bdaddr); void ll_adv_params_set(u16_t interval, u8_t adv_type, u8_t own_addr_type, u8_t direct_addr_type, u8_t const *const p_direct_addr, u8_t chl_map, diff --git a/subsys/bluetooth/controller/ll_sw/ll.c b/subsys/bluetooth/controller/ll_sw/ll.c index a529a93ef..203149056 100644 --- a/subsys/bluetooth/controller/ll_sw/ll.c +++ b/subsys/bluetooth/controller/ll_sw/ll.c @@ -246,21 +246,29 @@ int ll_init(struct k_sem *sem_rx) return 0; } -void ll_address_get(u8_t addr_type, u8_t *bdaddr) +u8_t *ll_addr_get(u8_t addr_type, u8_t *bdaddr) { if (addr_type) { - memcpy(bdaddr, &_ll_context.rnd_addr[0], BDADDR_SIZE); - } else { - memcpy(bdaddr, &_ll_context.pub_addr[0], BDADDR_SIZE); + if (bdaddr) { + memcpy(bdaddr, _ll_context.rnd_addr, BDADDR_SIZE); + } + + return _ll_context.rnd_addr; } + + if (bdaddr) { + memcpy(bdaddr, _ll_context.pub_addr, BDADDR_SIZE); + } + + return _ll_context.pub_addr; } -void ll_address_set(u8_t addr_type, u8_t const *const bdaddr) +void ll_addr_set(u8_t addr_type, u8_t const *const bdaddr) { if (addr_type) { - memcpy(&_ll_context.rnd_addr[0], bdaddr, BDADDR_SIZE); + memcpy(_ll_context.rnd_addr, bdaddr, BDADDR_SIZE); } else { - memcpy(&_ll_context.pub_addr[0], bdaddr, BDADDR_SIZE); + memcpy(_ll_context.pub_addr, bdaddr, BDADDR_SIZE); } } |