Skip to content
Snippets Groups Projects
Unverified Commit f7bf0307 authored by Koen Zandberg's avatar Koen Zandberg
Browse files

mrf24j40: read address from device

This change modifies the mrf24j40 driver to read the address directly
from the device instead of returning the netdev_ieee802154_t member
parent b291c638
No related branches found
No related tags found
No related merge requests found
...@@ -122,7 +122,8 @@ static const uint8_t RSSI_value[] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, ...@@ -122,7 +122,8 @@ static const uint8_t RSSI_value[] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
uint16_t mrf24j40_get_addr_short(mrf24j40_t *dev) uint16_t mrf24j40_get_addr_short(mrf24j40_t *dev)
{ {
return (dev->netdev.short_addr[0] << 8) | dev->netdev.short_addr[1]; return (mrf24j40_reg_read_short(dev, MRF24J40_REG_SADRL) << 8) |
mrf24j40_reg_read_short(dev, MRF24J40_REG_SADRH);
} }
void mrf24j40_set_addr_short(mrf24j40_t *dev, uint16_t addr) void mrf24j40_set_addr_short(mrf24j40_t *dev, uint16_t addr)
...@@ -147,7 +148,7 @@ uint64_t mrf24j40_get_addr_long(mrf24j40_t *dev) ...@@ -147,7 +148,7 @@ uint64_t mrf24j40_get_addr_long(mrf24j40_t *dev)
uint8_t *ap = (uint8_t *)(&addr); uint8_t *ap = (uint8_t *)(&addr);
for (int i = 0; i < 8; i++) { for (int i = 0; i < 8; i++) {
ap[i] = dev->netdev.long_addr[i]; ap[7 - i] = mrf24j40_reg_read_short(dev, (MRF24J40_REG_EADR0 + i));
} }
return addr; return addr;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment