giomba/nes-proj
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #306 from simonduq/contrib/native-conf-mac

Browse Source 
Platform native: make MAC address configurable
This commit is contained in:
George Oikonomou 2018-02-24 13:21:03 +00:00 committed by GitHub
commit ada9b317fd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
arch/platform/native/platform.c
View File

@ -111,7 +111,12 @@
static const struct select_callback *select_callback[SELECT_MAX]; static const struct select_callback *select_callback[SELECT_MAX];
static int select_max = 0; static int select_max = 0;
static uint8_t serial_id[] = {0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08}; #ifdef PLATFORM_CONF_MAC_ADDR
static uint8_t mac_addr[] = PLATFORM_CONF_MAC_ADDR;
#else /* PLATFORM_CONF_MAC_ADDR */
static uint8_t mac_addr[] = { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08 };
#endif /* PLATFORM_CONF_MAC_ADDR */
#if !NETSTACK_CONF_WITH_IPV6 #if !NETSTACK_CONF_WITH_IPV6
static uint16_t node_id = 0x0102; static uint16_t node_id = 0x0102;
#endif /* !NETSTACK_CONF_WITH_IPV6 */ #endif /* !NETSTACK_CONF_WITH_IPV6 */
@ -177,12 +182,12 @@ set_lladdr(void)
memset(&addr, 0, sizeof(linkaddr_t)); memset(&addr, 0, sizeof(linkaddr_t));
#if NETSTACK_CONF_WITH_IPV6 #if NETSTACK_CONF_WITH_IPV6
memcpy(addr.u8, serial_id, sizeof(addr.u8)); memcpy(addr.u8, mac_addr, sizeof(addr.u8));
#else #else
if(node_id == 0) { if(node_id == 0) {
int i; int i;
for(i = 0; i < sizeof(linkaddr_t); ++i) { for(i = 0; i < sizeof(linkaddr_t); ++i) {
addr.u8[i] = serial_id[7 - i]; addr.u8[i] = mac_addr[7 - i];
} }
} else { } else {
addr.u8[0] = node_id & 0xff; addr.u8[0] = node_id & 0xff;