Skip to content

Commit 4b34481

Browse files
committed
nrf: Remove the ble drv specific address struct
1 parent 5412bf6 commit 4b34481

File tree

3 files changed

+5
-14
lines changed

3 files changed

+5
-14
lines changed

ports/nrf/common-hal/bleio/Adapter.c

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,5 @@ bool common_hal_bleio_adapter_get_enabled(void) {
5151
}
5252

5353
void common_hal_bleio_adapter_get_address(bleio_address_obj_t *address) {
54-
ble_drv_addr_t drv_addr;
55-
ble_drv_address_get(&drv_addr);
56-
57-
address->type = drv_addr.addr_type;
58-
memcpy(address->value, drv_addr.addr, BLEIO_ADDRESS_BYTES);
54+
ble_drv_address_get(address);
5955
}

ports/nrf/drivers/bluetooth/ble_drv.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ uint8_t ble_drv_stack_enabled(void) {
186186
return is_enabled;
187187
}
188188

189-
void ble_drv_address_get(ble_drv_addr_t * p_addr) {
189+
void ble_drv_address_get(bleio_address_obj_t *address) {
190190
SD_TEST_OR_ENABLE();
191191

192192
ble_gap_addr_t local_ble_addr;
@@ -208,8 +208,8 @@ void ble_drv_address_get(ble_drv_addr_t * p_addr) {
208208
local_ble_addr.addr[5], local_ble_addr.addr[4], local_ble_addr.addr[3], \
209209
local_ble_addr.addr[2], local_ble_addr.addr[1], local_ble_addr.addr[0]);
210210

211-
p_addr->addr_type = local_ble_addr.addr_type;
212-
memcpy(p_addr->addr, local_ble_addr.addr, 6);
211+
address->type = local_ble_addr.addr_type;
212+
memcpy(address->value, local_ble_addr.addr, BLEIO_ADDRESS_BYTES);
213213
}
214214

215215
bool ble_drv_uuid_add_vs(uint8_t *uuid, uint8_t *idx) {

ports/nrf/drivers/bluetooth/ble_drv.h

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,6 @@
3838
#include "shared-module/bleio/Scanner.h"
3939
#include "shared-module/bleio/Service.h"
4040

41-
typedef struct {
42-
uint8_t addr[6];
43-
uint8_t addr_type;
44-
} ble_drv_addr_t;
45-
4641
typedef struct {
4742
uint8_t * p_peer_addr;
4843
uint8_t addr_type;
@@ -89,7 +84,7 @@ void ble_drv_stack_disable(void);
8984

9085
uint8_t ble_drv_stack_enabled(void);
9186

92-
void ble_drv_address_get(ble_drv_addr_t * p_addr);
87+
void ble_drv_address_get(bleio_address_obj_t *address);
9388

9489
bool ble_drv_uuid_add_vs(uint8_t * p_uuid, uint8_t * idx);
9590

0 commit comments

Comments
 (0)