dani/CommandStation-EX
1
0
Fork 0
mirror of https://github.com/DCC-EX/CommandStation-EX.git synced 2024-12-24 21:21:24 +01:00
Code Releases Activity

make generates MAC addr compliant with the IEEE standard by setting the Locally Administered bit and clearing the Group Adress bit

Browse Source
This commit is contained in:
Harald Barth 2021-03-14 22:15:48 +01:00
parent 25c2f06574
commit f2891ee348
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
DCCTimer.cpp
View File

@ -81,6 +81,8 @@ INTERRUPT_CALLBACK interruptHandler=0;
void DCCTimer::getSimulatedMacAddress(byte mac[6]) { void DCCTimer::getSimulatedMacAddress(byte mac[6]) {
memcpy(mac,(void *) &SIGROW.SERNUM0,6); // serial number memcpy(mac,(void *) &SIGROW.SERNUM0,6); // serial number
mac[0] &= 0xFE;
mac[0] |= 0x02;
} }
#else #else
@ -139,7 +141,12 @@ INTERRUPT_CALLBACK interruptHandler=0;
#include <avr/boot.h> #include <avr/boot.h>
void DCCTimer::getSimulatedMacAddress(byte mac[6]) { void DCCTimer::getSimulatedMacAddress(byte mac[6]) {
for (byte i=0; i<6; i++) mac[i]=boot_signature_byte_get(0x0E + i); for (byte i=0; i<6; i++) {
mac[i]=boot_signature_byte_get(0x0E + i);
}
mac[0] &= 0xFE;
mac[0] |= 0x02;
} }
#endif #endif

2
EthernetInterface.cpp
View File

@ -54,7 +54,7 @@ EthernetInterface::EthernetInterface()
DCCTimer::getSimulatedMacAddress(mac); DCCTimer::getSimulatedMacAddress(mac);
DIAG(F("\n+++++ Ethernet Setup. Simulatd mac=")); DIAG(F("\n+++++ Ethernet Setup. Simulatd mac="));
for (byte i=0;i<sizeof(mac); i++) { for (byte i=0;i<sizeof(mac); i++) {
DIAG(F("%x:"),mac[i]); DIAG(F("%s%x:"),mac[i] < 0x10 ? "0" : "", mac[i]);
} }
DIAG(F("\n")); DIAG(F("\n"));