riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

drivers/cc110x: use uuid module for addr gen

Browse Source
This commit is contained in:
Hauke Petersen 2017-01-10 15:19:48 +01:00
parent 4105011867
commit 84246d1687
3 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/Makefile.dep
View File

@ -31,6 +31,7 @@ endif
ifneq (,$(filter cc110x,$(USEMODULE))) ifneq (,$(filter cc110x,$(USEMODULE)))
USEMODULE += ieee802154 USEMODULE += ieee802154
USEMODULE += uuid
ifneq (,$(filter gnrc_netdev_default,$(USEMODULE))) ifneq (,$(filter gnrc_netdev_default,$(USEMODULE)))
USEMODULE += gnrc_cc110x USEMODULE += gnrc_cc110x
# XXX: this can be modelled as a dependency for gnrc_netdev_default as soon # XXX: this can be modelled as a dependency for gnrc_netdev_default as soon

1
drivers/cc110x/cc110x-netdev2.c
View File

@ -29,7 +29,6 @@
#include "cc110x-interface.h" #include "cc110x-interface.h"
#include "net/eui64.h" #include "net/eui64.h"
#include "periph/cpuid.h"
#include "periph/gpio.h" #include "periph/gpio.h"
#include "net/netdev2.h" #include "net/netdev2.h"
#include "net/gnrc/nettype.h" #include "net/gnrc/nettype.h"

13
drivers/cc110x/cc110x.c
View File

@ -20,8 +20,8 @@
* @} * @}
*/ */
#include "uuid.h"
#include "board.h" #include "board.h"
#include "periph/cpuid.h"
#include "periph/gpio.h" #include "periph/gpio.h"
#include "periph/spi.h" #include "periph/spi.h"
#include "xtimer.h" #include "xtimer.h"
@ -87,14 +87,9 @@ int cc110x_setup(cc110x_t *dev, const cc110x_params_t *params)
cc110x_set_channel(dev, CC110X_DEFAULT_CHANNEL); cc110x_set_channel(dev, CC110X_DEFAULT_CHANNEL);
/* set default node id */ /* set default node id */
#if CPUID_LEN uint8_t addr;
char cpuid[CPUID_LEN]; uuid_get(&addr, 1);
cpuid_get(cpuid); cc110x_set_address(dev, addr);
for (int i = 1; i < CPUID_LEN; i++) {
cpuid[0] ^= cpuid[i];
}
cc110x_set_address(dev, (uint8_t) cpuid[0]);
#endif
LOG_INFO("cc110x: initialized with address=%u and channel=%i\n", LOG_INFO("cc110x: initialized with address=%u and channel=%i\n",
(unsigned)dev->radio_address, (unsigned)dev->radio_address,