Merge pull request #13944 from benpicco/drivers/ethos-luid

drivers/ethos: use luid_get_eui48()
This commit is contained in:
Kaspar Schleiser 2020-05-12 10:47:06 +02:00 committed by GitHub
commit 4042fa2ddf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -22,11 +22,11 @@
#include <errno.h> #include <errno.h>
#include <string.h> #include <string.h>
#include "random.h"
#include "ethos.h" #include "ethos.h"
#include "periph/uart.h" #include "periph/uart.h"
#include "tsrb.h" #include "tsrb.h"
#include "irq.h" #include "irq.h"
#include "luid.h"
#include "net/netdev.h" #include "net/netdev.h"
#include "net/netdev/eth.h" #include "net/netdev/eth.h"
@ -67,13 +67,7 @@ void ethos_setup(ethos_t *dev, const ethos_params_t *params)
tsrb_init(&dev->inbuf, params->buf, params->bufsize); tsrb_init(&dev->inbuf, params->buf, params->bufsize);
mutex_init(&dev->out_mutex); mutex_init(&dev->out_mutex);
uint32_t a = random_uint32(); luid_get_eui48((eui48_t *) &dev->mac_addr);
memcpy(dev->mac_addr, (char*)&a, 4);
a = random_uint32();
memcpy(dev->mac_addr+4, (char*)&a, 2);
dev->mac_addr[0] &= (0x2); /* unset globally unique bit */
dev->mac_addr[0] &= ~(0x1); /* set unicast bit*/
uart_init(params->uart, params->baudrate, ethos_isr, (void*)dev); uart_init(params->uart, params->baudrate, ethos_isr, (void*)dev);