Bindings: Python: Migrate to smart_holder

Updates to 3.0.1 and switches to smart_holder & native_enum.

CMakeLists.txt

@@ -195,7 +195,6 @@ set(SRC_FILES
 	communication/message/tc10statusmessage.cpp
 	communication/message/gptpstatusmessage.cpp
 	communication/message/ethernetstatusmessage.cpp
-	communication/message/macsecmessage.cpp
 	communication/message/networkmutexmessage.cpp
 	communication/message/clientidmessage.cpp
 	communication/message/transmitmessage.cpp
@@ -226,8 +225,9 @@ set(SRC_FILES
 	communication/communication.cpp
 	communication/driver.cpp
 	communication/livedata.cpp
-	communication/ringbuffer.cpp
-	communication/crc32.cpp
+	core/ringbuffer.cpp
+	core/crc32.cpp
+	core/macseccfg.cpp
 	device/extensions/flexray/extension.cpp
 	device/extensions/flexray/controller.cpp
 	device/idevicesettings.cpp
@@ -392,7 +392,7 @@ endif()
 include(FetchContent)
 FetchContent_Declare(icspb
 	GIT_REPOSITORY ${LIBICSNEO_ICSPB_REPO}
-	GIT_TAG 2881dc4239319214dbf72fd3aa0427a4aefddd42
+	GIT_TAG 48df5dd7fd0c38034f82a2f94e0eada404d5e2b9
 )
 FetchContent_MakeAvailable(icspb)
 target_link_libraries(icsneocpp PRIVATE icspb::icspb)

api/icsneocpp/event.cpp

@@ -156,6 +156,16 @@ static constexpr const char* VSA_BYTE_PARSE_FAILURE = "Failure to parse record b
 static constexpr const char* VSA_EXTENDED_MESSAGE_ERROR = "Failure to parse extended message record sequence";
 static constexpr const char* VSA_OTHER_ERROR = "Unknown error in VSA read API.";
 
+// MACSEC
+static constexpr const char* MACSEC_SECY_LIMIT = "Attempted to exceed the limit of SecY additions to this port";
+static constexpr const char* MACSEC_RULE_LIMIT = "Attempted to exceed the limit of rule additions to this port";
+static constexpr const char* MACSEC_SA_LIMIT = "Attempted to exceed the limit of SA additions to this port";
+static constexpr const char* MACSEC_INVALID_SECY_INDEX = "Attempted to access an invalid SecY index";
+static constexpr const char* MACSEC_INVALID_SA_INDEX = "Attempted to access an invalid SA index";
+static constexpr const char* MACSEC_INVALID_RULE_INDEX = "Attempted to access an invalid rule index";
+static constexpr const char* MACSEC_REKEY_NOT_ENABLED = "Attempted to set rekey SA when rekey was not enabled";
+static constexpr const char* MACSEC_NOT_SUPPORTED = "MACsec is not supported on this device";
+static constexpr const char* MACSEC_CONFIG_MISMATCH = "Attempted to configure device with a macsec configuration for a different device";
 // Servd
 static constexpr const char* SERVD_BIND_ERROR = "Error binding socket for Servd communication";
 static constexpr const char* SERVD_NONBLOCK_ERROR = "Error setting non-blocking mode for Servd socket";
@@ -371,6 +381,25 @@ const char* APIEvent::DescriptionForType(Type type) {
 		case Type::VSAOtherError:
 			return VSA_OTHER_ERROR;
 
+		// MACSEC
+		case Type::MACsecSecYLimit:
+			return MACSEC_SECY_LIMIT;
+		case Type::MACsecSaLimit:
+			return MACSEC_SA_LIMIT;
+		case Type::MACsecRuleLimit:
+			return MACSEC_RULE_LIMIT;
+		case Type::MACsecInvalidSecYIndex:
+			return MACSEC_INVALID_SECY_INDEX;
+		case Type::MACsecInvalidSaIndex:
+			return MACSEC_INVALID_SA_INDEX;
+		case Type::MACsecInvalidRuleIndex:
+			return MACSEC_INVALID_RULE_INDEX;
+		case Type::MACsecRekeyNotEnabled:
+			return MACSEC_REKEY_NOT_ENABLED;
+		case Type::MACsecNotSupported:
+			return MACSEC_NOT_SUPPORTED;
+		case Type::MACsecConfigMismatch:
+			return MACSEC_CONFIG_MISMATCH;
 		// Servd
 		case Type::ServdBindError:
 			return SERVD_BIND_ERROR;

bindings/python/CMakeLists.txt

@@ -9,7 +9,7 @@ else()
     FetchContent_Declare(
         pybind11
         GIT_REPOSITORY https://github.com/pybind/pybind11.git
-        GIT_TAG v2.13.6
+        GIT_TAG v3.0.1
     )
     FetchContent_MakeAvailable(pybind11)
 endif()
@@ -32,11 +32,11 @@ pybind11_add_module(icsneopy
     icsneopy/communication/message/gptpstatusmessage.cpp
     icsneopy/communication/message/ethernetstatusmessage.cpp
     icsneopy/communication/message/spimessage.cpp
-    icsneopy/communication/message/macsecmessage.cpp
     icsneopy/communication/message/scriptstatusmessage.cpp
     icsneopy/communication/message/ethphymessage.cpp
     icsneopy/communication/message/callback/messagecallback.cpp
     icsneopy/communication/message/filter/messagefilter.cpp
+    icsneopy/core/macseccfg.cpp
     icsneopy/flexray/flexray.cpp
     icsneopy/disk/diskdriver.cpp
     icsneopy/device/chipid.cpp

bindings/python/icsneopy/api/event.cpp

@@ -1,14 +1,15 @@
 #include <pybind11/pybind11.h>
 #include <pybind11/stl.h>
 #include <pybind11/functional.h>
+#include <pybind11/native_enum.h>
 
 #include "icsneo/api/event.h"
 
 namespace icsneo {
 
 void init_event(pybind11::module_& m) {
-	pybind11::class_<APIEvent, std::shared_ptr<APIEvent>> apiEvent(m, "APIEvent");
-	pybind11::enum_<APIEvent::Type>(apiEvent, "Type")
+	pybind11::classh<APIEvent> apiEvent(m, "APIEvent");
+	pybind11::native_enum<APIEvent::Type>(apiEvent, "Type", "enum.IntEnum")
 		.value("Any", APIEvent::Type::Any)
 		.value("InvalidNeoDevice", APIEvent::Type::InvalidNeoDevice)
 		.value("RequiredParameterNull", APIEvent::Type::RequiredParameterNull)
@@ -132,13 +133,15 @@ void init_event(pybind11::module_& m) {
 		.value("DXXErrorArg", APIEvent::Type::DXXErrorArg)
 		.value("NoErrorFound", APIEvent::Type::NoErrorFound)
 		.value("TooManyEvents", APIEvent::Type::TooManyEvents)
-		.value("Unknown", APIEvent::Type::Unknown);
+		.value("Unknown", APIEvent::Type::Unknown)
+		.finalize();
 
-		pybind11::enum_<APIEvent::Severity>(apiEvent, "Severity")
+		pybind11::native_enum<APIEvent::Severity>(apiEvent, "Severity", "enum.IntEnum")
 		.value("Any", APIEvent::Severity::Any)
 		.value("EventInfo", APIEvent::Severity::EventInfo)
 		.value("EventWarning", APIEvent::Severity::EventWarning)
-		.value("Error", APIEvent::Severity::Error);
+		.value("Error", APIEvent::Severity::Error)
+		.finalize();
 
 	apiEvent
 		.def("get_type", &APIEvent::getType)
@@ -147,7 +150,7 @@ void init_event(pybind11::module_& m) {
 		.def("describe", &APIEvent::describe)
 		.def("__repr__", &APIEvent::describe);
 
-	pybind11::class_<EventFilter, std::shared_ptr<EventFilter>>(m, "EventFilter")
+	pybind11::classh<EventFilter>(m, "EventFilter")
 		.def(pybind11::init())
 		.def(pybind11::init<APIEvent::Type>())
 		.def(pybind11::init<APIEvent::Severity>())

bindings/python/icsneopy/api/eventcallback.cpp

@@ -7,7 +7,7 @@
 namespace icsneo {
 
 void init_eventcallback(pybind11::module_& m) {
-	pybind11::class_<EventCallback>(m, "EventCallback")
+	pybind11::classh<EventCallback>(m, "EventCallback")
 		.def(pybind11::init<EventCallback::fn_eventCallback, EventFilter>())
 		.def(pybind11::init<EventCallback::fn_eventCallback>());
 }

bindings/python/icsneopy/api/eventmanager.cpp

@@ -7,7 +7,7 @@
 namespace icsneo {
 
 void init_eventmanager(pybind11::module_& m) {
-	pybind11::class_<EventManager>(m, "EventManager")
+	pybind11::classh<EventManager>(m, "EventManager")
 		.def_static("get_instance", &EventManager::GetInstance, pybind11::return_value_policy::reference)
 		.def("add_event_callback", &EventManager::addEventCallback)
 		.def("remove_event_callback", &EventManager::removeEventCallback)

bindings/python/icsneopy/api/version.cpp

@@ -9,7 +9,7 @@
 namespace icsneo {
 
 void init_version(pybind11::module_& m) {
-	pybind11::class_<neoversion_t>(m, "NeoVersion")
+	pybind11::classh<neoversion_t>(m, "NeoVersion")
 		.def_readonly("major", &neoversion_t::major)
 		.def_readonly("minor", &neoversion_t::minor)
 		.def_readonly("patch", &neoversion_t::patch)

bindings/python/icsneopy/communication/message/callback/messagecallback.cpp

@@ -7,7 +7,7 @@
 namespace icsneo {
 
 void init_messagecallback(pybind11::module_& m) {
-	pybind11::class_<MessageCallback, std::shared_ptr<MessageCallback>>(m, "MessageCallback")
+	pybind11::classh<MessageCallback>(m, "MessageCallback")
 		.def(pybind11::init<MessageCallback::fn_messageCallback, std::shared_ptr<MessageFilter>>());
 }
 

bindings/python/icsneopy/communication/message/canerrormessage.cpp

@@ -1,13 +1,14 @@
 #include <pybind11/pybind11.h>
 #include <pybind11/stl.h>
 #include <pybind11/functional.h>
+#include <pybind11/native_enum.h>
 
 #include "icsneo/communication/message/canerrormessage.h"
 
 namespace icsneo {
 
 void init_errorcodes(pybind11::module_& m) {
-	pybind11::enum_<CANErrorCode>(m, "CANErrorCode")
+	pybind11::native_enum<CANErrorCode>(m, "CANErrorCode", "enum.IntEnum")
 		.value("NoError", CANErrorCode::NoError)
 		.value("StuffError", CANErrorCode::StuffError)
 		.value("FormError", CANErrorCode::FormError)
@@ -15,12 +16,13 @@ void init_errorcodes(pybind11::module_& m) {
 		.value("Bit1Error", CANErrorCode::Bit1Error)
 		.value("Bit0Error", CANErrorCode::Bit0Error)
 		.value("CRCError", CANErrorCode::CRCError)
-		.value("NoChange", CANErrorCode::NoChange);
+		.value("NoChange", CANErrorCode::NoChange)
+		.finalize();
 }
 
 void init_canerrormessage(pybind11::module_& m) {
 	init_errorcodes(m);
-	pybind11::class_<CANErrorMessage, std::shared_ptr<CANErrorMessage>, Message>(m, "CANErrorMessage")
+	pybind11::classh<CANErrorMessage, Message>(m, "CANErrorMessage")
 		.def_readonly("network", &CANErrorMessage::network)
 		.def_readonly("transmitErrorCount", &CANErrorMessage::transmitErrorCount)
 		.def_readonly("receiveErrorCount", &CANErrorMessage::receiveErrorCount)

bindings/python/icsneopy/communication/message/canmessage.cpp

@@ -7,7 +7,7 @@
 namespace icsneo {
 
 void init_canmessage(pybind11::module_& m) {
-	pybind11::class_<CANMessage, std::shared_ptr<CANMessage>, Frame>(m, "CANMessage")
+	pybind11::classh<CANMessage, Frame>(m, "CANMessage")
 		.def(pybind11::init())
 		.def_readwrite("arbid", &CANMessage::arbid)
 		.def_readwrite("dlcOnWire", &CANMessage::dlcOnWire)

bindings/python/icsneopy/communication/message/ethernetmessage.cpp

@@ -7,11 +7,11 @@
 namespace icsneo {
 
 void init_ethernetmessage(pybind11::module_& m) {
-	pybind11::class_<MACAddress>(m, "MACAddress")
+	pybind11::classh<MACAddress>(m, "MACAddress")
 		.def("to_string", &MACAddress::toString)
 		.def("__repr__", &MACAddress::toString);
 	
-	pybind11::class_<EthernetMessage, std::shared_ptr<EthernetMessage>, Frame>(m, "EthernetMessage")
+	pybind11::classh<EthernetMessage, Frame>(m, "EthernetMessage")
 		.def(pybind11::init())
 		.def_readwrite("preemptionEnabled", &EthernetMessage::preemptionEnabled)
 		.def_readwrite("preemptionFlags", &EthernetMessage::preemptionFlags)

bindings/python/icsneopy/communication/message/ethernetstatusmessage.cpp

@@ -7,7 +7,7 @@
 namespace icsneo {
 
 void init_ethernetstatusmessage(pybind11::module_& m) {
-	pybind11::class_<EthernetStatusMessage, std::shared_ptr<EthernetStatusMessage>, Message> ethernetStatusMessage(m, "EthernetStatusMessage");
+	pybind11::classh<EthernetStatusMessage, Message> ethernetStatusMessage(m, "EthernetStatusMessage");
 
 	pybind11::enum_<EthernetStatusMessage::LinkSpeed>(ethernetStatusMessage, "LinkSpeed")
 		.value("LinkSpeedAuto", EthernetStatusMessage::LinkSpeed::LinkSpeedAuto)

bindings/python/icsneopy/communication/message/ethphymessage.cpp

@@ -7,7 +7,17 @@
 namespace icsneo {
 
 void init_ethphymessage(pybind11::module_& m) {
-	pybind11::class_<PhyMessage, std::shared_ptr<PhyMessage>>(m, "PhyMessage")
+	pybind11::classh<Clause22Message>(m, "Clause22Message")
+		.def_readwrite("phyAddr", &Clause22Message::phyAddr)
+		.def_readwrite("page", &Clause22Message::page)
+		.def_readwrite("regAddr", &Clause22Message::regAddr)
+		.def_readwrite("regVal", &Clause22Message::regVal);
+	pybind11::classh<Clause45Message>(m, "Clause45Message")
+		.def_readwrite("port", &Clause45Message::port)
+		.def_readwrite("device", &Clause45Message::device)
+		.def_readwrite("regAddr", &Clause45Message::regAddr)
+		.def_readwrite("regVal", &Clause45Message::regVal);
+	pybind11::classh<PhyMessage>(m, "PhyMessage")
 		.def(pybind11::init())
 		.def_readwrite("Enabled", &PhyMessage::Enabled)
 		.def_readwrite("WriteEnable", &PhyMessage::WriteEnable)
@@ -16,19 +26,7 @@ void init_ethphymessage(pybind11::module_& m) {
 		.def_readwrite("BusIndex", &PhyMessage::BusIndex)
 		.def_readwrite("Clause22", &PhyMessage::Clause22)
 		.def_readwrite("Clause45", &PhyMessage::Clause45);
-	pybind11::class_<Clause22Message>(m, "Clause22Message")
-		.def(pybind11::init())
-		.def_readwrite("phyAddr", &Clause22Message::phyAddr)
-		.def_readwrite("page", &Clause22Message::page)
-		.def_readwrite("regAddr", &Clause22Message::regAddr)
-		.def_readwrite("regVal", &Clause22Message::regVal);
-	pybind11::class_<Clause45Message>(m, "Clause45Message")
-		.def(pybind11::init())
-		.def_readwrite("port", &Clause45Message::port)
-		.def_readwrite("device", &Clause45Message::device)
-		.def_readwrite("regAddr", &Clause45Message::regAddr)
-		.def_readwrite("regVal", &Clause45Message::regVal);
-	pybind11::class_<EthPhyMessage, std::shared_ptr<EthPhyMessage>, Message>(m, "EthPhyMessage")
+	pybind11::classh<EthPhyMessage, Message>(m, "EthPhyMessage")
 		.def(pybind11::init())
 		.def_readwrite("messages", &EthPhyMessage::messages);
 }

bindings/python/icsneopy/communication/message/filter/messagefilter.cpp

@@ -7,7 +7,7 @@
 namespace icsneo {
 
 void init_messagefilter(pybind11::module_& m) {
-	pybind11::class_<MessageFilter, std::shared_ptr<MessageFilter>>(m, "MessageFilter")
+	pybind11::classh<MessageFilter>(m, "MessageFilter")
 		.def(pybind11::init())
 		.def(pybind11::init<Message::Type>())
 		.def(pybind11::init<Network::NetID>());

bindings/python/icsneopy/communication/message/gptpstatusmessage.cpp

@@ -7,72 +7,73 @@
 namespace icsneo {
 
 void init_gptpstatusmessage(pybind11::module_& m) {
-	pybind11::class_<GPTPStatus, std::shared_ptr<GPTPStatus>, Message> gptpStatus(m, "GPTPStatus");
+	pybind11::classh<GPTPStatus, Message> gptpStatus(m, "GPTPStatus");
 	
-	pybind11::class_<GPTPStatus::Timestamp>(gptpStatus, "Timestamp")
+	pybind11::classh<GPTPStatus::Timestamp>(gptpStatus, "Timestamp")
 		.def_readonly("seconds", &GPTPStatus::Timestamp::seconds)
 		.def_readonly("nanoseconds", &GPTPStatus::Timestamp::nanoseconds)
 		.def("to_seconds", &GPTPStatus::Timestamp::toSeconds, pybind11::call_guard<pybind11::gil_scoped_release>());
 	
-	pybind11::class_<GPTPStatus::ScaledNanoSeconds>(gptpStatus, "ScaledNanoSeconds")
-		.def_readonly("nanosecondsMSB", &GPTPStatus::ScaledNanoSeconds::nanosecondsMSB)
-		.def_readonly("nanosecondsLSB", &GPTPStatus::ScaledNanoSeconds::nanosecondsLSB)
-		.def_readonly("fractionalNanoseconds", &GPTPStatus::ScaledNanoSeconds::fractionalNanoseconds);
+	pybind11::classh<GPTPStatus::ScaledNanoSeconds>(gptpStatus, "ScaledNanoSeconds")
+		.def_readonly("nanoseconds_msb", &GPTPStatus::ScaledNanoSeconds::nanosecondsMSB)
+		.def_readonly("nanoseconds_lsb", &GPTPStatus::ScaledNanoSeconds::nanosecondsLSB)
+		.def_readonly("fractional_nanoseconds", &GPTPStatus::ScaledNanoSeconds::fractionalNanoseconds);
 	
-	pybind11::class_<GPTPStatus::PortID>(gptpStatus, "PortID")
-		.def_readonly("clockIdentity", &GPTPStatus::PortID::clockIdentity)
-		.def_readonly("portNumber", &GPTPStatus::PortID::portNumber);
+	pybind11::classh<GPTPStatus::PortID>(gptpStatus, "PortID")
+		.def_readonly("clock_identity", &GPTPStatus::PortID::clockIdentity)
+		.def_readonly("port_number", &GPTPStatus::PortID::portNumber);
 	
-	pybind11::class_<GPTPStatus::ClockQuality>(gptpStatus, "ClockQuality")
-		.def_readonly("clockClass", &GPTPStatus::ClockQuality::clockClass)
-		.def_readonly("clockAccuracy", &GPTPStatus::ClockQuality::clockAccuracy)
-		.def_readonly("offsetScaledLogVariance", &GPTPStatus::ClockQuality::offsetScaledLogVariance);
+	pybind11::classh<GPTPStatus::ClockQuality>(gptpStatus, "ClockQuality")
+		.def_readonly("clock_class", &GPTPStatus::ClockQuality::clockClass)
+		.def_readonly("clock_accuracy", &GPTPStatus::ClockQuality::clockAccuracy)
+		.def_readonly("offset_scaled_log_variance", &GPTPStatus::ClockQuality::offsetScaledLogVariance);
 	
-	pybind11::class_<GPTPStatus::SystemID>(gptpStatus, "SystemID")
+	pybind11::classh<GPTPStatus::SystemID>(gptpStatus, "SystemID")
 		.def_readonly("priority1", &GPTPStatus::SystemID::priority1)
-		.def_readonly("clockQuality", &GPTPStatus::SystemID::clockQuality)
+		.def_readonly("clock_quality", &GPTPStatus::SystemID::clockQuality)
 		.def_readonly("priority2", &GPTPStatus::SystemID::priority2)
-		.def_readonly("clockID", &GPTPStatus::SystemID::clockID);
+		.def_readonly("clock_id", &GPTPStatus::SystemID::clockID);
 	
-	pybind11::class_<GPTPStatus::PriorityVector>(gptpStatus, "PriorityVector")
-		.def_readonly("sysID", &GPTPStatus::PriorityVector::sysID)
-		.def_readonly("stepsRemoved", &GPTPStatus::PriorityVector::stepsRemoved)
-		.def_readonly("portID", &GPTPStatus::PriorityVector::portID)
-		.def_readonly("portNumber", &GPTPStatus::PriorityVector::portNumber);
+	pybind11::classh<GPTPStatus::PriorityVector>(gptpStatus, "PriorityVector")
+		.def_readonly("sys_id", &GPTPStatus::PriorityVector::sysID)
+		.def_readonly("steps_removed", &GPTPStatus::PriorityVector::stepsRemoved)
+		.def_readonly("port_id", &GPTPStatus::PriorityVector::portID)
+		.def_readonly("port_number", &GPTPStatus::PriorityVector::portNumber);
 	
-	pybind11::class_<GPTPStatus::ParentDS>(gptpStatus, "ParentDS")
-		.def_readonly("parentPortIdentity", &GPTPStatus::ParentDS::parentPortIdentity)
-		.def_readonly("cumulativeRateRatio", &GPTPStatus::ParentDS::cumulativeRateRatio)
-		.def_readonly("grandmasterIdentity", &GPTPStatus::ParentDS::grandmasterIdentity)
-		.def_readonly("gmClockQualityClockClass", &GPTPStatus::ParentDS::gmClockQualityClockClass)
-		.def_readonly("gmClockQualityClockAccuracy", &GPTPStatus::ParentDS::gmClockQualityClockAccuracy)
-		.def_readonly("gmClockQualityOffsetScaledLogVariance", &GPTPStatus::ParentDS::gmClockQualityOffsetScaledLogVariance)
-		.def_readonly("gmPriority1", &GPTPStatus::ParentDS::gmPriority1)
-		.def_readonly("gmPriority2", &GPTPStatus::ParentDS::gmPriority2);
+	pybind11::classh<GPTPStatus::ParentDS>(gptpStatus, "ParentDS")
+		.def_readonly("parent_port_identity", &GPTPStatus::ParentDS::parentPortIdentity)
+		.def_readonly("cumulative_rate_ratio", &GPTPStatus::ParentDS::cumulativeRateRatio)
+		.def_readonly("grandmaster_identity", &GPTPStatus::ParentDS::grandmasterIdentity)
+		.def_readonly("gm_clock_quality_clock_class", &GPTPStatus::ParentDS::gmClockQualityClockClass)
+		.def_readonly("gm_clock_quality_clock_accuracy", &GPTPStatus::ParentDS::gmClockQualityClockAccuracy)
+		.def_readonly("gm_clock_quality_offset_scaled_log_variance", &GPTPStatus::ParentDS::gmClockQualityOffsetScaledLogVariance)
+		.def_readonly("gm_priority1", &GPTPStatus::ParentDS::gmPriority1)
+		.def_readonly("gm_priority2", &GPTPStatus::ParentDS::gmPriority2);
 
-	pybind11::class_<GPTPStatus::CurrentDS>(gptpStatus, "CurrentDS")
-		.def_readonly("stepsRemoved", &GPTPStatus::CurrentDS::stepsRemoved)
-		.def_readonly("offsetFromMaster", &GPTPStatus::CurrentDS::offsetFromMaster)
-		.def_readonly("lastgmPhaseChange", &GPTPStatus::CurrentDS::lastgmPhaseChange)
-		.def_readonly("lastgmFreqChange", &GPTPStatus::CurrentDS::lastgmFreqChange)
-		.def_readonly("gmTimeBaseIndicator", &GPTPStatus::CurrentDS::gmTimeBaseIndicator)
-		.def_readonly("gmChangeCount", &GPTPStatus::CurrentDS::gmChangeCount)
-		.def_readonly("timeOfLastgmChangeEvent", &GPTPStatus::CurrentDS::timeOfLastgmChangeEvent)
-		.def_readonly("timeOfLastgmPhaseChangeEvent", &GPTPStatus::CurrentDS::timeOfLastgmPhaseChangeEvent)
-		.def_readonly("timeOfLastgmFreqChangeEvent", &GPTPStatus::CurrentDS::timeOfLastgmFreqChangeEvent);
+	pybind11::classh<GPTPStatus::CurrentDS>(gptpStatus, "CurrentDS")
+		.def_readonly("steps_removed", &GPTPStatus::CurrentDS::stepsRemoved)
+		.def_readonly("offset_from_master", &GPTPStatus::CurrentDS::offsetFromMaster)
+		.def_readonly("lastgm_phase_change", &GPTPStatus::CurrentDS::lastgmPhaseChange)
+		.def_readonly("lastgm_freq_change", &GPTPStatus::CurrentDS::lastgmFreqChange)
+		.def_readonly("gm_time_base_indicator", &GPTPStatus::CurrentDS::gmTimeBaseIndicator)
+		.def_readonly("gm_change_count", &GPTPStatus::CurrentDS::gmChangeCount)
+		.def_readonly("time_of_lastgm_change_event", &GPTPStatus::CurrentDS::timeOfLastgmChangeEvent)
+		.def_readonly("time_of_lastgm_phase_change_event", &GPTPStatus::CurrentDS::timeOfLastgmPhaseChangeEvent)
+		.def_readonly("time_of_lastgm_freq_change_event", &GPTPStatus::CurrentDS::timeOfLastgmFreqChangeEvent);
 
-	gptpStatus.def_readonly("currentTime", &GPTPStatus::currentTime)
-		.def_readonly("gmPriority", &GPTPStatus::gmPriority)
-		.def_readonly("msOffsetNs", &GPTPStatus::msOffsetNs)
-		.def_readonly("isSync", &GPTPStatus::isSync)
-		.def_readonly("linkStatus", &GPTPStatus::linkStatus)
-		.def_readonly("linkDelayNS", &GPTPStatus::linkDelayNS)
-		.def_readonly("selectedRole", &GPTPStatus::selectedRole)
-		.def_readonly("asCapable", &GPTPStatus::asCapable)
-		.def_readonly("isSyntonized", &GPTPStatus::isSyntonized)
-		.def_readonly("lastRXSyncTS", &GPTPStatus::lastRXSyncTS)
-		.def_readonly("currentDS", &GPTPStatus::currentDS)
-		.def_readonly("parentDS", &GPTPStatus::parentDS);
+	gptpStatus.def_readonly("current_time", &GPTPStatus::currentTime)
+		.def_readonly("gm_priority", &GPTPStatus::gmPriority)
+		.def_readonly("ms_offset_ns", &GPTPStatus::msOffsetNs)
+		.def_readonly("is_sync", &GPTPStatus::isSync)
+		.def_readonly("link_status", &GPTPStatus::linkStatus)
+		.def_readonly("link_delay_ns", &GPTPStatus::linkDelayNS)
+		.def_readonly("selected_role", &GPTPStatus::selectedRole)
+		.def_readonly("as_capable", &GPTPStatus::asCapable)
+		.def_readonly("is_syntonized", &GPTPStatus::isSyntonized)
+		.def_readonly("last_rx_sync_ts", &GPTPStatus::lastRXSyncTS)
+		.def_readonly("current_ds", &GPTPStatus::currentDS)
+		.def_readonly("parent_ds", &GPTPStatus::parentDS)
+		.def_readonly("short_format", &GPTPStatus::shortFormat);
 
 }
 

bindings/python/icsneopy/communication/message/linmessage.cpp

@@ -7,7 +7,7 @@
 namespace icsneo {
 
 void init_linmessage(pybind11::module_& m) {
-	pybind11::class_<LINErrorFlags>(m, "LINErrorFlags")
+	pybind11::classh<LINErrorFlags>(m, "LINErrorFlags")
 		.def_readwrite("ErrRxBreakOnly", &LINErrorFlags::ErrRxBreakOnly)
 		.def_readwrite("ErrRxBreakSyncOnly", &LINErrorFlags::ErrRxBreakSyncOnly)
 		.def_readwrite("ErrTxRxMismatch", &LINErrorFlags::ErrTxRxMismatch)
@@ -20,7 +20,7 @@ void init_linmessage(pybind11::module_& m) {
 		.def_readwrite("ErrFrameResponderData", &LINErrorFlags::ErrFrameResponderData)
 		.def_readwrite("ErrChecksumMatch", &LINErrorFlags::ErrChecksumMatch);
 
-	pybind11::class_<LINStatusFlags>(m, "LINStatusFlags")
+	pybind11::classh<LINStatusFlags>(m, "LINStatusFlags")
 		.def_readwrite("TxChecksumEnhanced", &LINStatusFlags::TxChecksumEnhanced)
 		.def_readwrite("TxCommander", &LINStatusFlags::TxCommander)
 		.def_readwrite("TxResponder", &LINStatusFlags::TxResponder)
@@ -30,7 +30,7 @@ void init_linmessage(pybind11::module_& m) {
 		.def_readwrite("BusRecovered", &LINStatusFlags::BusRecovered)
 		.def_readwrite("BreakOnly", &LINStatusFlags::BreakOnly);
 
-	pybind11::class_<LINMessage, std::shared_ptr<LINMessage>, Frame> linMessage(m, "LINMessage");
+	pybind11::classh<LINMessage, Frame> linMessage(m, "LINMessage");
 
 	pybind11::enum_<LINMessage::Type>(linMessage, "Type")
 		.value("NOT_SET", LINMessage::Type::NOT_SET)

bindings/python/icsneopy/communication/message/macsecmessage.cpp

@@ -1,160 +0,0 @@
-#include <pybind11/pybind11.h>
-#include <pybind11/stl.h>
-#include <pybind11/functional.h>
-
-#include "icsneo/communication/message/macsecmessage.h"
-
-namespace icsneo {
-
-void init_macsecmessage(pybind11::module_ & m)
-{
-	pybind11::enum_<MACsecPacketType>(m, "MACsecPacketType")
-		.value("NoVLAN_OrMPLS", MACsecPacketType::NoVLANOrMPLS)
-		.value("SingleVLAN", MACsecPacketType::SingleVLAN)
-		.value("DualVLAN", MACsecPacketType::DualVLAN)
-		.value("MPLS", MACsecPacketType::MPLS)
-		.value("SingleVLAN_FollowByMPLS", MACsecPacketType::SingleVLANFollowedByMPLS)
-		.value("DualVLAN_FollowByMPLS", MACsecPacketType::DualVLANFollowedByMPLS)
-		.value("Unsupported", MACsecPacketType::Unsupported);
-
-	pybind11::enum_<MACsecValidateFrameType>(m, "MACsecValidateFrameType")
-		.value("Disabled", MACsecValidateFrameType::Disabled)
-		.value("Check", MACsecValidateFrameType::Check)
-		.value("Strict", MACsecValidateFrameType::Strict)
-		.value("NA", MACsecValidateFrameType::NA);
-
-	pybind11::enum_<MACsecSecTagIcvStripType>(m, "MACsecSecTagIcvStripType")
-		.value("StripBoth", MACsecSecTagIcvStripType::StripBoth)
-		.value("StripSecTagPreserveICV", MACsecSecTagIcvStripType::StripSecTagPreserveICV)
-		.value("PreserveSecTagStripICV", MACsecSecTagIcvStripType::PreserveSecTagStripICV)
-		.value("PreserveBoth", MACsecSecTagIcvStripType::PreserveBoth);
-
-	pybind11::enum_<MACsecCipherSuiteType>(m, "MACsecCipherSuiteType")
-		.value("AES_128", MACsecCipherSuiteType::GcmAes128)
-		.value("AES_256", MACsecCipherSuiteType::GcmAes256)
-		.value("AES_128_XPN", MACsecCipherSuiteType::GcmAes128Xpn)
-		.value("AES_256_XPN", MACsecCipherSuiteType::GcmAes256Xpn);
-
-	pybind11::class_<MACsecVLANTag, std::shared_ptr<MACsecVLANTag>>(m, "MACsecVLANTag")
-		.def(pybind11::init())
-		.def_readwrite("vid", &MACsecVLANTag::vid)
-		.def_readwrite("pri_cfi", &MACsecVLANTag::priCfi);
-
-	pybind11::class_<MACsecMPLSOuter, std::shared_ptr<MACsecMPLSOuter>>(m, "MACsecMPLSOuter")
-		.def(pybind11::init())
-		.def_readwrite("mpls_label", &MACsecMPLSOuter::mplsLabel)
-		.def_readwrite("exp", &MACsecMPLSOuter::exp);
-
-	pybind11::class_<MACsecRule, std::shared_ptr<MACsecRule>>(m, "MACsecRule")
-		.def(pybind11::init())
-		.def_readwrite("index", &MACsecRule::index)
-		.def_readwrite("keyMacDa", &MACsecRule::keyMacDa)
-		.def_readwrite("maskMacDa", &MACsecRule::maskMacDa)
-		.def_readwrite("keyMacSa", &MACsecRule::keyMacSa)
-		.def_readwrite("maskMacSa", &MACsecRule::maskMacSa)
-		.def_readwrite("keyEthertype", &MACsecRule::keyEthertype)
-		.def_readwrite("maskEthertype", &MACsecRule::maskEthertype)
-		.def_readwrite("keyVlanTagOuter1", &MACsecRule::keyVlanTagOuter1)
-		.def_readwrite("keyMplsOuter1", &MACsecRule::keyMplsOuter1)
-		.def_readwrite("maskVlanTagOuter1", &MACsecRule::maskVlanTagOuter1)
-		.def_readwrite("maskMplsOuter1", &MACsecRule::maskMplsOuter1)
-		.def_readwrite("keyVlanTagOuter2", &MACsecRule::keyVlanTagOuter2)
-		.def_readwrite("keyMplsOuter2", &MACsecRule::keyMplsOuter2)
-		.def_readwrite("maskVlanTagOuter2", &MACsecRule::maskVlanTagOuter2)
-		.def_readwrite("maskMplsOuter2", &MACsecRule::maskMplsOuter2)
-		.def_readwrite("keyBonusData", &MACsecRule::keyBonusData)
-		.def_readwrite("maskBonusData", &MACsecRule::maskBonusData)
-		.def_readwrite("keyTagMatchBitmap", &MACsecRule::keyTagMatchBitmap)
-		.def_readwrite("maskTagMatchBitmap", &MACsecRule::maskTagMatchBitmap)
-		.def_readwrite("keyPacketType", &MACsecRule::keyPacketType)
-		.def_readwrite("maskPacketType", &MACsecRule::maskPacketType)
-		.def_readwrite("keyInnerVlanType", &MACsecRule::keyInnerVlanType)
-		.def_readwrite("maskInnerVlanType", &MACsecRule::maskInnerVlanType)
-		.def_readwrite("keyOuterVlanType", &MACsecRule::keyOuterVlanType)
-		.def_readwrite("maskOuterVlanType", &MACsecRule::maskOuterVlanType)
-		.def_readwrite("keyNumTags", &MACsecRule::keyNumTags)
-		.def_readwrite("maskNumTags", &MACsecRule::maskNumTags)
-		.def_readwrite("keyExpress", &MACsecRule::keyExpress)
-		.def_readwrite("maskExpress", &MACsecRule::maskExpress)
-		.def_readwrite("isMpls", &MACsecRule::isMpls)
-		.def_readwrite("enable", &MACsecRule::enable);
-
-	pybind11::class_<MACsecMap, std::shared_ptr<MACsecMap>>(m, "MACsecMap")
-		.def(pybind11::init())
-		.def_readwrite("index", &MACsecMap::index)
-		.def_readwrite("secTagSci", &MACsecMap::secTagSci)
-		.def_readwrite("secYIndex", &MACsecMap::secYIndex)
-		.def_readwrite("isControlPacket", &MACsecMap::isControlPacket)
-		.def_readwrite("scIndex", &MACsecMap::scIndex)
-		.def_readwrite("auxiliaryPlcy", &MACsecMap::auxiliaryPlcy)
-		.def_readwrite("ruleId", &MACsecMap::ruleId)
-		.def_readwrite("enable", &MACsecMap::enable);
-
-	pybind11::class_<MACsecSecY, std::shared_ptr<MACsecSecY>>(m, "MACsecSecY")
-		.def(pybind11::init())
-		.def_readwrite("index", &MACsecSecY::index)
-		.def_readwrite("controlledPortEnabled", &MACsecSecY::controlledPortEnabled)
-		.def_readwrite("frameValidationType", &MACsecSecY::frameValidationType)
-		.def_readwrite("secTagIcvStripType", &MACsecSecY::secTagIcvStripType)
-		.def_readwrite("cipher", &MACsecSecY::cipher)
-		.def_readwrite("confidentialOffset", &MACsecSecY::confidentialOffset)
-		.def_readwrite("icvIncludesDaSa", &MACsecSecY::icvIncludesDaSa)
-		.def_readwrite("replayProtect", &MACsecSecY::replayProtect)
-		.def_readwrite("replayWindow", &MACsecSecY::replayWindow)
-		.def_readwrite("protectFrames", &MACsecSecY::protectFrames)
-		.def_readwrite("secTagOffset", &MACsecSecY::secTagOffset)
-		.def_readwrite("secTagTci", &MACsecSecY::secTagTci)
-		.def_readwrite("mtu", &MACsecSecY::mtu)
-		.def_readwrite("enable", &MACsecSecY::enable);
-
-	pybind11::class_<MACsecSc, std::shared_ptr<MACsecSc>>(m, "MACsecSc")
-		.def(pybind11::init())
-		.def_readwrite("index", &MACsecSc::index)
-		.def_readwrite("secYIndex", &MACsecSc::secYIndex)
-		.def_readwrite("sci", &MACsecSc::sci)
-		.def_readwrite("saIndex0", &MACsecSc::saIndex0)
-		.def_readwrite("saIndex1", &MACsecSc::saIndex1)
-		.def_readwrite("saIndex0InUse", &MACsecSc::saIndex0InUse)
-		.def_readwrite("saIndex1InUse", &MACsecSc::saIndex1InUse)
-		.def_readwrite("enableAutoRekey", &MACsecSc::enableAutoRekey)
-		.def_readwrite("isActiveSa1", &MACsecSc::isActiveSa1)
-		.def_readwrite("enable", &MACsecSc::enable);
-
-	pybind11::class_<MACsecSa, std::shared_ptr<MACsecSa>>(m, "MACsecSa")
-		.def(pybind11::init())
-		.def_readwrite("index", &MACsecSa::index)
-		.def_readwrite("sak", &MACsecSa::sak)
-		.def_readwrite("hashKey", &MACsecSa::hashKey)
-		.def_readwrite("salt", &MACsecSa::salt)
-		.def_readwrite("ssci", &MACsecSa::ssci)
-		.def_readwrite("an", &MACsecSa::an)
-		.def_readwrite("nextPn", &MACsecSa::nextPn)
-		.def_readwrite("enable", &MACsecSa::enable);
-
-	pybind11::class_<MACSecFlags, std::shared_ptr<MACSecFlags>>(m, "MACSecFlags")
-		.def(pybind11::init())
-		.def_readwrite("en", &MACSecFlags::en);
-
-	pybind11::class_<MACsecConfig, std::shared_ptr<MACsecConfig>>(m, "MACsecConfig")
-		.def(pybind11::init())
-		.def_readwrite("flags", &MACsecConfig::flags)
-		.def_readwrite("rule", &MACsecConfig::rule)
-		.def_readwrite("map", &MACsecConfig::map)
-		.def_readwrite("secy", &MACsecConfig::secy)
-		.def_readwrite("sc", &MACsecConfig::sc)
-		.def_readwrite("sa", &MACsecConfig::sa);
-
-	pybind11::class_<MACSecGlobalFlags, std::shared_ptr<MACSecGlobalFlags>>(m, "MACSecGlobalFlags")
-		.def(pybind11::init())
-		.def_readwrite("en", &MACSecGlobalFlags::en)
-		.def_readwrite("nvm", &MACSecGlobalFlags::nvm);
-
-	pybind11::class_<MACsecMessage, std::shared_ptr<MACsecMessage>>(m, "MACsecMessage")
-		.def(pybind11::init())
-		.def_readwrite("flags", &MACsecMessage::flags)
-		.def_readwrite("rx", &MACsecMessage::rx)
-		.def_readwrite("tx", &MACsecMessage::tx);
-}
-
-} // namespace icsneo 
-

bindings/python/icsneopy/communication/message/mdiomessage.cpp

@@ -7,7 +7,7 @@
 namespace icsneo {
 
 void init_mdiomessage(pybind11::module_& m) {
-	pybind11::class_<MDIOMessage, std::shared_ptr<MDIOMessage>, Frame> mdioMessage(m, "MDIOMessage");
+	pybind11::classh<MDIOMessage, Frame> mdioMessage(m, "MDIOMessage");
 	pybind11::enum_<MDIOMessage::Clause>(mdioMessage, "Clause")
 		.value("Clause45", MDIOMessage::Clause::Clause45)
 		.value("Clause22", MDIOMessage::Clause::Clause22);

bindings/python/icsneopy/communication/message/message.cpp

@@ -1,14 +1,16 @@
 #include <pybind11/pybind11.h>
 #include <pybind11/stl.h>
 #include <pybind11/functional.h>
+#include <pybind11/native_enum.h>
 
 #include "icsneo/communication/message/message.h"
 
 namespace icsneo {
 
 void init_message(pybind11::module_& m) {
-	pybind11::class_<Message, std::shared_ptr<Message>> message(m, "Message");
-	pybind11::enum_<Message::Type>(message, "Type")
+	// Using py::smart_holder for safer lifetime management
+	pybind11::classh<Message> message(m, "Message");
+	pybind11::native_enum<Message::Type>(message, "Type", "enum.IntEnum")
 		.value("Frame", Message::Type::Frame)
 		.value("CANErrorCount", Message::Type::CANErrorCount)
 		.value("CANError", Message::Type::CANError)
@@ -34,17 +36,18 @@ void init_message(pybind11::module_& m) {
 		.value("TC10Status", Message::Type::TC10Status)
 		.value("AppError", Message::Type::AppError)
 		.value("GPTPStatus", Message::Type::GPTPStatus)
-		.value("EthernetStatus", Message::Type::EthernetStatus);
+		.value("EthernetStatus", Message::Type::EthernetStatus)
+		.finalize();
 
 	message.def(pybind11::init<Message::Type>());
 	message.def_readonly("type", &Message::type);
 	message.def_readwrite("timestamp", &Message::timestamp);
 
-	pybind11::class_<RawMessage, std::shared_ptr<RawMessage>, Message>(m, "RawMessage")
+	pybind11::classh<RawMessage, Message>(m, "RawMessage")
 		.def_readwrite("network", &RawMessage::network)
 		.def_readwrite("data", &RawMessage::data);
 
-	pybind11::class_<Frame, std::shared_ptr<Frame>, RawMessage>(m, "Frame")
+	pybind11::classh<Frame, RawMessage>(m, "Frame")
 		.def_readwrite("description", &Frame::description)
 		.def_readwrite("transmitted", &Frame::transmitted)
 		.def_readwrite("error", &Frame::error);

bindings/python/icsneopy/communication/message/scriptstatusmessage.cpp

@@ -7,7 +7,7 @@
 namespace icsneo {
 
 void init_scriptstatusmessage(pybind11::module_& m) {
-	pybind11::class_<ScriptStatusMessage, std::shared_ptr<ScriptStatusMessage>, Message>(m, "ScriptStatusMessage")
+	pybind11::classh<ScriptStatusMessage, Message>(m, "ScriptStatusMessage")
         .def_readonly("isEncrypted", &ScriptStatusMessage::isEncrypted)
         .def_readonly("isCoreminiRunning", &ScriptStatusMessage::isCoreminiRunning)
         .def_readonly("sectorOverflows", &ScriptStatusMessage::sectorOverflows)

bindings/python/icsneopy/communication/message/spimessage.cpp

@@ -7,7 +7,7 @@
 namespace icsneo {
 
 void init_spimessage(pybind11::module_& m) {
-	pybind11::class_<SPIMessage, std::shared_ptr<SPIMessage>, Frame> spiMessage(m, "SPIMessage");
+	pybind11::classh<SPIMessage, Frame> spiMessage(m, "SPIMessage");
 	pybind11::enum_<SPIMessage::Direction>(spiMessage, "Direction")
 		.value("Write", SPIMessage::Direction::Write)
 		.value("Read", SPIMessage::Direction::Read);

bindings/python/icsneopy/communication/message/tc10statusmessage.cpp

@@ -17,7 +17,7 @@ void init_tc10statusmessage(pybind11::module_& m) {
 		.value("SleepFailed", TC10SleepStatus::SleepFailed)
 		.value("SleepAborted", TC10SleepStatus::SleepAborted);
 
-	pybind11::class_<TC10StatusMessage, std::shared_ptr<TC10StatusMessage>, Message>(m, "TC10StatusMessage")
+	pybind11::classh<TC10StatusMessage, Message>(m, "TC10StatusMessage")
 		.def_readonly("wakeStatus", &TC10StatusMessage::wakeStatus)
 		.def_readonly("sleepStatus", &TC10StatusMessage::sleepStatus);
 }

bindings/python/icsneopy/communication/network.cpp

@@ -1,15 +1,16 @@
 #include <pybind11/pybind11.h>
 #include <pybind11/stl.h>
 #include <pybind11/functional.h>
+#include <pybind11/native_enum.h>
 
 #include "icsneo/communication/network.h"
 
 namespace icsneo {
 
 void init_network(pybind11::module_& m) {
-	pybind11::class_<Network> network(m, "Network");
+	pybind11::classh<Network> network(m, "Network");
 
-	pybind11::enum_<Network::NetID>(network, "NetID")
+	pybind11::native_enum<Network::NetID>(network, "NetID", "enum.IntEnum")
 		.value("Device", Network::NetID::Device)
 		.value("DWCAN_01", Network::NetID::DWCAN_01)
 		.value("DWCAN_08", Network::NetID::DWCAN_08)
@@ -166,9 +167,10 @@ void init_network(pybind11::module_& m) {
 		.value("LIN_15", Network::NetID::LIN_15)
 		.value("LIN_16", Network::NetID::LIN_16)
 		.value("Any", Network::NetID::Any)
-		.value("Invalid", Network::NetID::Invalid);
+		.value("Invalid", Network::NetID::Invalid)
+		.finalize();
 	
-	pybind11::enum_<Network::Type>(network, "Type")
+	pybind11::native_enum<Network::Type>(network, "Type", "enum.Enum")
 		.value("Invalid", Network::Type::Invalid)
 		.value("Internal", Network::Type::Internal)
 		.value("CAN", Network::Type::CAN)
@@ -185,7 +187,8 @@ void init_network(pybind11::module_& m) {
 		.value("MDIO", Network::Type::MDIO)
 		.value("AutomotiveEthernet", Network::Type::AutomotiveEthernet)
 		.value("Any", Network::Type::Any)
-		.value("Other", Network::Type::Other);
+		.value("Other", Network::Type::Other)
+		.finalize();
 
     network
 		.def(pybind11::init<Network::NetID>())

bindings/python/icsneopy/core/macseccfg.cpp

@@ -0,0 +1,166 @@
+#include <pybind11/pybind11.h>
+#include <pybind11/stl.h>
+#include <pybind11/functional.h>
+
+#include "icsneo/core/macseccfg.h"
+
+namespace icsneo {
+
+void init_macsecconfig(pybind11::module_ & m)
+{
+	pybind11::enum_<MACsecPacketType>(m, "MACsecPacketType")
+		.value("DEFAULT", MACsecPacketType::Default)
+		.value("SINGLE_VLAN", MACsecPacketType::SingleVLAN)
+		.value("DUAL_VLAN", MACsecPacketType::DualVLAN)
+		.value("MPLS", MACsecPacketType::MPLS)
+		.value("SINGLE_VLAN_FOLLOWED_BY_MPLS", MACsecPacketType::SingleVLANFollowedByMPLS)
+		.value("DUAL_VLAN_FOLLOWED_BY_MPLS", MACsecPacketType::DualVLANFollowedByMPLS)
+		.value("UNSUPPORTED", MACsecPacketType::Unsupported);
+
+	pybind11::enum_<MACsecValidation>(m, "MACsecValidation")
+		.value("DISABLED", MACsecValidation::Disabled)
+		.value("CHECK", MACsecValidation::Check)
+		.value("STRICT", MACsecValidation::Strict)
+		.value("NA", MACsecValidation::NA);
+
+	pybind11::enum_<MACsecStrip>(m, "MACsecStrip")
+		.value("STRIP_SECTAG_AND_ICV", MACsecStrip::StripSecTagAndIcv)
+		.value("STRIP_SECTAG_PRESERVE_ICV", MACsecStrip::StripSecTagPreserveICV)
+		.value("PRESERVE_SECTAG_STRIP_ICV", MACsecStrip::PreserveSecTagStripICV)
+		.value("NO_STRIP", MACsecStrip::NoStrip);
+
+	pybind11::enum_<MACsecCipherSuite>(m, "MACsecCipherSuite")
+		.value("GCM_AES_128", MACsecCipherSuite::GcmAes128)
+		.value("GCM_AES_256", MACsecCipherSuite::GcmAes256)
+		.value("GCM_AES_128_XPN", MACsecCipherSuite::GcmAes128Xpn)
+		.value("GCM_AES_256_XPN", MACsecCipherSuite::GcmAes256Xpn);
+
+	pybind11::classh<MACsecVLANTag>(m, "MACsecVLANTag")
+		.def(pybind11::init())
+		.def_readwrite("vid", &MACsecVLANTag::vid)
+		.def_readwrite("pri_cfi", &MACsecVLANTag::priCfi);
+
+	pybind11::classh<MACsecMPLSOuter>(m, "MACsecMPLSOuter")
+		.def(pybind11::init())
+		.def_readwrite("mpls_label", &MACsecMPLSOuter::mplsLabel)
+		.def_readwrite("exp", &MACsecMPLSOuter::exp);
+
+	pybind11::classh<MACsecTci>(m, "MACsecTci")
+		.def(pybind11::init())
+		.def_readwrite("es", &MACsecTci::es)
+		.def_readwrite("sc", &MACsecTci::sc)
+		.def_readwrite("scb", &MACsecTci::scb)
+		.def_readwrite("e", &MACsecTci::e)
+		.def_readwrite("c", &MACsecTci::c);
+
+	pybind11::classh<MACsecRxRule>(m, "MACsecRxRule")
+		.def(pybind11::init())
+		.def_readwrite("key_mac_da", &MACsecRxRule::keyMacDa)
+		.def_readwrite("mask_mac_da", &MACsecRxRule::maskMacDa)
+		.def_readwrite("key_mask_sa", &MACsecRxRule::keyMacSa)
+		.def_readwrite("mask_mac_sa", &MACsecRxRule::maskMacSa)
+		.def_readwrite("key_ether_type", &MACsecRxRule::keyEthertype)
+		.def_readwrite("mask_ether_type", &MACsecRxRule::maskEthertype)
+		.def_readwrite("key_vlan_tag_outer1", &MACsecRxRule::keyVlanTagOuter1)
+		.def_readwrite("key_mpls_outer1", &MACsecRxRule::keyMplsOuter1)
+		.def_readwrite("mask_vlan_tag_outer1", &MACsecRxRule::maskVlanTagOuter1)
+		.def_readwrite("mask_mpls_outer1", &MACsecRxRule::maskMplsOuter1)
+		.def_readwrite("key_vlan_tag_outer2", &MACsecRxRule::keyVlanTagOuter2)
+		.def_readwrite("key_mpls_outer2", &MACsecRxRule::keyMplsOuter2)
+		.def_readwrite("mask_vlan_tag_outer2", &MACsecRxRule::maskVlanTagOuter2)
+		.def_readwrite("mask_mpls_outer2", &MACsecRxRule::maskMplsOuter2)
+		.def_readwrite("key_bonus_data", &MACsecRxRule::keyBonusData)
+		.def_readwrite("mask_bonus_data", &MACsecRxRule::maskBonusData)
+		.def_readwrite("key_tag_match_bitmap", &MACsecRxRule::keyTagMatchBitmap)
+		.def_readwrite("mask_tag_match_bitmap", &MACsecRxRule::maskTagMatchBitmap)
+		.def_readwrite("key_packet_type", &MACsecRxRule::keyPacketType)
+		.def_readwrite("mask_packet_type", &MACsecRxRule::maskPacketType)
+		.def_readwrite("key_inner_vlan_type", &MACsecRxRule::keyInnerVlanType)
+		.def_readwrite("mask_inner_vlan_type", &MACsecRxRule::maskInnerVlanType)
+		.def_readwrite("key_outer_vlan_type", &MACsecRxRule::keyOuterVlanType)
+		.def_readwrite("mask_outer_vlan_type", &MACsecRxRule::maskOuterVlanType)
+		.def_readwrite("key_num_tags", &MACsecRxRule::keyNumTags)
+		.def_readwrite("mask_num_tags", &MACsecRxRule::maskNumTags)
+		.def_readwrite("key_express", &MACsecRxRule::keyExpress)
+		.def_readwrite("mask_express", &MACsecRxRule::maskExpress)
+		.def_readwrite("is_mpls", &MACsecRxRule::isMpls);
+
+	pybind11::classh<MACsecTxSecY>(m, "MACsecTxSecY")
+		.def(pybind11::init())
+		.def_readwrite("enable_control_port", &MACsecTxSecY::enableControlPort)
+		.def_readwrite("cipher", &MACsecTxSecY::cipher)
+		.def_readwrite("confidentiality_offset", &MACsecTxSecY::confidentialityOffset)
+		.def_readwrite("icv_includes_da_sa", &MACsecTxSecY::icvIncludesDaSa)
+		.def_readwrite("protect_frames", &MACsecTxSecY::protectFrames)
+		.def_readwrite("sec_tag_offset", &MACsecTxSecY::secTagOffset)
+		.def_readwrite("sec_tag_tci", &MACsecTxSecY::tci)
+		.def_readwrite("mtu", &MACsecTxSecY::mtu)
+		.def_readwrite("is_control_packet", &MACsecTxSecY::isControlPacket)
+		.def_readwrite("auxiliary_policy", &MACsecTxSecY::auxiliaryPolicy)
+		.def_readwrite("sci", &MACsecTxSecY::sci);
+		
+	pybind11::classh<MACsecRxSecY>(m, "MACsecRxSecY")
+		.def(pybind11::init())
+		.def_readwrite("enable_control_port", &MACsecRxSecY::enableControlPort)
+		.def_readwrite("frame_validation", &MACsecRxSecY::frameValidation)
+		.def_readwrite("frame_strip", &MACsecRxSecY::frameStrip)
+		.def_readwrite("cipher", &MACsecRxSecY::cipher)
+		.def_readwrite("confidentiality_offset", &MACsecRxSecY::confidentialityOffset)
+		.def_readwrite("icv_includes_da_sa", &MACsecRxSecY::icvIncludesDaSa)
+		.def_readwrite("replay_protect", &MACsecRxSecY::replayProtect)
+		.def_readwrite("replay_window", &MACsecRxSecY::replayWindow)
+		.def_readwrite("is_control_packet", &MACsecRxSecY::isControlPacket)
+		.def_readwrite("sci", &MACsecRxSecY::sci);
+
+	pybind11::classh<MACsecTxSa>(m, "MACsecTxSa")
+		.def(pybind11::init())
+		.def_readwrite("sak", &MACsecTxSa::sak)
+		.def_readwrite("hash_key", &MACsecTxSa::hashKey)
+		.def_readwrite("salt", &MACsecTxSa::salt)
+		.def_readwrite("ssci", &MACsecTxSa::ssci)
+		.def_readwrite("next_pn", &MACsecTxSa::nextPn)
+		.def_readwrite("an", &MACsecTxSa::an);
+
+	pybind11::classh<MACsecRxSa>(m, "MACsecRxSa")
+		.def(pybind11::init())
+		.def_readwrite("sak", &MACsecRxSa::sak)
+		.def_readwrite("hash_key", &MACsecRxSa::hashKey)
+		.def_readwrite("salt", &MACsecRxSa::salt)
+		.def_readwrite("ssci", &MACsecRxSa::ssci)
+		.def_readwrite("next_pn", &MACsecRxSa::nextPn);
+
+	pybind11::classh<MACsecConfig>(m, "MACsecConfig")
+		.def(pybind11::init<icsneo::DeviceType>())
+		.def("add_rx_secy", &MACsecConfig::addRxSecY, pybind11::call_guard<pybind11::gil_scoped_release>())
+		.def("add_tx_secY", &MACsecConfig::addTxSecY, pybind11::call_guard<pybind11::gil_scoped_release>())
+		.def("add_rx_rule", &MACsecConfig::addRxRule, pybind11::call_guard<pybind11::gil_scoped_release>())
+		.def("add_rx_sa", &MACsecConfig::addRxSa, pybind11::call_guard<pybind11::gil_scoped_release>())
+		.def("add_tx_sa", &MACsecConfig::addTxSa, pybind11::call_guard<pybind11::gil_scoped_release>())
+		.def("get_rx_secy", [](MACsecConfig& cfg, uint8_t index) -> MACsecRxSecY& { return cfg.getRxSecY(index); }, pybind11::call_guard<pybind11::gil_scoped_release>())
+		.def("get_tx_secy", [](MACsecConfig& cfg, uint8_t index) -> MACsecTxSecY& { return cfg.getTxSecY(index); }, pybind11::call_guard<pybind11::gil_scoped_release>())
+		.def("get_rx_sa", [](MACsecConfig& cfg, uint8_t index) -> MACsecRxSa& { return cfg.getRxSa(index); }, pybind11::call_guard<pybind11::gil_scoped_release>())
+		.def("get_tx_sa", [](MACsecConfig& cfg, uint8_t index) -> MACsecTxSa& { return cfg.getTxSa(index); }, pybind11::call_guard<pybind11::gil_scoped_release>())
+		.def("get_rx_rule", [](MACsecConfig& cfg, uint8_t index) -> MACsecRxRule& { return cfg.getRxRule(index); }, pybind11::call_guard<pybind11::gil_scoped_release>())
+		.def("set_tx_sa_index", &MACsecConfig::setTxSaIndex, pybind11::call_guard<pybind11::gil_scoped_release>())
+		.def("enable_tx_rekey", &MACsecConfig::enableTxRekey, pybind11::call_guard<pybind11::gil_scoped_release>())
+		.def("set_tx_sa_rekey_index", &MACsecConfig::setTxSaRekeyIndex, pybind11::call_guard<pybind11::gil_scoped_release>())
+		.def("disable_tx_rekey", &MACsecConfig::disableTxRekey, pybind11::call_guard<pybind11::gil_scoped_release>())
+		.def("set_rx_sa_index", &MACsecConfig::setRxSaIndex, pybind11::call_guard<pybind11::gil_scoped_release>())
+		.def("enable_rx_rekey", &MACsecConfig::enableRxRekey, pybind11::call_guard<pybind11::gil_scoped_release>())
+		.def("set_rx_sa_rekey_index", &MACsecConfig::setRxSaRekeyIndex, pybind11::call_guard<pybind11::gil_scoped_release>())
+		.def("disable_rx_rekey", &MACsecConfig::disableRxRekey, pybind11::call_guard<pybind11::gil_scoped_release>())
+		.def("set_rx_enable", &MACsecConfig::setRxEnable, pybind11::call_guard<pybind11::gil_scoped_release>())
+		.def("set_tx_enable", &MACsecConfig::setTxEnable, pybind11::call_guard<pybind11::gil_scoped_release>())
+		.def("set_storage", &MACsecConfig::setStorage, pybind11::call_guard<pybind11::gil_scoped_release>())
+		.def("clear", &MACsecConfig::clear, pybind11::call_guard<pybind11::gil_scoped_release>())
+		.def("serialize", &MACsecConfig::serialize, pybind11::call_guard<pybind11::gil_scoped_release>())
+		.def("get_bin_index", &MACsecConfig::getBinIndex, pybind11::call_guard<pybind11::gil_scoped_release>())
+		.def("get_type", &MACsecConfig::getType, pybind11::call_guard<pybind11::gil_scoped_release>())
+		.def("get_max_num_rule", &MACsecConfig::getMaxNumRule, pybind11::call_guard<pybind11::gil_scoped_release>())
+		.def("get_max_num_secy", &MACsecConfig::getMaxNumSecY, pybind11::call_guard<pybind11::gil_scoped_release>())
+		.def("get_max_num_sa", &MACsecConfig::getMaxNumSa, pybind11::call_guard<pybind11::gil_scoped_release>());
+
+}
+
+} // namespace icsneo 
+

bindings/python/icsneopy/device/chipid.cpp

@@ -1,13 +1,14 @@
 #include <pybind11/pybind11.h>
 #include <pybind11/stl.h>
 #include <pybind11/functional.h>
+#include <pybind11/native_enum.h>
 
 #include "icsneo/device/chipid.h"
 
 namespace icsneo {
 
 void init_chipid(pybind11::module_& m) {
-	pybind11::enum_<ChipID>(m, "ChipID")
+	pybind11::native_enum<ChipID>(m, "ChipID", "enum.IntEnum")
 		.value("neoVIFIRE_MCHIP", ChipID::neoVIFIRE_MCHIP)
 		.value("neoVIFIRE_LCHIP", ChipID::neoVIFIRE_LCHIP)
 		.value("neoVIFIRE_UCHIP", ChipID::neoVIFIRE_UCHIP)
@@ -130,7 +131,8 @@ void init_chipid(pybind11::module_& m) {
 		.value("Connect_LINUX", ChipID::Connect_LINUX)
 		.value("RADGigastar2_ZYNQ", ChipID::RADGigastar2_ZYNQ)
 		.value("RADGemini_MCHIP", ChipID::RADGemini_MCHIP)
-		.value("Invalid", ChipID::Invalid);
+		.value("Invalid", ChipID::Invalid)
+		.finalize();
 }
 
 } // namespace icsneo

bindings/python/icsneopy/device/device.cpp

@@ -11,7 +11,7 @@
 namespace icsneo {
 
 void init_device(pybind11::module_& m) {
-	pybind11::class_<Device, std::shared_ptr<Device>>(m, "Device")
+	pybind11::classh<Device>(m, "Device")
 		.def("__repr__", &Device::describe)
 		.def("add_message_callback", &Device::addMessageCallback, pybind11::call_guard<pybind11::gil_scoped_release>())
 		.def("clear_script", &Device::clearScript, pybind11::call_guard<pybind11::gil_scoped_release>())

bindings/python/icsneopy/device/devicetype.cpp

@@ -1,14 +1,15 @@
 #include <pybind11/pybind11.h>
 #include <pybind11/stl.h>
 #include <pybind11/functional.h>
+#include <pybind11/native_enum.h>
 
 #include "icsneo/device/devicetype.h"
 
 namespace icsneo {
 
 void init_devicetype(pybind11::module_& m) {
-	pybind11::class_<DeviceType> deviceType(m, "DeviceType");
-	pybind11::enum_<DeviceType::Enum>(deviceType, "Enum")
+	pybind11::classh<DeviceType> deviceType(m, "DeviceType");
+	pybind11::native_enum<DeviceType::Enum>(deviceType, "Enum", "enum.IntEnum")
 		.value("Unknown", DeviceType::Enum::Unknown)
 		.value("BLUE", DeviceType::Enum::BLUE)
 		.value("ECU_AVB", DeviceType::Enum::ECU_AVB)
@@ -70,7 +71,8 @@ void init_devicetype(pybind11::module_& m) {
 		.value("RADGalaxy", DeviceType::Enum::RADGalaxy)
 		.value("RADStar2", DeviceType::Enum::RADStar2)
 		.value("VividCAN", DeviceType::Enum::VividCAN)
-		.value("OBD2_SIM", DeviceType::Enum::OBD2_SIM);
+		.value("OBD2_SIM", DeviceType::Enum::OBD2_SIM)
+		.finalize();
 	deviceType.def(pybind11::init<DeviceType::Enum>());
 	deviceType.def("get_device_type", &DeviceType::getDeviceType);
 	deviceType.def("get_generic_product_name", &DeviceType::getGenericProductName);

bindings/python/icsneopy/device/extensions/deviceextension.cpp

@@ -7,7 +7,7 @@
 namespace icsneo {
 
 void init_deviceextension(pybind11::module_& m) {
-    pybind11::class_<DeviceExtension, std::shared_ptr<DeviceExtension>>(m, "DeviceExtension")
+    pybind11::classh<DeviceExtension>(m, "DeviceExtension")
         .def("get_name", &DeviceExtension::getName);
 }
 

bindings/python/icsneopy/device/idevicesettings.cpp

@@ -16,7 +16,7 @@ struct DeviceSettingsNamespace {
 };
 
 void init_idevicesettings(pybind11::module_& m) {
-    pybind11::class_<DeviceSettingsNamespace> settings(m, "Settings");
+    pybind11::classh<DeviceSettingsNamespace> settings(m, "Settings");
 
     pybind11::enum_<DeviceSettingsNamespace::EthLinkMode>(settings, "EthernetLinkMode")
         .value("Auto", DeviceSettingsNamespace::EthLinkMode::AE_LINK_AUTO)
@@ -31,7 +31,7 @@ void init_idevicesettings(pybind11::module_& m) {
         .value("Speed5G", DeviceSettingsNamespace::LinkSpeed::ETH_SPEED_5000)
         .value("Speed10G", DeviceSettingsNamespace::LinkSpeed::ETH_SPEED_10000);
 
-    pybind11::class_<IDeviceSettings, std::shared_ptr<IDeviceSettings>>(m, "IDeviceSettings")
+    pybind11::classh<IDeviceSettings>(m, "IDeviceSettings")
         .def("apply", &IDeviceSettings::apply, pybind11::arg("temporary") = 0, pybind11::call_guard<pybind11::gil_scoped_release>())
         .def("apply_defaults", &IDeviceSettings::applyDefaults, pybind11::arg("temporary") = 0, pybind11::call_guard<pybind11::gil_scoped_release>())
         .def("get_phy_enable", &IDeviceSettings::getPhyEnable, pybind11::call_guard<pybind11::gil_scoped_release>())

bindings/python/icsneopy/device/versionreport.cpp

@@ -7,7 +7,7 @@
 namespace icsneo {
 
 void init_versionreport(pybind11::module_& m) {
-	pybind11::class_<VersionReport>(m, "VersionReport")
+	pybind11::classh<VersionReport>(m, "VersionReport")
 		.def_readonly("id", &VersionReport::id)
 		.def_readonly("name", &VersionReport::name)
 		.def_readonly("major", &VersionReport::major)

bindings/python/icsneopy/disk/diskdriver.cpp

@@ -13,7 +13,7 @@ struct DiskNamespace {
 };
 
 void init_diskdriver(pybind11::module_& m) {
-	pybind11::class_<DiskNamespace> disk(m, "Disk");
+	pybind11::classh<DiskNamespace> disk(m, "Disk");
 	pybind11::enum_<Disk::Access>(disk, "Access")
 		.value("None", Disk::Access::None)
 		.value("EntireCard", Disk::Access::EntireCard)

bindings/python/icsneopy/flexray/flexray.cpp

@@ -23,8 +23,8 @@ struct ClusterNamespace {
     using SPPType = icsneo::FlexRay::Cluster::SPPType;
 };
 
-void init_extension(pybind11::class_<FlexRayNamespace>& c) {
-    pybind11::class_<MessageBuffer, std::shared_ptr<MessageBuffer>>(c, "MessageBuffer")
+void init_extension(pybind11::classh<FlexRayNamespace>& c) {
+    pybind11::classh<MessageBuffer>(c, "MessageBuffer")
         .def(pybind11::init())
         .def_readwrite("is_dynamic", &MessageBuffer::isDynamic)
         .def_readwrite("is_sync", &MessageBuffer::isSync)
@@ -39,7 +39,7 @@ void init_extension(pybind11::class_<FlexRayNamespace>& c) {
         .def_readwrite("cycle_repetition", &MessageBuffer::cycleRepetition)
         .def_readwrite("continuous_mode", &MessageBuffer::continuousMode);
 
-    auto controller = pybind11::class_<Controller, std::shared_ptr<Controller>>(c, "Controller")
+    auto controller = pybind11::classh<Controller>(c, "Controller")
         .def("get_network", &Controller::getNetwork)
         .def("get_configuration", &Controller::getConfiguration)
         .def("set_configuration", &Controller::setConfiguration)
@@ -59,7 +59,7 @@ void init_extension(pybind11::class_<FlexRayNamespace>& c) {
         .def("freeze", &Controller::freeze)
         .def("trigger_mts", &Controller::triggerMTS);
 
-    pybind11::class_<Controller::Configuration>(controller, "Configuration")
+    pybind11::classh<Controller::Configuration>(controller, "Configuration")
         .def(pybind11::init())
         .def_readwrite("accept_startup_range_microticks", &Controller::Configuration::AcceptStartupRangeMicroticks)
         .def_readwrite("allow_passive_to_active_cycle_pairs", &Controller::Configuration::AllowPassiveToActiveCyclePairs)
@@ -93,7 +93,7 @@ void init_extension(pybind11::class_<FlexRayNamespace>& c) {
         .def_readwrite("wakeup_on_channel_b", &Controller::Configuration::WakeupOnChannelB);
 
     // Dummy class for cluster namespace
-    pybind11::class_<ClusterNamespace> cluster(c, "Cluster");
+    pybind11::classh<ClusterNamespace> cluster(c, "Cluster");
 
     pybind11::enum_<Cluster::SpeedType>(cluster, "SpeedType")
         .value("FLEXRAY_BAUDRATE_10M", Cluster::SpeedType::FLEXRAY_BAUDRATE_10M)
@@ -107,7 +107,7 @@ void init_extension(pybind11::class_<FlexRayNamespace>& c) {
         .value("FLEXRAY_SPP_6", Cluster::SPPType::FLEXRAY_SPP_6)
         .value("FLEXRAY_SPP_5_ALT", Cluster::SPPType::FLEXRAY_SPP_5_ALT);
 
-    pybind11::class_<Cluster::Configuration>(cluster, "Configuration")
+    pybind11::classh<Cluster::Configuration>(cluster, "Configuration")
         .def(pybind11::init())
         .def_readwrite("speed", &Cluster::Configuration::Speed)
         .def_readwrite("strobe_point_position", &Cluster::Configuration::StrobePointPosition)
@@ -143,7 +143,7 @@ void init_extension(pybind11::class_<FlexRayNamespace>& c) {
 } // namespace FlexRay
 
 void init_flexraymessage(pybind11::module_& m) {
-	pybind11::class_<FlexRayMessage, std::shared_ptr<FlexRayMessage>, Frame>(m, "FlexRayMessage")
+	pybind11::classh<FlexRayMessage, Frame>(m, "FlexRayMessage")
 		.def(pybind11::init())
 		.def_readwrite("slotid", &FlexRayMessage::slotid)
 		.def_readwrite("tsslen", &FlexRayMessage::tsslen)
@@ -166,7 +166,7 @@ void init_flexraymessage(pybind11::module_& m) {
 
 void init_flexray(pybind11::module_& m) {
     // Dummy class to act as FlexRay namespace
-    pybind11::class_<FlexRayNamespace> flexray(m, "FlexRay");
+    pybind11::classh<FlexRayNamespace> flexray(m, "FlexRay");
     
     pybind11::enum_<FlexRayNamespace::Symbol>(flexray, "Symbol")
         .value("None", FlexRayNamespace::Symbol::None)

bindings/python/icsneopy/icsneocpp.cpp

@@ -22,7 +22,7 @@ void init_gptpstatusmessage(pybind11::module_&);
 void init_mdiomessage(pybind11::module_&);
 void init_spimessage(pybind11::module_&);
 void init_ethernetstatusmessage(pybind11::module_&);
-void init_macsecmessage(pybind11::module_&);
+void init_macsecconfig(pybind11::module_&);
 void init_scriptstatusmessage(pybind11::module_&);
 void init_diskdriver(pybind11::module_&);
 void init_deviceextension(pybind11::module_&);
@@ -57,7 +57,7 @@ PYBIND11_MODULE(icsneopy, m) {
 	init_gptpstatusmessage(m);
 	init_mdiomessage(m);
 	init_ethernetstatusmessage(m);
-	init_macsecmessage(m);
+	init_macsecconfig(m);
 	init_scriptstatusmessage(m);
 	init_spimessage(m);
 	init_messagefilter(m);

communication/encoder.cpp

@@ -56,6 +56,7 @@ bool Encoder::encode(const Packetizer& packetizer, std::vector<uint8_t>& result,
 
 					break;
 				}
+				case Network::Type::Internal:
 				case Network::Type::CAN:
 				case Network::Type::SWCAN:
 				case Network::Type::LSFTCAN: {
@@ -284,6 +285,7 @@ bool Encoder::encode(const Packetizer& packetizer, std::vector<uint8_t>& result,
 			case Command::RequestSerialNumber:
 			case Command::EnableNetworkCommunication:
 			case Command::EnableNetworkCommunicationEx:
+			case Command::KeepAlive:
 			case Command::GetMainVersion:
 			case Command::GetSecondaryVersions:
 			case Command::NeoReadMemory:

communication/message/macsecmessage.cpp

@@ -1,531 +0,0 @@
-#include "icsneo/communication/message/macsecmessage.h"
-
-#include "icsneo/communication/crc32.h"
-#include <memory>
-#include <cstdint>
-#include <iostream>
-#include <cstring>
-
-namespace icsneo
-{
-
-#ifdef _MSC_VER
-#pragma warning(push)
-#pragma warning(disable : 4201) // nameless struct/union
-#endif
-
-#pragma pack(push, 1)
-/* MACsec Rule */
-/**
- * @brief Structure of Vlan tag
- *
- */
-typedef struct
-{
-	uint16_t vid; /*!< 12 bits */
-	uint8_t priCfi; /*!< PRI - 3 bits, CFI - 1bit */
-} MACSEC_VLANTAG_t;
-/**
- * @brief Structure of MPLS
- *
- */
-typedef struct
-{
-	uint32_t mplsLabel; /*!< 20 bits */
-	uint8_t exp; /*!< 3 bits */
-} MACSEC_MPLS_OUTER_t;
-/**
- * @brief Define Encoded Packet Type from the parser
- *
- */
-static constexpr int MACSEC_SETTINGS_RULE_SIZE = 88;
-typedef union _MACSecRule
-{
-	struct
-	{
-		uint8_t index;
-		uint8_t keyMacDa[6]; /*!< MAC DA field extracted from the packet */
-		uint8_t maskMacDa[6]; /*!< Set bits to 1 to mask/exclude corresponding flowid_tcam_data bit from compare */
-		uint8_t keyMacSa[6]; /*!< MAC SA field extracted from the packet */
-		uint8_t maskMacSa[6]; /*!< Set bits to 1 to mask/exclude corresponding flowid_tcam_data bit from compare */
-		uint16_t keyEthertype; /*!< First E-Type found in the packet that doesn't match one of the preconfigured custom tag. */
-		uint16_t maskEthertype; /*!< Set bits to 1 to mask/exclude corresponding flowid_tcam_data bit from compare */
-		MACSEC_VLANTAG_t keyVlanTagOuter1; /*!< outermost/1st VLAN ID {8'd0, VLAN_ID[11:0]}, or 20-bit MPLS label. */
-		MACSEC_MPLS_OUTER_t keyMplsOuter1;
-		MACSEC_VLANTAG_t maskVlanTagOuter1; /*!< Set bits to 1 to mask/exclude corresponding flowid_tcam_data bit from compare */
-		MACSEC_MPLS_OUTER_t maskMplsOuter1;
-		MACSEC_VLANTAG_t keyVlanTagOuter2; /*!< 2nd outermost VLAN ID {8'd0, VLAN_ID[11:0]}, or 20-bit MPLS label. */
-		MACSEC_MPLS_OUTER_t keyMplsOuter2;
-		MACSEC_VLANTAG_t maskVlanTagOuter2; /*!< Set bits to 1 to mask/exclude corresponding flowid_tcam_data bit from compare */
-		MACSEC_MPLS_OUTER_t maskMplsOuter2;
-		uint16_t keyBonusData; /*!< 2 bytes of additional bonus data extracted from one of the custom tags. */
-		uint16_t maskBonusData; /*!< Set bits to 1 to mask/exclude corresponding flowid_tcam_data bit from compare */
-		uint8_t
-			keyTagMatchBitmap; /*!< 8 bits total. Maps 1 to 1 bitwise with the set of custom tags. (set bit[N]=1 if check Nth custom tag) */
-		uint8_t maskTagMatchBitmap; /*!< Set bits to 1 to mask/exclude corresponding flowid_tcam_data bit from compare */
-		uint8_t keyPacketType; /*!< Encoded Packet Type, see MACSEC_PACKET_TYPE */
-		uint8_t maskPacketType; /*!< Set bits to 1 to mask/exclude corresponding flowid_tcam_data bit from compare */
-		uint16_t
-			keyInnerVlanType; /*!< 3 bits total. Encoded value indicating which VLAN TPID value matched for the second outermost VLAN Tag. */
-		uint16_t maskInnerVlanType; /*!< Set bits to 1 to mask/exclude corresponding flowid_tcam_data bit from compare */
-		uint16_t keyOuterVlanType; /*!< 3 bits total. Encoded value indicating which VLAN TPID value matched for the outermost VLAN Tag. */
-		uint16_t maskOuterVlanType; /*!< Set bits to 1 to mask/exclude corresponding flowid_tcam_data bit from compare */
-		uint8_t
-			keyNumTags; /*!< 7 bits total. Number of VLAN/custom tags or MPLS lables detected. Ingress: before SecTag; Egress: total detected. Exclude MCS header tags. i.e. Bit 2: 2 tags/labels before SecTAG...Bit 6: 6 or more tags/labels before SecTAG. */
-		uint8_t maskNumTags; /*!< Set bits to 1 to mask/exclude corresponding flowid_tcam_data bit from compare */
-		uint8_t keyExpress; /*!< 1 bits. Express packet. */
-		uint8_t maskExpress; /*!< Set bits to 1 to mask/exclude corresponding flowid_tcam_data bit from compare */
-		uint8_t isMpls;
-		uint8_t rsvd[5];
-		uint8_t enable;
-	};
-	uint8_t byte[MACSEC_SETTINGS_RULE_SIZE];
-} MACSecRule_t;
-/* MACsec Map */
-static constexpr int MACSEC_SETTINGS_MAP_SIZE = 20;
-typedef union _MACSecMap
-{
-	struct
-	{
-		uint8_t index;
-		uint64_t secTagSci; /*!< Identifies the SecTAG SCI for this Flow. */
-		uint8_t secYIndex; /*!< index for entry in Egress secY Policy */
-		uint8_t isControlPacket; /*!< Identifies all packets matching this index lookup as control packets. */
-		uint8_t scIndex; /*!< Identifies the SC for this Flow. */
-		uint8_t auxiliaryPlcy; /*!< Auxiliary policy bits. */
-		uint8_t ruleId; /*!< Identifies the Rule for this Flow. */
-		uint8_t rsvd[5];
-		uint8_t enable;
-	};
-	uint8_t byte[MACSEC_SETTINGS_MAP_SIZE];
-} MACSecMap_t;
-/* MACsec SecY */
-/**
- * @brief Define the permit police for frames as defined in 802.1ae
- *
- */
-static constexpr int MACSEC_SETTINGS_SECY_SIZE = 24;
-typedef union _MACSecSecY
-{
-	struct
-	{
-		uint8_t index; /*!< Identifies the SecY for this Flow. */
-		uint8_t controlledPortEnabled; /*!< Enable (or disable) operation of the Controlled port associated with this SecY */
-		uint8_t frameValidationType; /*!< see MACSEC_VALIDATEFRAME */
-		uint8_t secTagIcvStripType; /*!< see MACSEC_STRIP_SECTAG_ICV */
-		uint8_t cipher; /*!< Define the cipher suite to use for this SecY see MACSEC_CIPHER_SUITE */
-		uint8_t confidentialOffset; /*!< Define the number of bytes that are unencrypted following the SecTag. */
-		uint8_t icvIncludesDaSa; /*!< When set, the outer DA/SA bytes are included in the authentication GHASH calculation */
-		uint8_t replayProtect; /*!< Enables Anti-Replay protection */
-		uint32_t replayWindow; /*!< Unsigned value indicating the size of the anti-replay window. */
-		uint8_t
-			protectFrames; /*!< 0 = do not encrypt or authenticate this packet; 1 = always Authenticate frame and if SecTag.TCI.E = 1 encrypt the packet as well. */
-		uint8_t
-			secTagOffset; /*!< Define the offset in bytes from either the start of the packet or a matching Etype depending on SecTag_Insertion_Mode. */
-		uint8_t secTagTci; /*!< Tag Control Information excluding the AN field which originates from the SA Policy table */
-		uint16_t mtu; /*!< Specifies the outgoing MTU for this SecY */
-		uint8_t rsvd[6];
-		uint8_t enable;
-	};
-	uint8_t byte[MACSEC_SETTINGS_SECY_SIZE];
-} MACSecSecY_t;
-/* MACsec SC */
-static constexpr int MACSEC_SETTINGS_SC_SIZE = 24;
-typedef union _MACSecSc
-{
-	struct
-	{
-		uint8_t index; /*!< SC index. */
-		uint8_t secYIndex; /*!< SecY associated with this packet. */
-		uint64_t sci; /*!< The Secure Channel Identifier. */
-		uint8_t saIndex0; /*!< Define the 1st SA to use */
-		uint8_t saIndex1; /*!< Define the 2nd SA to use */
-		uint8_t saIndex0InUse; /*!< Specifies whether 1st SA is in use or not. */
-		uint8_t saIndex1InUse; /*!< Specifies whether 2nd SA is in use or not.  */
-		uint8_t enableAutoRekey; /*!< If enabled, then once the pn_threshold is reached, auto rekey will happen. */
-		uint8_t
-			isActiveSa1; /*!< If set, then sa_index1 is the currently active SA index. If cleared, the sa_index0 is the currently active SA index). */
-		uint8_t rsvd[7];
-		uint8_t enable;
-	};
-	uint8_t byte[MACSEC_SETTINGS_SC_SIZE];
-} MACSecSc_t;
-/* MACsec SA */
-static constexpr int MACSEC_SETTINGS_SA_SIZE = 80;
-typedef union _MACSecSa
-{
-	struct
-	{
-		uint8_t index; /*!< SA index */
-		uint8_t
-			sak[32]; /*!< 256b SAK: Define the encryption key to be used to encrypte this packet. The lower 128 bits are used for 128-bit ciphers. */
-		uint8_t hashKey[16]; /*!< 128b Hash Key: Key used for authentication. */
-		uint8_t salt[12]; /*!< 96b Salt value: Salt value used in XPN ciphers. */
-		uint32_t ssci; /*!< 32b SSCI value: Short Secure Channel Identifier, used in XPN ciphers. */
-		uint8_t an; /*!< 2b SecTag Association Number (AN) */
-		uint64_t nextPn; /*!< 64b next_pn value: Next packet number to insert into outgoing packet on a particular SA. */
-		uint8_t rsvd[5];
-		uint8_t enable;
-	};
-	uint8_t byte[MACSEC_SETTINGS_SA_SIZE];
-} MACSecSa_t;
-/* MACsec Flags */
-typedef union _MACSecFlags
-{
-	struct
-	{
-		uint32_t en : 1; // '1' = enable; '0' = disable
-		uint32_t reserved : 31;
-	};
-	uint32_t flags_32b;
-} MACSecFlags_t;
-#define MACSEC_SETTINGS_FLAGS_SIZE (4)
-/* MACSec Settings for 1 port/phy */
-typedef struct MACSEC_CONFIG_t
-{
-	MACSecFlags_t flags;
-	MACSecRule_t rule[MACsecConfig::NumRules];
-	MACSecMap_t map[MACsecConfig::NumMaps];
-	MACSecSecY_t secy[MACsecConfig::NumSecY];
-	MACSecSc_t sc[MACsecConfig::NumSc];
-	MACSecSa_t sa[MACsecConfig::NumSa];
-} MACSEC_CONFIG;
-typedef union _MACSecGlobalFlags
-{
-	struct
-	{
-		uint32_t en : 1; // '1' = enable; '0' = disable
-		uint32_t nvm : 1; // store macsec config in non-volatile memory
-		uint32_t reserved : 30;
-	};
-	uint32_t flags_32b;
-} MACSecGlobalFlags_t;
-#define MACSEC_SETTINGS_SIZE (2040) // leave space for expansion and keep nicely aligned for flashing
-typedef union _MACSEC_SETTINGS
-{
-	struct
-	{
-		MACSecGlobalFlags_t flags;
-		MACSEC_CONFIG rx;
-		MACSEC_CONFIG tx;
-	};
-	uint8_t byte[MACSEC_SETTINGS_SIZE];
-} MACSEC_SETTINGS;
-
-#define MACSEC_SETTINGS_VERSION 1
-struct MACSEC_SETTINGS_W_HDR
-{
-	uint16_t version;
-	uint16_t len;
-	uint32_t crc32;
-	MACSEC_SETTINGS macsec;
-};
-
-#pragma pack(pop)
-
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
-
-std::shared_ptr<MACsecMessage> MACsecMessage::DecodeToMessage(const std::vector<uint8_t>& bytestream, const device_eventhandler_t& report)
-{
-	if (bytestream.empty() || (bytestream.size() < sizeof(MACSEC_SETTINGS_W_HDR)))
-	{
-		report(APIEvent::Type::RequiredParameterNull, APIEvent::Severity::Error);
-		return nullptr;
-	}
-
-	MACSEC_SETTINGS_W_HDR* macsecArgs = (MACSEC_SETTINGS_W_HDR*)bytestream.data();
-	if (macsecArgs->version != MACSEC_SETTINGS_VERSION)
-	{
-		report(APIEvent::Type::SettingsVersionError, APIEvent::Severity::Error);
-		return nullptr;
-	}
-	if (macsecArgs->len != sizeof(MACSEC_SETTINGS))
-	{
-		report(APIEvent::Type::SettingsLengthError, APIEvent::Severity::Error);
-		return nullptr;
-	}
-	const auto crcCalculted = crc32(0, (uint8_t*)&macsecArgs->macsec, macsecArgs->len);
-	if (macsecArgs->crc32 != crcCalculted)
-	{
-		report(APIEvent::Type::SettingsChecksumError, APIEvent::Severity::Error);
-		return nullptr;
-	}
-
-	auto msg = std::make_shared<MACsecMessage>();
-
-	const auto& copyConfig = [](const MACSEC_CONFIG& source, MACsecConfig& dest)
-	{
-		dest.flags.en = source.flags.en;
-		for (int index = 0; index < MACsecConfig::NumRules; index++)
-		{
-			if(!source.rule[index].enable) continue;
-#undef __COPY_ITEM
-#define __COPY_ITEM(___name__) dest.rule[index].___name__ = (decltype(dest.rule[index].___name__))source.rule[index].___name__
-#undef __COPY_ARR
-#define __COPY_ARR(___name__) (void)memcpy(dest.rule[index].___name__.data(), source.rule[index].___name__, dest.rule[index].___name__.size())
-			__COPY_ITEM(index);
-			__COPY_ARR(keyMacDa);
-			__COPY_ARR(maskMacDa);
-			__COPY_ARR(keyMacSa);
-			__COPY_ARR(maskMacSa);
-			__COPY_ITEM(keyVlanTagOuter1.vid);
-			__COPY_ITEM(keyVlanTagOuter1.priCfi);
-			__COPY_ITEM(keyMplsOuter1.mplsLabel);
-			__COPY_ITEM(keyMplsOuter1.exp);
-			__COPY_ITEM(maskVlanTagOuter1.vid);
-			__COPY_ITEM(maskVlanTagOuter1.priCfi);
-			__COPY_ITEM(maskMplsOuter1.mplsLabel);
-			__COPY_ITEM(maskMplsOuter1.exp);
-			__COPY_ITEM(keyVlanTagOuter2.vid);
-			__COPY_ITEM(keyVlanTagOuter2.priCfi);
-			__COPY_ITEM(keyMplsOuter2.mplsLabel);
-			__COPY_ITEM(keyMplsOuter2.exp);
-			__COPY_ITEM(maskVlanTagOuter2.vid);
-			__COPY_ITEM(maskVlanTagOuter2.priCfi);
-			__COPY_ITEM(maskMplsOuter2.mplsLabel);
-			__COPY_ITEM(maskMplsOuter2.exp);
-			__COPY_ITEM(keyEthertype);
-			__COPY_ITEM(maskEthertype);
-			__COPY_ITEM(keyBonusData);
-			__COPY_ITEM(maskBonusData);
-			__COPY_ITEM(keyTagMatchBitmap);
-			__COPY_ITEM(maskTagMatchBitmap);
-			__COPY_ITEM(keyPacketType);
-			__COPY_ITEM(maskPacketType);
-			__COPY_ITEM(keyInnerVlanType);
-			__COPY_ITEM(maskInnerVlanType);
-			__COPY_ITEM(keyOuterVlanType);
-			__COPY_ITEM(maskOuterVlanType);
-			__COPY_ITEM(keyNumTags);
-			__COPY_ITEM(maskNumTags);
-			__COPY_ITEM(keyExpress);
-			__COPY_ITEM(maskExpress);
-			__COPY_ITEM(isMpls);
-			__COPY_ITEM(enable);
-		}
-
-		for (int index = 0; index < MACsecConfig::NumMaps; index++)
-		{
-			if(!source.map[index].enable) continue;
-#undef __COPY_ITEM
-#define __COPY_ITEM(___name__) dest.map[index].___name__ = source.map[index].___name__
-			__COPY_ITEM(index);
-			__COPY_ITEM(secTagSci);
-			__COPY_ITEM(secYIndex);
-			__COPY_ITEM(isControlPacket);
-			__COPY_ITEM(scIndex);
-			__COPY_ITEM(auxiliaryPlcy);
-			__COPY_ITEM(ruleId);
-			__COPY_ITEM(enable);
-		}
-
-		for (int index = 0; index < MACsecConfig::NumSecY; index++)
-		{
-			if(!source.secy[index].enable) continue;
-#undef __COPY_ITEM
-#define __COPY_ITEM(___name__) dest.secy[index].___name__ = (decltype(dest.secy[index].___name__))source.secy[index].___name__
-			__COPY_ITEM(index);
-			__COPY_ITEM(controlledPortEnabled);
-			__COPY_ITEM(frameValidationType);
-			__COPY_ITEM(secTagIcvStripType);
-			__COPY_ITEM(cipher);
-			__COPY_ITEM(confidentialOffset);
-			__COPY_ITEM(icvIncludesDaSa);
-			__COPY_ITEM(replayProtect);
-			__COPY_ITEM(replayWindow);
-			__COPY_ITEM(protectFrames);
-			__COPY_ITEM(secTagOffset);
-			__COPY_ITEM(secTagTci);
-			__COPY_ITEM(mtu);
-			__COPY_ITEM(enable);
-		}
-
-		for (int index = 0; index < MACsecConfig::NumSc; index++)
-		{
-			if(!source.sc[index].enable) continue;
-#undef __COPY_ITEM
-#define __COPY_ITEM(___name__) dest.sc[index].___name__ = source.sc[index].___name__
-			__COPY_ITEM(index);
-			__COPY_ITEM(secYIndex);
-			__COPY_ITEM(sci);
-			__COPY_ITEM(saIndex0);
-			__COPY_ITEM(saIndex1);
-			__COPY_ITEM(saIndex0InUse);
-			__COPY_ITEM(saIndex1InUse);
-			__COPY_ITEM(enableAutoRekey);
-			__COPY_ITEM(isActiveSa1);
-			__COPY_ITEM(enable);
-		}
-
-		for (int index = 0; index < MACsecConfig::NumSa; index++)
-		{
-			if(!source.sa[index].enable) continue;
-#undef __COPY_ITEM
-#define __COPY_ITEM(___name__) dest.sa[index].___name__ = source.sa[index].___name__
-#undef __COPY_ARR
-#define __COPY_ARR(___name__) (void)memcpy(dest.sa[index].___name__.data(), source.sa[index].___name__, dest.sa[index].___name__.size())
-			__COPY_ITEM(index);
-			__COPY_ARR(sak);
-			__COPY_ARR(hashKey);
-			__COPY_ARR(salt);
-			__COPY_ITEM(ssci);
-			__COPY_ITEM(an);
-			__COPY_ITEM(nextPn);
-			__COPY_ITEM(enable);
-		}
-	};
-
-	msg->flags.en = macsecArgs->macsec.flags.en;
-	copyConfig(macsecArgs->macsec.rx, msg->rx);
-	copyConfig(macsecArgs->macsec.tx, msg->tx);
-
-	return msg;
-}
-
-bool MACsecMessage::EncodeFromMessage(std::vector<uint8_t>& bytestream, const device_eventhandler_t& report) const
-{
-	MACSEC_SETTINGS_W_HDR* macsecArgs;
-
-	bytestream.resize(sizeof(MACSEC_SETTINGS_W_HDR), 0);
-	macsecArgs = (MACSEC_SETTINGS_W_HDR*)bytestream.data();
-
-	macsecArgs->version = MACSEC_SETTINGS_VERSION;
-	macsecArgs->len = sizeof(MACSEC_SETTINGS_W_HDR);
-
-	const auto& copyConfig = [](const MACsecConfig& source, MACSEC_CONFIG& dest)
-	{
-		dest.flags.en = (uint8_t)source.flags.en;
-		for (int index = 0; index < MACsecConfig::NumRules; index++)
-		{
-			if(!source.rule[index].enable) continue;
-#undef __COPY_ITEM
-#define __COPY_ITEM(___name__) dest.rule[index].___name__ = (decltype(dest.rule[index].___name__))source.rule[index].___name__
-#undef __COPY_ARR
-#define __COPY_ARR(___name__) (void)memcpy(dest.rule[index].___name__, source.rule[index].___name__.data(), source.rule[index].___name__.size())
-			__COPY_ITEM(index);
-			__COPY_ARR(keyMacDa);
-			__COPY_ARR(maskMacDa);
-			__COPY_ARR(keyMacSa);
-			__COPY_ARR(maskMacSa);
-			__COPY_ITEM(keyVlanTagOuter1.vid);
-			__COPY_ITEM(keyVlanTagOuter1.priCfi);
-			__COPY_ITEM(keyMplsOuter1.mplsLabel);
-			__COPY_ITEM(keyMplsOuter1.exp);
-			__COPY_ITEM(maskVlanTagOuter1.vid);
-			__COPY_ITEM(maskVlanTagOuter1.priCfi);
-			__COPY_ITEM(maskMplsOuter1.mplsLabel);
-			__COPY_ITEM(maskMplsOuter1.exp);
-			__COPY_ITEM(keyVlanTagOuter2.vid);
-			__COPY_ITEM(keyVlanTagOuter2.priCfi);
-			__COPY_ITEM(keyMplsOuter2.mplsLabel);
-			__COPY_ITEM(keyMplsOuter2.exp);
-			__COPY_ITEM(maskVlanTagOuter2.vid);
-			__COPY_ITEM(maskVlanTagOuter2.priCfi);
-			__COPY_ITEM(maskMplsOuter2.mplsLabel);
-			__COPY_ITEM(maskMplsOuter2.exp);
-			__COPY_ITEM(keyEthertype);
-			__COPY_ITEM(maskEthertype);
-			__COPY_ITEM(keyBonusData);
-			__COPY_ITEM(maskBonusData);
-			__COPY_ITEM(keyTagMatchBitmap);
-			__COPY_ITEM(maskTagMatchBitmap);
-			__COPY_ITEM(keyPacketType);
-			__COPY_ITEM(maskPacketType);
-			__COPY_ITEM(keyInnerVlanType);
-			__COPY_ITEM(maskInnerVlanType);
-			__COPY_ITEM(keyOuterVlanType);
-			__COPY_ITEM(maskOuterVlanType);
-			__COPY_ITEM(keyNumTags);
-			__COPY_ITEM(maskNumTags);
-			__COPY_ITEM(keyExpress);
-			__COPY_ITEM(maskExpress);
-			__COPY_ITEM(isMpls);
-			__COPY_ITEM(enable);
-		}
-
-		for (int index = 0; index < MACsecConfig::NumMaps; index++)
-		{
-			if(!source.map[index].enable) continue;
-#undef __COPY_ITEM
-#define __COPY_ITEM(___name__) dest.map[index].___name__ = source.map[index].___name__
-			__COPY_ITEM(index);
-			__COPY_ITEM(secTagSci);
-			__COPY_ITEM(secYIndex);
-			__COPY_ITEM(isControlPacket);
-			__COPY_ITEM(scIndex);
-			__COPY_ITEM(auxiliaryPlcy);
-			__COPY_ITEM(ruleId);
-			__COPY_ITEM(enable);
-		}
-
-		for (int index = 0; index < MACsecConfig::NumSecY; index++)
-		{
-			if(!source.secy[index].enable) continue;
-#undef __COPY_ITEM
-#define __COPY_ITEM(___name__) dest.secy[index].___name__ = (decltype(dest.secy[index].___name__))source.secy[index].___name__
-			__COPY_ITEM(index);
-			__COPY_ITEM(controlledPortEnabled);
-			__COPY_ITEM(frameValidationType);
-			__COPY_ITEM(secTagIcvStripType);
-			__COPY_ITEM(cipher);
-			__COPY_ITEM(confidentialOffset);
-			__COPY_ITEM(icvIncludesDaSa);
-			__COPY_ITEM(replayProtect);
-			__COPY_ITEM(replayWindow);
-			__COPY_ITEM(protectFrames);
-			__COPY_ITEM(secTagOffset);
-			__COPY_ITEM(secTagTci);
-			__COPY_ITEM(mtu);
-			__COPY_ITEM(enable);
-		}
-
-		for (int index = 0; index < MACsecConfig::NumSc; index++)
-		{
-			if(!source.sc[index].enable) continue;
-#undef __COPY_ITEM
-#define __COPY_ITEM(___name__) dest.sc[index].___name__ = source.sc[index].___name__
-			__COPY_ITEM(index);
-			__COPY_ITEM(secYIndex);
-			__COPY_ITEM(sci);
-			__COPY_ITEM(saIndex0);
-			__COPY_ITEM(saIndex1);
-			__COPY_ITEM(saIndex0InUse);
-			__COPY_ITEM(saIndex1InUse);
-			__COPY_ITEM(enableAutoRekey);
-			__COPY_ITEM(isActiveSa1);
-			__COPY_ITEM(enable);
-		}
-
-		for (int index = 0; index < MACsecConfig::NumSa; index++)
-		{
-			if(!source.sa[index].enable) continue;
-#undef __COPY_ITEM
-#define __COPY_ITEM(___name__) dest.sa[index].___name__ = source.sa[index].___name__
-#undef __COPY_ARR
-#define __COPY_ARR(___name__) (void)memcpy(dest.sa[index].___name__, source.sa[index].___name__.data(), source.sa[index].___name__.size())
-			__COPY_ITEM(index);
-			__COPY_ARR(sak);
-			__COPY_ARR(hashKey);
-			__COPY_ARR(salt);
-			__COPY_ITEM(ssci);
-			__COPY_ITEM(an);
-			__COPY_ITEM(nextPn);
-			__COPY_ITEM(enable);
-		}
-	};
-	macsecArgs->macsec.flags.en = this->flags.en;
-	macsecArgs->macsec.flags.nvm = this->flags.nvm;
-
-	copyConfig(this->rx, macsecArgs->macsec.rx);
-	copyConfig(this->tx, macsecArgs->macsec.tx);
-
-	macsecArgs->crc32 = crc32(0, (uint8_t*)&macsecArgs->macsec, sizeof(MACSEC_SETTINGS));
-
-	(void)report;
-
-	return true;
-}
-
-} // namespace icsneo

communication/message/transmitmessage.cpp

@@ -104,6 +104,7 @@ static std::vector<uint8_t> EncodeFromMessageCAN(std::shared_ptr<Frame> frame, c
 		canpacket->header.BRS = canmsg->baudrateSwitch ? 1 : 0;
 		canpacket->header.ESI = canmsg->errorStateIndicator ? 1 : 0;
 		canpacket->dlc.RTR = 0;
+		canpacket->timestamp.IsExtended = 1;
 
 	} else {
 		canpacket->header.EDL = 0;
@@ -139,6 +140,7 @@ std::vector<uint8_t> TransmitMessage::EncodeFromMessage(std::shared_ptr<Frame> f
 		case Network::Type::AutomotiveEthernet:
 			result = EncodeFromMessageEthernet(frame, report);
 			break;
+		case Network::Type::Internal:
 		case Network::Type::CAN:
 			result = EncodeFromMessageCAN(frame, report);
 			break;

communication/ringbuffer.cpp

@@ -1,91 +0,0 @@
-#include "icsneo/communication/ringbuffer.h"
-#include <stdexcept>
-
-namespace icsneo {
-    
-RingBuffer::RingBuffer(size_t bufferSize) : readCursor(0), writeCursor(0) {
-    // round the buffer size to the nearest power of 2
-    bufferSize = RoundUp(bufferSize);
-    mask = bufferSize - 1;
-    buf = new uint8_t[bufferSize];
-}
-
-RingBuffer::~RingBuffer() {
-    delete[] buf;
-    buf = nullptr;
-}
-
-const uint8_t& RingBuffer::operator[](size_t offset) const { 
-    return get(offset); 
-}
-
-size_t RingBuffer::size() const { 
-    // The values in the cursors are monotonic, i.e. they only ever increment. They can be considered to be the total number of elements ever written or read
-    auto currentWriteCursor = writeCursor.load(std::memory_order_relaxed);
-    auto currentReadCursor = readCursor.load(std::memory_order_relaxed);
-    // Using unmasked values, writeCursor is guaranteed to be >= readCursor. If they are equal that means the buffer is empty
-    return currentWriteCursor - currentReadCursor; 
-}
-
-void RingBuffer::pop_front() {
-    pop(1);
-}
-
-void RingBuffer::pop(size_t count) {
-    if (size() < count) {
-        throw std::runtime_error("RingBuffer: Underflow");
-    }
-    readCursor.fetch_add(count, std::memory_order_release);
-}
-
-const uint8_t& RingBuffer::get(size_t offset) const {
-    if (offset >= size()) {
-        throw std::runtime_error("RingBuffer: Index out of range");
-    }
-    auto currentReadCursor = readCursor.load(std::memory_order_acquire);
-    return *resolve(currentReadCursor, offset);
-}
-
-bool RingBuffer::write(const uint8_t* addr, size_t length) {    
-    const auto freeSpace = (capacity() - size());
-    if (length > freeSpace) {
-        return false;
-    }
-    auto currentWriteCursor = writeCursor.load(std::memory_order_relaxed);
-    auto spaceAtEnd = std::min(freeSpace, capacity() - (currentWriteCursor & mask)); // number of bytes from (masked) writeCursor to the end of the writable space (i.e. we reach the masked read cursor or the end of the buffer)
-    auto firstCopySize = std::min(spaceAtEnd, length);
-    (void)memcpy(resolve(currentWriteCursor, 0), addr, firstCopySize);
-    if (firstCopySize < length)
-    {
-        (void)memcpy(buf, &addr[firstCopySize], length - firstCopySize);
-    }
-
-    writeCursor.store(currentWriteCursor + length, std::memory_order_release);
-    return true;
-}
-
-bool RingBuffer::write(const std::vector<uint8_t>& source) {
-    return write(source.data(), source.size());
-}
-
-bool RingBuffer::read(uint8_t* dest, size_t startIndex, size_t length) const {
-    auto currentSize = size();
-    if ((startIndex >= currentSize) || ((startIndex + length) > size())) {
-        return false;
-    }
-    auto currentReadCursor = readCursor.load(std::memory_order_relaxed);
-    auto bytesAtEnd = std::min<size_t>(capacity() - ((currentReadCursor + startIndex) & mask), length);
-    const auto bytesAtStart = (length - bytesAtEnd);
-
-    (void)memcpy(dest, resolve(currentReadCursor, startIndex), bytesAtEnd);
-    if (bytesAtStart > 0) {
-        (void)memcpy(&dest[bytesAtEnd], buf, bytesAtStart);
-    }
-    return true;
-}
-
-void RingBuffer::clear() {
-    pop(size());
-}
-
-}

core/crc32.cpp

@@ -4,8 +4,7 @@
  *  Created on: Jun 22, 2020
  *      Author: BJones
  */
-#include "icsneo/communication/crc32.h"
-#include <stddef.h>
+#include "icsneo/core/crc32.h"
 
 static const unsigned long crc32_table[256] = { 0x00000000, 0x77073096, 0xEE0E612C, 0x990951BA, 0x076DC419, 0x706AF48F, 0xE963A535,
 	0x9E6495A3, 0x0EDB8832, 0x79DCB8A4, 0xE0D5E91E, 0x97D2D988, 0x09B64C2B, 0x7EB17CBD, 0xE7B82D07, 0x90BF1D91, 0x1DB71064, 0x6AB020F2,
@@ -32,7 +31,7 @@ static const unsigned long crc32_table[256] = { 0x00000000, 0x77073096, 0xEE0E61
 	0x47B2CF7F, 0x30B5FFE9, 0xBDBDF21C, 0xCABAC28A, 0x53B39330, 0x24B4A3A6, 0xBAD03605, 0xCDD70693, 0x54DE5729, 0x23D967BF, 0xB3667A2E,
 	0xC4614AB8, 0x5D681B02, 0x2A6F2B94, 0xB40BBE37, 0xC30C8EA1, 0x5A05DF1B, 0x2D02EF8D };
 
-uint32_t crc32(uint32_t crc, const unsigned char* buf, uint32_t len)
+uint32_t icsneo::crc32(uint32_t crc, const unsigned char* buf, uint32_t len)
 {
 	unsigned char octet;
 	const unsigned char* p = buf;
@@ -50,13 +49,13 @@ static unsigned char rev_crc32_table[256];
 
 static void revgen(void)
 {
-	size_t k;
+	uint16_t k;
 
 	for (k = 0; k < 256; k++)
-		rev_crc32_table[crc32_table[k] >> 24] = (uint8_t)k;
+		rev_crc32_table[crc32_table[k] >> 24] = (unsigned char)k;
 }
 
-uint32_t revcrc32(uint32_t crc, const unsigned char* buf, uint32_t len)
+uint32_t icsneo::revcrc32(uint32_t crc, const unsigned char* buf, uint32_t len)
 {
 	unsigned char k;
 	revgen();

core/macseccfg.cpp

@@ -0,0 +1,776 @@
+#include "icsneo/core/macseccfg.h"
+#include "icsneo/api/eventmanager.h"
+#include "icsneo/core/crc32.h"
+#include <cstring>
+
+namespace icsneo {
+
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable : 4201) // nameless struct/union
+#endif
+
+#pragma pack(push, 1)
+
+typedef struct
+{
+	uint16_t VID; /*!< 12 bits */
+	uint8_t PRI_CFI; /*!< PRI - 3 bits, CFI - 1bit */
+} MACSEC_VLANTAG_t;
+/**
+ * @brief Structure of MPLS
+ *
+ */
+typedef struct
+{
+	uint32_t MPLS_label; /*!< 20 bits */
+	uint8_t exp; /*!< 3 bits */
+} MACSEC_MPLS_OUTER_t;
+
+#define MACSEC_SETTINGS_RULE_SIZE (88)
+typedef union _MACSecRule
+{
+	struct
+	{
+		uint8_t index;
+		uint8_t key_MAC_DA[6]; /*!< MAC DA field extracted from the packet */
+		uint8_t mask_MAC_DA[6]; /*!< Set bits to 1 to mask/exclude corresponding flowid_tcam_data bit from compare */
+		uint8_t key_MAC_SA[6]; /*!< MAC SA field extracted from the packet */
+		uint8_t mask_MAC_SA[6]; /*!< Set bits to 1 to mask/exclude corresponding flowid_tcam_data bit from compare */
+		uint16_t key_Ethertype; /*!< First E-Type found in the packet that doesn't match one of the preconfigured custom tag. */
+		uint16_t mask_Ethertype; /*!< Set bits to 1 to mask/exclude corresponding flowid_tcam_data bit from compare */
+		MACSEC_VLANTAG_t key_vlantag_outer1; /*!< outermost/1st VLAN ID {8'd0, VLAN_ID[11:0]}, or 20-bit MPLS label. */
+		MACSEC_MPLS_OUTER_t key_MPLS_outer1;
+		MACSEC_VLANTAG_t mask_vlantag_outer1; /*!< Set bits to 1 to mask/exclude corresponding flowid_tcam_data bit from compare */
+		MACSEC_MPLS_OUTER_t mask_MPLS_outer1;
+		MACSEC_VLANTAG_t key_vlantag_outer2; /*!< 2nd outermost VLAN ID {8'd0, VLAN_ID[11:0]}, or 20-bit MPLS label. */
+		MACSEC_MPLS_OUTER_t key_MPLS_outer2;
+		MACSEC_VLANTAG_t mask_vlantag_outer2; /*!< Set bits to 1 to mask/exclude corresponding flowid_tcam_data bit from compare */
+		MACSEC_MPLS_OUTER_t mask_MPLS_outer2;
+		uint16_t key_bonus_data; /*!< 2 bytes of additional bonus data extracted from one of the custom tags. */
+		uint16_t mask_bonus_data; /*!< Set bits to 1 to mask/exclude corresponding flowid_tcam_data bit from compare */
+		uint8_t
+			key_tag_match_bitmap; /*!< 8 bits total. Maps 1 to 1 bitwise with the set of custom tags. (set bit[N]=1 if check Nth custom tag) */
+		uint8_t mask_tag_match_bitmap; /*!< Set bits to 1 to mask/exclude corresponding flowid_tcam_data bit from compare */
+		MACsecPacketType key_packet_type; /*!< Encoded Packet Type, see MACSEC_PACKET_TYPE */
+		uint8_t mask_packet_type; /*!< Set bits to 1 to mask/exclude corresponding flowid_tcam_data bit from compare */
+		uint16_t
+			key_inner_vlan_type; /*!< 3 bits total. Encoded value indicating which VLAN TPID value matched for the second outermost VLAN Tag. */
+		uint16_t mask_inner_vlan_type; /*!< Set bits to 1 to mask/exclude corresponding flowid_tcam_data bit from compare */
+		uint16_t key_outer_vlan_type; /*!< 3 bits total. Encoded value indicating which VLAN TPID value matched for the outermost VLAN Tag. */
+		uint16_t mask_outer_vlan_type; /*!< Set bits to 1 to mask/exclude corresponding flowid_tcam_data bit from compare */
+		uint8_t
+			key_num_tags; /*!< 7 bits total. Number of VLAN/custom tags or MPLS lables detected. Ingress: before SecTag; Egress: total detected. Exclude MCS header tags. i.e. Bit 2: 2 tags/labels before SecTAG...Bit 6: 6 or more tags/labels before SecTAG. */
+		uint8_t mask_num_tags; /*!< Set bits to 1 to mask/exclude corresponding flowid_tcam_data bit from compare */
+		uint8_t key_express; /*!< 1 bits. Express packet. */
+		uint8_t mask_express; /*!< Set bits to 1 to mask/exclude corresponding flowid_tcam_data bit from compare */
+		uint8_t isMPLS;
+		uint8_t rsvd[5];
+		uint8_t enable;
+	};
+	uint8_t byte[MACSEC_SETTINGS_RULE_SIZE];
+} MACSecRule_t;
+/* MACsec Map */
+#define MACSEC_SETTINGS_MAP_SIZE (20)
+typedef union _MACSecMap
+{
+	struct
+	{
+		uint8_t index;
+		uint64_t sectag_sci; /*!< Identifies the SecTAG SCI for this Flow. */
+		uint8_t secYIndex; /*!< index for entry in Egress secY Policy */
+		uint8_t isControlPacket; /*!< Identifies all packets matching this index lookup as control packets. */
+		uint8_t scIndex; /*!< Identifies the SC for this Flow. */
+		uint8_t auxiliary_plcy; /*!< Auxiliary policy bits. */
+		uint8_t ruleId; /*!< Identifies the Rule for this Flow. */
+		uint8_t rsvd[5];
+		uint8_t enable;
+	};
+	uint8_t byte[MACSEC_SETTINGS_MAP_SIZE];
+} MACSecMap_t;
+/* MACsec SecY */
+
+#define MACSEC_SETTINGS_SECY_SIZE (24)
+typedef union _MACSecSecY
+{
+	struct
+	{
+		uint8_t index; /*!< Identifies the SecY for this Flow. */
+		uint8_t controlled_port_enabled; /*!< Enable (or disable) operation of the Controlled port associated with this SecY */
+		MACsecValidation validate_frames; /*!< see MACSEC_VALIDATEFRAME */
+		MACsecStrip strip_sectag_icv; /*!< see MACSEC_STRIP_SECTAG_ICV */
+		MACsecCipherSuite cipher; /*!< Define the cipher suite to use for this SecY */
+		uint8_t confidential_offset; /*!< Define the number of bytes that are unencrypted following the SecTag. */
+		uint8_t icv_includes_da_sa; /*!< When set, the outer DA/SA bytes are included in the authentication GHASH calculation */
+		uint8_t replay_protect; /*!< Enables Anti-Replay protection */
+		uint32_t replay_window; /*!< Unsigned value indicating the size of the anti-replay window. */
+		uint8_t
+			protect_frames; /*!< 0 = do not encrypt or authenticate this packet; 1 = always Authenticate frame and if SecTag.TCI.E = 1 encrypt the packet as well. */
+		uint8_t
+			sectag_offset; /*!< Define the offset in bytes from either the start of the packet or a matching Etype depending on SecTag_Insertion_Mode. */
+		uint8_t sectag_tci; /*!< Tag Control Information excluding the AN field which originates from the SA Policy table */
+		uint16_t mtu; /*!< Specifies the outgoing MTU for this SecY */
+		uint8_t rsvd[6];
+		uint8_t enable;
+	};
+	uint8_t byte[MACSEC_SETTINGS_SECY_SIZE];
+} MACSecSecY_t;
+/* MACsec SC */
+#define MACSEC_SETTINGS_SC_SIZE (24)
+typedef union _MACSecSc
+{
+	struct
+	{
+		uint8_t index; /*!< SC index. */
+		uint8_t secYIndex; /*!< SecY associated with this packet. */
+		uint64_t sci; /*!< The Secure Channel Identifier. */
+		uint8_t sa_index0; /*!< Define the 1st SA to use */
+		uint8_t sa_index1; /*!< Define the 2nd SA to use */
+		uint8_t sa_index0_in_use; /*!< Specifies whether 1st SA is in use or not. */
+		uint8_t sa_index1_in_use; /*!< Specifies whether 2nd SA is in use or not.  */
+		uint8_t enable_auto_rekey; /*!< If enabled, then once the pn_threshold is reached, auto rekey will happen. */
+		uint8_t
+			isActiveSA1; /*!< If set, then sa_index1 is the currently active SA index. If cleared, the sa_index0 is the currently active SA index). */
+		uint8_t rsvd[7];
+		uint8_t enable;
+	};
+	uint8_t byte[MACSEC_SETTINGS_SC_SIZE];
+} MACSecSc_t;
+/* MACsec SA */
+#define MACSEC_SETTINGS_SA_SIZE (80)
+typedef union _MACSecSa
+{
+	struct
+	{
+		uint8_t index; /*!< SA index */
+		uint8_t
+			sak[32]; /*!< 256b SAK: Define the encryption key to be used to encrypte this packet. The lower 128 bits are used for 128-bit ciphers. */
+		uint8_t hashKey[16]; /*!< 128b Hash Key: Key used for authentication. */
+		uint8_t salt[12]; /*!< 96b Salt value: Salt value used in XPN ciphers. */
+		uint32_t ssci; /*!< 32b SSCI value: Short Secure Channel Identifier, used in XPN ciphers. */
+		uint8_t AN; /*!< 2b SecTag Association Number (AN) */
+		uint64_t nextPN; /*!< 64b next_pn value: Next packet number to insert into outgoing packet on a particular SA. */
+		uint8_t rsvd[5];
+		uint8_t enable;
+	};
+	uint8_t byte[MACSEC_SETTINGS_SA_SIZE];
+} MACSecSa_t;
+/* MACsec Flags */
+#define MACSEC_SETTINGS_FLAGS_SIZE (4)
+typedef union _MACSecFlags
+{
+	struct
+	{
+		uint32_t en : 1; // '1' = enable; '0' = disable
+		uint32_t reserved : 31;
+	};
+	uint32_t flags_32b;
+} MACSecFlags_t;
+/* MACSec Settings for 1 port/phy */
+#define MACSEC_NUM_FLAGS_PER_CONFIG (1)
+#define MACSEC_NUM_RULES_PER_CONFIG (2)
+#define MACSEC_NUM_MAPS_PER_CONFIG (2)
+#define MACSEC_NUM_SECY_PER_CONFIG (2)
+#define MACSEC_NUM_SC_PER_CONFIG (2)
+#define MACSEC_NUM_SA_PER_CONFIG (4)
+typedef struct MACSEC_CONFIG_t
+{
+	MACSecFlags_t flags;
+	MACSecRule_t rule[MACSEC_NUM_RULES_PER_CONFIG];
+	MACSecMap_t map[MACSEC_NUM_MAPS_PER_CONFIG];
+	MACSecSecY_t secy[MACSEC_NUM_SECY_PER_CONFIG];
+	MACSecSc_t sc[MACSEC_NUM_SC_PER_CONFIG];
+	MACSecSa_t sa[MACSEC_NUM_SA_PER_CONFIG];
+} MACSEC_CONFIG;
+typedef union _MACSecGlobalFlags
+{
+	struct
+	{
+		uint32_t en : 1; // '1' = enable; '0' = disable
+		uint32_t nvm : 1; // store macsec config in non-volatile memory
+		uint32_t reserved : 30;
+	};
+	uint32_t flags_32b;
+} MACSecGlobalFlags_t;
+#define MACSEC_SETTINGS_SIZE (2040) // leave space for expansion and keep nicely aligned for flashing
+typedef union _MACSEC_SETTINGS
+{
+	struct
+	{
+		MACSecGlobalFlags_t flags;
+		MACSEC_CONFIG rx;
+		MACSEC_CONFIG tx;
+	};
+	uint8_t byte[MACSEC_SETTINGS_SIZE];
+} MACSEC_SETTINGS;
+
+#define MACSEC_SETTINGS_VERSION 1
+typedef struct MACSEC_SETTINGS_W_HDR
+{
+	uint16_t version;
+	uint16_t len;
+	uint32_t crc32;
+	MACSEC_SETTINGS macsec;
+} MACSEC_SETTINGS_W_HDR;
+#define MACSEC_SETTINGS_W_HDR_SIZE (2048)
+
+#pragma pack(pop)
+
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
+static void ReportEvent(APIEvent::Type event, APIEvent::Severity severity) {
+	auto& em = EventManager::GetInstance();
+	em.add(APIEvent(event, severity));
+}
+
+MACsecConfig::MACsecConfig(const DeviceType& deviceType) : type(deviceType) {
+	switch(deviceType.getDeviceType()) {
+		case icsneo::DeviceType::Enum::RADMoon2:
+		case icsneo::DeviceType::Enum::RADMoon3:
+		case icsneo::DeviceType::Enum::RADEpsilon:
+			maxSecY = 2;
+			maxRule = 2;
+			maxSa = 4;
+			binIndex = 0;
+			break;
+		default:
+			maxSecY = 0;
+			maxSa = 0;
+			maxRule = 0;
+			binIndex = 0;
+			ReportEvent(APIEvent::Type::MACsecNotSupported, APIEvent::Severity::Error);
+			return;
+	}
+}
+
+int MACsecConfig::addRxSecY(const MACsecRxSecY& secY, uint8_t saIndex) {
+	if(rxSecY.size() >= maxSecY) {
+		ReportEvent(APIEvent::Type::MACsecSecYLimit, APIEvent::Severity::Error);
+		return -1;
+	}
+
+	if(saIndex >= rxSa.size()) {
+		ReportEvent(APIEvent::Type::MACsecInvalidSaIndex, APIEvent::Severity::Error);
+		return -1;
+	}
+
+	int ret = static_cast<int>(rxSecY.size());
+	rxSecY.emplace_back(secY);
+	rxSecYSaIndices.emplace_back(saIndex, saIndex + 1);
+	rxSecYRekey.emplace_back(false);
+	rxRuleIndices.emplace_back(0);
+
+	return ret;
+}
+
+int MACsecConfig::addTxSecY(const MACsecTxSecY& secY, uint8_t saIndex) {
+	if(txSecY.size() >= maxSecY) {
+		ReportEvent(APIEvent::Type::MACsecSecYLimit, APIEvent::Severity::Error);
+		return -1;
+	}
+
+	if(saIndex >= txSa.size()) {
+		ReportEvent(APIEvent::Type::MACsecInvalidSaIndex, APIEvent::Severity::Error);
+		return -1;
+	}
+
+	int ret = static_cast<int>(txSecY.size());
+	txSecY.emplace_back(secY);
+	txSecYSaIndices.emplace_back(saIndex, saIndex + 1);
+	txSecYRekey.emplace_back(false);
+
+	return ret;
+}
+
+int MACsecConfig::addRxSa(const MACsecRxSa& sa) {
+	if(rxSa.size() >= maxSa) {
+		ReportEvent(APIEvent::Type::MACsecSaLimit, APIEvent::Severity::Error);
+		return -1;
+	}
+
+	int ret = static_cast<int>(rxSa.size());
+	rxSa.emplace_back(sa);
+	return ret;
+}
+
+int MACsecConfig::addTxSa(const MACsecTxSa& sa) {
+	if(txSa.size() >= maxSa) {
+		ReportEvent(APIEvent::Type::MACsecSaLimit, APIEvent::Severity::Error);
+		return -1;
+	}
+
+	int ret = static_cast<int>(txSa.size());
+	txSa.emplace_back(sa);
+	return ret;
+}
+
+int MACsecConfig::addRxRule(const MACsecRxRule& rule, uint8_t secYIndex) {
+	if(rxRule.size() >= maxRule) {
+		ReportEvent(APIEvent::Type::MACsecSaLimit, APIEvent::Severity::Error);
+		return -1;
+	}
+
+	if(maxSecY >= rxRule.size()) {
+		ReportEvent(APIEvent::Type::MACsecSecYLimit, APIEvent::Severity::Error);
+		return -1;
+	}
+
+	int ret = static_cast<int>(rxRule.size());
+	rxRuleIndices[secYIndex] = static_cast<uint8_t>(rxRule.size());
+	rxRule.emplace_back(rule);
+	return ret;
+}
+
+MACsecRxRule& MACsecConfig::getRxRule(uint8_t ruleIndex) {
+	return rxRule[ruleIndex];
+}
+
+const MACsecRxRule& MACsecConfig::getRxRule(uint8_t ruleIndex) const {
+	return rxRule[ruleIndex];
+}
+
+MACsecRxSecY& MACsecConfig::getRxSecY(uint8_t secYIndex) {
+	return rxSecY[secYIndex];
+}
+
+const MACsecRxSecY& MACsecConfig::getRxSecY(uint8_t secYIndex) const {
+	return rxSecY[secYIndex];
+}
+
+MACsecTxSecY& MACsecConfig::getTxSecY(uint8_t secYIndex) {
+	return txSecY[secYIndex];
+}
+
+const MACsecTxSecY& MACsecConfig::getTxSecY(uint8_t secYIndex) const {
+	return txSecY[secYIndex];	
+}
+
+MACsecRxSa& MACsecConfig::getRxSa(uint8_t saIndex) {
+	return rxSa[saIndex];
+}
+
+const MACsecRxSa& MACsecConfig::getRxSa(uint8_t saIndex) const {
+	return rxSa[saIndex];
+}
+
+MACsecTxSa& MACsecConfig::getTxSa(uint8_t saIndex) {
+	return txSa[saIndex];
+}
+
+const MACsecTxSa& MACsecConfig::getTxSa(uint8_t saIndex) const {
+	return txSa[saIndex];
+}
+
+bool MACsecConfig::setTxSaIndex(uint8_t secYIndex, uint8_t saIndex) {
+	if(secYIndex >= txSecY.size()) {
+		ReportEvent(APIEvent::Type::MACsecInvalidSecYIndex, APIEvent::Severity::Error);
+		return false;
+	}
+	if(saIndex >= txSa.size()) {
+		ReportEvent(APIEvent::Type::MACsecInvalidSaIndex, APIEvent::Severity::Error);
+		return false;
+	}
+
+	txSecYSaIndices[secYIndex].first = saIndex;
+	return true;
+}
+
+bool MACsecConfig::enableTxRekey(uint8_t secYIndex, uint8_t rekeySaIndex) {
+	if(secYIndex >= txSecY.size()) {
+		ReportEvent(APIEvent::Type::MACsecInvalidSecYIndex, APIEvent::Severity::Error);
+		return false;
+	}
+	if(rekeySaIndex >= txSa.size()) {
+		ReportEvent(APIEvent::Type::MACsecInvalidSaIndex, APIEvent::Severity::Error);
+		return false;
+	}
+
+	txSecYSaIndices[secYIndex].second = rekeySaIndex;
+	txSecYRekey[secYIndex] = true;
+	return true;
+}
+
+bool MACsecConfig::setTxSaRekeyIndex(uint8_t secYIndex, uint8_t saIndex) {
+	if(secYIndex >= txSecY.size()) {
+		ReportEvent(APIEvent::Type::MACsecInvalidSecYIndex, APIEvent::Severity::Error);
+		return false;
+	}
+	if(saIndex >= txSa.size()) {
+		ReportEvent(APIEvent::Type::MACsecInvalidSaIndex, APIEvent::Severity::Error);
+		return false;
+	}
+
+	txSecYSaIndices[secYIndex].second = saIndex;
+	return true;
+}
+
+void MACsecConfig::disableTxRekey(uint8_t secYIndex) {
+	if(secYIndex >= txSecY.size()) {
+		ReportEvent(APIEvent::Type::MACsecInvalidSecYIndex, APIEvent::Severity::EventWarning);
+		return;
+	}
+	txSecYRekey[secYIndex] = false;
+}
+
+bool MACsecConfig::setRxSaIndex(uint8_t secYIndex, uint8_t saIndex) {
+	if(secYIndex >= rxSecY.size()) {
+		ReportEvent(APIEvent::Type::MACsecInvalidSecYIndex, APIEvent::Severity::Error);
+		return false;
+	}
+	if(saIndex >= rxSa.size()) {
+		ReportEvent(APIEvent::Type::MACsecInvalidSaIndex, APIEvent::Severity::Error);
+		return false;
+	}
+
+	rxSecYSaIndices[secYIndex].first = saIndex;
+	return true;
+}
+
+bool MACsecConfig::enableRxRekey(uint8_t secYIndex, uint8_t rekeySaIndex) {
+	if(secYIndex >= rxSecY.size()) {
+		ReportEvent(APIEvent::Type::MACsecInvalidSecYIndex, APIEvent::Severity::Error);
+		return false;
+	}
+	if(rekeySaIndex >= rxSa.size()) {
+		ReportEvent(APIEvent::Type::MACsecInvalidSaIndex, APIEvent::Severity::Error);
+		return false;
+	}
+
+	rxSecYSaIndices[secYIndex].second = rekeySaIndex;
+	rxSecYRekey[secYIndex] = true;
+	return true;
+}
+
+bool MACsecConfig::setRxSaRekeyIndex(uint8_t secYIndex, uint8_t saIndex) {
+	if(secYIndex >= rxSecY.size()) {
+		ReportEvent(APIEvent::Type::MACsecInvalidSecYIndex, APIEvent::Severity::Error);
+		return false;
+	}
+	if(saIndex >= rxSa.size()) {
+		ReportEvent(APIEvent::Type::MACsecInvalidSaIndex, APIEvent::Severity::Error);
+		return false;
+	}
+
+	rxSecYSaIndices[secYIndex].second = saIndex;
+	return true;
+}
+
+void MACsecConfig::disableRxRekey(uint8_t secYIndex) {
+	if(secYIndex >= rxSecY.size()) {
+		ReportEvent(APIEvent::Type::MACsecInvalidSecYIndex, APIEvent::Severity::EventWarning);
+		return;
+	}
+	rxSecYRekey[secYIndex] = false;
+}
+
+void MACsecConfig::setRxEnable(bool newRxEnable) {
+	enableRx = newRxEnable;
+}
+
+void MACsecConfig::setTxEnable(bool newTxEnable) {
+	enableTx = newTxEnable;
+}
+
+void MACsecConfig::setStorage(bool temporary) {
+	nvm = !temporary;
+}
+
+
+void MACsecConfig::clear() {
+	// Set everything back to default, except device maximums
+	rxSecY.clear();
+	txSecY.clear();
+	rxSa.clear();
+	txSa.clear();
+	rxRule.clear();
+	rxSecYRekey.clear();
+	txSecYRekey.clear();
+	rxSecYSaIndices.clear();
+	txSecYSaIndices.clear();
+	rxRuleIndices.clear();
+	enableRx = false;
+	enableTx = false;
+	nvm = false;
+}
+
+MACsecConfig::operator bool() const {
+	return (maxSa != 0) || (maxSecY != 0) || (maxRule != 0);
+}
+
+uint16_t MACsecConfig::getBinIndex() const {
+	return binIndex;
+}
+
+DeviceType MACsecConfig::getType() const {
+	return type;
+}
+
+uint8_t MACsecConfig::getMaxNumRule() const {
+	return maxRule;	
+}
+
+uint8_t MACsecConfig::getMaxNumSecY() const {
+	return maxSecY;
+}
+
+uint8_t MACsecConfig::getMaxNumSa() const {
+	return maxSa;
+}
+
+
+static uint8_t TCItoInt(const MACsecTci& tci) {
+	uint8_t res = 0;
+	res |= tci.c ? 0x01u : 0;
+	res |= tci.e ? 0x02u : 0;
+	res |= tci.scb ? 0x04u : 0;
+	res |= tci.sc ? 0x08u : 0;
+	res |= tci.es ? 0x10u : 0;
+	return res;
+}
+
+static void SetHardwareTxSecY(
+	MACSEC_SETTINGS_W_HDR* hwSettings,
+	const MACsecTxSecY& secY,
+	bool rekeyEnabled,
+	const std::pair<uint8_t, uint8_t>& saIndices,
+	uint8_t index
+) {
+
+	MACSecSecY_t* hwSecY = &hwSettings->macsec.tx.secy[index];
+	MACSecSc_t* hwSc = &hwSettings->macsec.tx.sc[index];
+	MACSecMap_t* hwMap = &hwSettings->macsec.tx.map[index]; 
+
+	hwSecY->index = index;
+	hwSecY->enable = true;
+	hwSecY->controlled_port_enabled = secY.enableControlPort ? 0x1u : 0x0u;
+	hwSecY->cipher = secY.cipher;
+	hwSecY->confidential_offset = secY.confidentialityOffset;
+	hwSecY->icv_includes_da_sa = secY.icvIncludesDaSa ? 0x1u : 0x0u;
+	hwSecY->mtu = secY.mtu;
+	hwSecY->sectag_tci = TCItoInt(secY.tci);
+	hwSecY->sectag_offset = secY.secTagOffset;
+	hwSecY->protect_frames = secY.protectFrames;
+
+	hwSc->index = index;
+	hwSc->enable = true;
+	hwSc->secYIndex = index;
+	hwSc->enable_auto_rekey = rekeyEnabled ? 0x1u : 0x0u;
+	hwSc->sa_index0 = saIndices.first;
+	hwSc->sa_index1 = saIndices.second;
+	hwSc->sa_index0_in_use = true;
+	hwSc->sa_index1_in_use = rekeyEnabled ? true : false;
+	hwSc->isActiveSA1 = rekeyEnabled ? true : false;
+	hwSc->sci = secY.sci;
+
+	hwMap->index = index;
+	hwMap->enable = true;
+	hwMap->auxiliary_plcy = secY.auxiliaryPolicy;
+	hwMap->secYIndex = index;
+	hwMap->isControlPacket = secY.isControlPacket ? 0x1u : 0x0u;
+	hwMap->scIndex = index;
+	hwMap->sectag_sci = secY.sci;
+
+}
+
+static void SetHardwareRxSecY(
+	MACSEC_SETTINGS_W_HDR* hwSettings,
+	const MACsecRxSecY& secY,
+	bool rekeyEnabled,
+	uint8_t ruleIndex,
+	const std::pair<uint8_t, uint8_t>& saIndices,
+	uint8_t index
+) {
+
+	MACSecSecY_t* hwSecY = &hwSettings->macsec.rx.secy[index];
+	MACSecSc_t* hwSc = &hwSettings->macsec.rx.sc[index];
+	MACSecMap_t* hwMap = &hwSettings->macsec.rx.map[index]; 
+
+	hwSecY->index = index;
+	hwSecY->enable = 0x1u;
+	hwSecY->controlled_port_enabled = secY.enableControlPort ? 0x1u : 0x0u;
+	hwSecY->cipher = secY.cipher;
+	hwSecY->confidential_offset = secY.confidentialityOffset;
+	hwSecY->icv_includes_da_sa = secY.icvIncludesDaSa ? 0x1u : 0x0u;
+	hwSecY->replay_protect = secY.replayProtect ? 0x1u : 0x0u;
+	hwSecY->replay_window = secY.replayWindow;
+	hwSecY->validate_frames = secY.frameValidation;
+	hwSecY->strip_sectag_icv = secY.frameStrip;
+	hwSecY->sectag_offset = 12;
+
+	hwSc->index = index;
+	hwSc->enable = 0x1u;
+	hwSc->secYIndex = index;
+	hwSc->enable_auto_rekey = rekeyEnabled ? 0x1u : 0x0u;
+	hwSc->sa_index0 = saIndices.first;
+	hwSc->sa_index1 = saIndices.second;
+	hwSc->sa_index0_in_use = 0x1u;
+	hwSc->sa_index1_in_use = rekeyEnabled ? 0x1u : 0x0u;
+	hwSc->isActiveSA1 = rekeyEnabled ? 0x1u : 0x0u;
+	hwSc->sci = secY.sci;
+
+	hwMap->index = index;
+	hwMap->enable = 0x1u;
+	hwMap->secYIndex = index;
+	hwMap->ruleId = ruleIndex;
+	hwMap->isControlPacket = secY.isControlPacket ? 0x1u : 0x0u;
+	hwMap->scIndex = index;
+	hwMap->sectag_sci = secY.sci;
+
+}
+
+static void SetHardwareTxSa(MACSEC_SETTINGS_W_HDR* hwSettings, const MACsecTxSa& sa, uint8_t index) {
+	MACSecSa_t* hwSa = &hwSettings->macsec.tx.sa[index];
+
+	hwSa->index = index;
+	hwSa->enable = 0x1u;
+	memcpy(hwSa->sak, sa.sak.data(), 32);
+	memcpy(hwSa->hashKey, sa.hashKey.data(), 16);
+	memcpy(hwSa->salt, sa.salt.data(), 12);
+	hwSa->ssci = sa.ssci;
+	hwSa->AN = sa.an;
+	hwSa->nextPN = sa.nextPn;
+
+}
+
+static void SetHardwareRxSa(MACSEC_SETTINGS_W_HDR* hwSettings, const MACsecRxSa& sa, uint8_t index) {
+	MACSecSa_t* hwSa = &hwSettings->macsec.rx.sa[index];
+
+	hwSa->index = index;
+	hwSa->enable = 0x1u;
+	memcpy(hwSa->sak, sa.sak.data(), 32);
+	memcpy(hwSa->hashKey, sa.hashKey.data(), 16);
+	memcpy(hwSa->salt, sa.salt.data(), 12);
+	hwSa->ssci = sa.ssci;
+	hwSa->nextPN = sa.nextPn;
+
+}
+
+static void SetHardwareRxRule(MACSecRule_t* hwRule, const MACsecRxRule& rule, uint8_t index) {
+
+	hwRule->enable = 0x1u;
+	hwRule->index = index;
+	memcpy(hwRule->key_MAC_DA, rule.keyMacDa.data(), 6);
+	memcpy(hwRule->mask_MAC_DA, rule.maskMacDa.data(), 6);
+	memcpy(hwRule->key_MAC_SA, rule.keyMacSa.data(), 6);
+	memcpy(hwRule->mask_MAC_SA, rule.maskMacSa.data(), 6);
+	hwRule->key_Ethertype = rule.keyEthertype;
+	hwRule->mask_Ethertype =  rule.maskEthertype;
+	hwRule->key_vlantag_outer1.PRI_CFI = rule.keyVlanTagOuter1.priCfi;
+	hwRule->key_vlantag_outer1.VID = rule.keyVlanTagOuter1.vid;
+	hwRule->key_MPLS_outer1.exp = rule.keyMplsOuter1.exp;
+	hwRule->key_MPLS_outer1.MPLS_label = rule.keyMplsOuter1.mplsLabel;
+	hwRule->mask_vlantag_outer1.PRI_CFI = rule.maskVlanTagOuter1.priCfi;
+	hwRule->mask_vlantag_outer1.VID = rule.maskVlanTagOuter1.vid;
+	hwRule->mask_MPLS_outer1.exp = rule.maskMplsOuter1.exp;
+	hwRule->mask_MPLS_outer1.MPLS_label = rule.maskMplsOuter1.mplsLabel;
+	hwRule->key_vlantag_outer2.PRI_CFI = rule.keyVlanTagOuter2.priCfi;
+	hwRule->key_vlantag_outer2.VID = rule.keyVlanTagOuter2.vid;
+	hwRule->key_MPLS_outer2.exp = rule.keyMplsOuter2.exp;
+	hwRule->key_MPLS_outer2.MPLS_label = rule.keyMplsOuter2.mplsLabel;
+	hwRule->mask_vlantag_outer2.PRI_CFI = rule.maskVlanTagOuter2.priCfi;
+	hwRule->mask_vlantag_outer2.VID = rule.maskVlanTagOuter2.vid;
+	hwRule->mask_MPLS_outer2.exp = rule.maskMplsOuter2.exp;
+	hwRule->mask_MPLS_outer2.MPLS_label = rule.maskMplsOuter2.mplsLabel;
+	hwRule->key_bonus_data = rule.keyBonusData;
+	hwRule->mask_bonus_data = rule.maskBonusData;
+	hwRule->key_tag_match_bitmap = rule.keyTagMatchBitmap;
+	hwRule->mask_tag_match_bitmap = rule.maskTagMatchBitmap;
+	hwRule->key_packet_type = rule.keyPacketType;
+	hwRule->mask_packet_type = rule.maskPacketType;
+	hwRule->key_inner_vlan_type = rule.keyInnerVlanType;
+	hwRule->mask_inner_vlan_type = rule.maskInnerVlanType;
+	hwRule->key_outer_vlan_type = rule.keyOuterVlanType;
+	hwRule->mask_outer_vlan_type = rule.maskOuterVlanType;
+	hwRule->key_num_tags = rule.keyNumTags;
+	hwRule->mask_num_tags = rule.maskNumTags;
+	hwRule->key_express = rule.keyExpress ? 0x1u : 0x0u;
+	hwRule->mask_express = rule.maskExpress ? 0x1u : 0x0u;
+	hwRule->isMPLS = rule.isMpls ? 0x1u : 0x0u;
+
+}
+
+std::vector<uint8_t> MACsecConfig::serialize() const {
+	std::vector<uint8_t> res(sizeof(MACSEC_SETTINGS_W_HDR), 0);
+	MACSEC_SETTINGS_W_HDR* hwSettings = (MACSEC_SETTINGS_W_HDR*)(res.data());
+
+	for(uint8_t i = 0; i < maxSecY; i++) {
+		if(i < rxSecY.size()) {
+			SetHardwareRxSecY(
+				hwSettings, 
+				rxSecY[i],
+				rxSecYRekey[i],
+				rxRuleIndices[i],
+				rxSecYSaIndices[i],
+				i
+			);
+		} else {
+			hwSettings->macsec.rx.secy[i].enable = false;
+			hwSettings->macsec.rx.map[i].enable = false;
+			hwSettings->macsec.rx.sc[i].enable = false;
+		}
+
+		if(i < txSecY.size()) {
+			SetHardwareTxSecY(
+				hwSettings, 
+				txSecY[i],
+				txSecYRekey[i],
+				txSecYSaIndices[i],
+				i
+			);
+		} else {
+			hwSettings->macsec.tx.secy[i].enable = false;
+			hwSettings->macsec.tx.map[i].enable = false;
+			hwSettings->macsec.tx.sc[i].enable = false;
+		}
+	}
+
+	for(uint8_t i = 0; i < maxSa; i++) {
+		if(i < rxSa.size()) {
+			SetHardwareRxSa(hwSettings, rxSa[i], i);
+		} else {
+			hwSettings->macsec.rx.sa[i].enable = false;
+		}
+		
+		if(i < txSa.size()) {
+			SetHardwareTxSa(hwSettings, txSa[i], i);
+		} else {
+			hwSettings->macsec.tx.sa[i].enable = false;
+		}
+	}
+
+	if(rxRule.size() == 0) {
+		MACsecRxRule defaultRule;
+		MACSecRule_t* hwRxRule = &hwSettings->macsec.rx.rule[0];
+		MACSecRule_t* hwTxRule = &hwSettings->macsec.tx.rule[0];
+		SetHardwareRxRule(hwRxRule, defaultRule, 0);
+		SetHardwareRxRule(hwTxRule, defaultRule, 0);
+		//hwSettings->macsec.tx.rule[0].enable = false;
+		for(uint8_t i = 1; i < maxRule; i++) {
+			hwSettings->macsec.rx.rule[i].enable = false;
+			hwSettings->macsec.tx.rule[i].enable = false;
+		}
+	} else  {
+		for(uint8_t i = 0; i < maxRule; i++) {
+			if(i < rxRule.size()) {
+				auto* hwRxRule = &hwSettings->macsec.rx.rule[i];
+				SetHardwareRxRule(hwRxRule, rxRule[i], i);
+			} else {
+				hwSettings->macsec.rx.rule[i].enable = false;
+				hwSettings->macsec.tx.rule[i].enable = false;
+			}
+		}
+	}
+
+	hwSettings->len = sizeof(MACSEC_SETTINGS_W_HDR);
+	hwSettings->version = MACSEC_SETTINGS_VERSION;
+	hwSettings->macsec.flags.en = (enableRx || enableTx) ? 1u : 0u;
+	hwSettings->macsec.flags.nvm = nvm ? 1u : 0u;
+	hwSettings->macsec.rx.flags.en = enableRx ? 1u : 0u;
+	hwSettings->macsec.tx.flags.en = enableTx ? 1u : 0u;
+	hwSettings->crc32 = crc32(0, (uint8_t*)&hwSettings->macsec, sizeof(MACSEC_SETTINGS));
+
+	return res;
+}
+}

core/ringbuffer.cpp

@@ -0,0 +1,91 @@
+#include "icsneo/core/ringbuffer.h"
+#include <stdexcept>
+
+namespace icsneo {
+	
+RingBuffer::RingBuffer(size_t bufferSize) : readCursor(0), writeCursor(0) {
+	// round the buffer size to the nearest power of 2
+	bufferSize = RoundUp(bufferSize);
+	mask = bufferSize - 1;
+	buf = new uint8_t[bufferSize];
+}
+
+RingBuffer::~RingBuffer() {
+	delete[] buf;
+	buf = nullptr;
+}
+
+const uint8_t& RingBuffer::operator[](size_t offset) const { 
+	return get(offset); 
+}
+
+size_t RingBuffer::size() const { 
+	// The values in the cursors are monotonic, i.e. they only ever increment. They can be considered to be the total number of elements ever written or read
+	auto currentWriteCursor = writeCursor.load(std::memory_order_relaxed);
+	auto currentReadCursor = readCursor.load(std::memory_order_relaxed);
+	// Using unmasked values, writeCursor is guaranteed to be >= readCursor. If they are equal that means the buffer is empty
+	return currentWriteCursor - currentReadCursor; 
+}
+
+void RingBuffer::pop_front() {
+	pop(1);
+}
+
+void RingBuffer::pop(size_t count) {
+	if (size() < count) {
+		throw std::runtime_error("RingBuffer: Underflow");
+	}
+	readCursor.fetch_add(count, std::memory_order_release);
+}
+
+const uint8_t& RingBuffer::get(size_t offset) const {
+	if (offset >= size()) {
+		throw std::runtime_error("RingBuffer: Index out of range");
+	}
+	auto currentReadCursor = readCursor.load(std::memory_order_acquire);
+	return *resolve(currentReadCursor, offset);
+}
+
+bool RingBuffer::write(const uint8_t* addr, size_t length) {    
+	const auto freeSpace = (capacity() - size());
+	if (length > freeSpace) {
+		return false;
+	}
+	auto currentWriteCursor = writeCursor.load(std::memory_order_relaxed);
+	auto spaceAtEnd = std::min(freeSpace, capacity() - (currentWriteCursor & mask)); // number of bytes from (masked) writeCursor to the end of the writable space (i.e. we reach the masked read cursor or the end of the buffer)
+	auto firstCopySize = std::min(spaceAtEnd, length);
+	(void)memcpy(resolve(currentWriteCursor, 0), addr, firstCopySize);
+	if (firstCopySize < length)
+	{
+		(void)memcpy(buf, &addr[firstCopySize], length - firstCopySize);
+	}
+
+	writeCursor.store(currentWriteCursor + length, std::memory_order_release);
+	return true;
+}
+
+bool RingBuffer::write(const std::vector<uint8_t>& source) {
+	return write(source.data(), source.size());
+}
+
+bool RingBuffer::read(uint8_t* dest, size_t startIndex, size_t length) const {
+	auto currentSize = size();
+	if ((startIndex >= currentSize) || ((startIndex + length) > size())) {
+		return false;
+	}
+	auto currentReadCursor = readCursor.load(std::memory_order_relaxed);
+	auto bytesAtEnd = std::min<size_t>(capacity() - ((currentReadCursor + startIndex) & mask), length);
+	const auto bytesAtStart = (length - bytesAtEnd);
+
+	(void)memcpy(dest, resolve(currentReadCursor, startIndex), bytesAtEnd);
+	if (bytesAtStart > 0) {
+		(void)memcpy(&dest[bytesAtEnd], buf, bytesAtStart);
+	}
+	return true;
+}
+
+void RingBuffer::clear() {
+	pop(size());
+}
+
+}

device/device.cpp

@@ -435,7 +435,13 @@ bool Device::reconnect(std::chrono::milliseconds timeout, std::chrono::milliseco
 					// Pause reads again
 					com->pauseReads();
 				}
-				return com->open();
+				if(com->open()) {
+					return true;
+				} else {
+					if(readsArePaused) {
+						com->resumeReads();
+					}
+				} 
 			}
 		}
 		std::this_thread::sleep_for(interval);
@@ -579,7 +585,10 @@ bool Device::goOnline() {
 	}
 
 	// (re)start the keeponline
-	keeponline = std::make_unique<Periodic>([this] { return enableNetworkCommunication(true, onlineTimeoutMs); }, std::chrono::milliseconds(onlineTimeoutMs / 4));
+	keeponline = std::make_unique<Periodic>([this] {
+		static std::vector<uint8_t> timeoutBytes = std::vector<uint8_t>((uint8_t*)&onlineTimeoutMs, (uint8_t*)&onlineTimeoutMs + sizeof(onlineTimeoutMs));
+		return com->sendCommand(Command::KeepAlive, timeoutBytes);
+	}, std::chrono::milliseconds(onlineTimeoutMs / 4));
 
 	online = true;
 
@@ -2090,10 +2099,6 @@ std::optional<EthPhyMessage> Device::sendEthPhyMsg(const EthPhyMessage& message,
 		report(APIEvent::Type::EthPhyRegisterControlNotAvailable, APIEvent::Severity::Error);
 		return std::nullopt;
 	}
-	if(!isOnline()) {
-		report(APIEvent::Type::DeviceCurrentlyOffline, APIEvent::Severity::Error);
-		return std::nullopt;
-	}
 
 	std::vector<uint8_t> bytes;
 	HardwareEthernetPhyRegisterPacket::EncodeFromMessage(message, bytes, report);
@@ -3740,13 +3745,19 @@ std::optional<GPTPStatus> Device::getGPTPStatus(std::chrono::milliseconds timeou
 	return *retMsg;
 }
 
-bool Device::writeMACsecConfig(const MACsecMessage& message, uint16_t binaryIndex)
-{
-	std::vector<uint8_t> raw;
+bool Device::writeMACsecConfig(const MACsecConfig& cfg) {
+	if(!cfg) {
+		report(APIEvent::Type::MACsecNotSupported, APIEvent::Severity::Error);
+		return false;
+	}
 
-	message.EncodeFromMessage(raw, report);
+	if(getType() != cfg.getType()) {
+		report(APIEvent::Type::MACsecConfigMismatch, APIEvent::Severity::Error);
+		return false;
+	}
 
-	return writeBinaryFile(raw, binaryIndex);
+	std::vector<uint8_t> raw = cfg.serialize();
+	return writeBinaryFile(raw, cfg.getBinIndex());
 }
 
 bool Device::enableNetworkCommunication(bool enable, uint32_t timeout) {

docs/icsneopy/examples.rst

@@ -74,3 +74,11 @@ Device Firmware/Chip Versions
 
 .. literalinclude:: ../../examples/python/device/chip_versions.py
    :language: python
+
+SPI Example for 10BASE-T1S
+=============================
+
+:download:`Download example <../../examples/python/spi/spi_example.py>`
+
+.. literalinclude:: ../../examples/python/spi/spi_example.py
+   :language: python

examples/CMakeLists.txt

@@ -10,6 +10,7 @@ option(LIBICSNEO_BUILD_CPP_COREMINI_EXAMPLE "Build the Coremini example." ON)
 option(LIBICSNEO_BUILD_CPP_MDIO_EXAMPLE "Build the MDIO example." ON)
 option(LIBICSNEO_BUILD_CPP_VSA_EXAMPLE "Build the VSA example." ON)
 option(LIBICSNEO_BUILD_CPP_APP_ERROR_EXAMPLE "Build the app error example." ON)
+option(LIBICSNEO_BUILD_CPP_APP_ERROR_EXAMPLE "Build the macsec example" ON)
 option(LIBICSNEO_BUILD_CPP_FLEXRAY_EXAMPLE "Build the FlexRay example." ON)
 option(LIBICSNEO_BUILD_CPP_SPI_EXAMPLE "Build the SPI example." ON)
 option(LIBICSNEO_BUILD_CPP_MUTEX_EXAMPLE "Build the NetworkMutex example." ON)
@@ -64,6 +65,10 @@ if(LIBICSNEO_BUILD_CPP_APP_ERROR_EXAMPLE)
 	add_subdirectory(cpp/apperror)
 endif()
 
+if(LIBICSNEO_BUILD_CPP_APP_ERROR_EXAMPLE)
+	add_subdirectory(cpp/macsec)
+endif()
+
 if(LIBICSNEO_BUILD_CPP_FLEXRAY_EXAMPLE)
     add_subdirectory(cpp/flexray)
 endif()

examples/cpp/coremini/src/coremini.cpp

@@ -44,12 +44,6 @@ int main(int argc, char** argv) {
 		return EXIT_FAILURE;
 	}
 
-	if(!device->goOnline()) {
-		std::cout << "Failed to go online." << std::endl;
-		std::cout << icsneo::GetLastError() << std::endl;
-		return EXIT_FAILURE;
-	}
-
 	std::string memTypeString = arguments[3];
 
 	icsneo::Disk::MemoryType type;
@@ -75,7 +69,6 @@ int main(int argc, char** argv) {
 		std::cout << icsneo::GetLastError() << std::endl;
 	}
 
-	device->goOffline();
 	device->close();
 	return 0;
 }

examples/cpp/macsec/CMakeLists.txt

@@ -0,0 +1,2 @@
+add_executable(libicsneocpp-macsec src/macsec.cpp)
+target_link_libraries(libicsneocpp-macsec icsneocpp)

examples/cpp/macsec/src/macsec.cpp

@@ -0,0 +1,86 @@
+#include <iostream>
+#include "icsneo/icsneocpp.h"
+
+int main(int, char**) {
+	// Hash calculated by encrypting 16 zero bytes with AES ecb using the SAK
+	// The device uses this hash to authenticate the key
+	std::array<uint8_t, 16> sak = {0x01u, 0x02u, 0x03u, 0x04u, 0x01u, 0x02u, 0x03u, 0x04u, 0x01u, 0x02u, 0x03u, 0x04u, 0x01u, 0x02u, 0x03u, 0x04u};
+	std::array<uint8_t, 16> hash = {0xDAu, 0x80u, 0xF2u, 0x20u, 0x8Bu, 0x59u, 0x88u, 0x12u, 0x94u, 0x4Eu, 0xEA, 0xB0, 0x52u, 0xDEu, 0xDEu, 0x66u};
+
+	auto devices = icsneo::FindAllDevices();
+
+	if(devices.size() == 0) {
+		std::cout << "No device found" << std::endl;
+		return -1;
+	}
+
+	std::shared_ptr<icsneo::Device> device = devices[0];
+	
+	if(!device->open()) {
+		std::cout << "Failed to open device" << std::endl;
+		std::cout << icsneo::GetLastError() << std::endl;
+		return -1;
+	}
+	
+	icsneo::MACsecConfig cfg(device->getType());
+
+	if(!cfg) {
+		std::cout << "Failed to initialize config" << std::endl;
+		std::cout << icsneo::GetLastError() << std::endl;
+		return -1;
+	}
+
+	// Fill out secure association information for each rx/tx port
+	icsneo::MACsecRxSa rxSa;
+	std::copy(sak.begin(), sak.end(), rxSa.sak.begin());
+	std::copy(hash.begin(), hash.end(), rxSa.hashKey.begin());
+
+	icsneo::MACsecTxSa txSa;
+	std::copy(sak.begin(), sak.end(), txSa.sak.begin());
+	std::copy(hash.begin(), hash.end(), txSa.hashKey.begin());
+
+	// Add the secure associations to the config
+	int rxSaHandle = cfg.addRxSa(rxSa);
+	int txSaHandle = cfg.addTxSa(txSa);
+
+	// Verify secure associations were configured properly
+	if(rxSaHandle < 0 || txSaHandle < 0) {
+		std::cout << "Failed to verify secure associations" << std::endl;
+		std::cout << icsneo::GetLastError() << std::endl;
+		return -1;
+	}
+
+	// Fill out security entity information for each rx/tx port
+	icsneo::MACsecRxSecY rxSecY;
+	rxSecY.cipher = icsneo::MACsecCipherSuite::GcmAes128;
+	rxSecY.sci = 0x1122334455660001ull;
+
+	icsneo::MACsecTxSecY txSecY;
+	txSecY.cipher = icsneo::MACsecCipherSuite::GcmAes128;
+	txSecY.sci = 0x1122334455660001ull;
+
+	// Add security entites to the config
+	int rxSecYHandle = cfg.addRxSecY(rxSecY, static_cast<uint8_t>(rxSaHandle));
+	int txSecYHandle = cfg.addTxSecY(txSecY, static_cast<uint8_t>(txSaHandle));	
+
+	// Verify security entities were configured properly
+	if(rxSecYHandle < 0 || txSecYHandle < 0) {
+		std::cout << "Failed to verify security entities" << std::endl;
+		std::cout << icsneo::GetLastError() << std::endl;
+		return -1;
+	}
+
+	// Enable communication directions
+	cfg.setRxEnable(true);
+	cfg.setTxEnable(true);
+
+	// Write config to the device
+	if(!device->writeMACsecConfig(cfg)) {
+		std::cout << "Failed to write MACsec config" << std::endl;
+		std::cout << icsneo::GetLastError() << std::endl;
+		return -1;
+	}
+	
+	device->close();
+	return 0;
+}

examples/python/spi/spi_example.py

@@ -0,0 +1,134 @@
+"""
+Complete SPI example for 10BASE-T1S MACPHYs using icsneopy library.
+
+Demonstrates device setup and SPI frame transmission/reception.
+"""
+
+import icsneopy
+import time
+
+
+def setup_device():
+    """Initialize SPI device."""
+    devices = icsneopy.find_all_devices()
+    if not devices:
+        raise RuntimeError("No devices found")
+
+    device = devices[0]
+    print(f"Using device: {device}")
+    return device
+
+
+def open_device(device):
+    """Open device connection."""
+    try:
+        if not device.open():
+            raise RuntimeError("Failed to open device")
+
+        if not device.go_online():
+            device.close()
+            raise RuntimeError("Failed to go online")
+
+        print("Device initialized successfully")
+        return True
+
+    except Exception as e:
+        print(f"Device setup failed: {e}")
+        return False
+
+
+def transmit_spi_frame(device, mms, addr, dir, write_data=None):
+    """Transmit a SPI frame."""
+    frame = icsneopy.SPIMessage()
+    frame.network = icsneopy.Network(icsneopy.Network.NetID.SPI_01)
+    frame.direction = dir
+    frame.mms = mms
+    frame.address = addr
+    if dir == icsneopy.SPIMessage.Direction.Read:
+        frame.payload = [0]  # single register
+    else:
+        frame.payload = [write_data]
+
+    success = device.transmit(frame)
+    if success:
+        print("Frame transmitted")
+    else:
+        print("Failed to transmit frame")
+
+    return success
+
+
+def setup_spi_reception(device):
+    """Configure SPI frame reception with callback."""
+
+    def frame_handler(frame):
+        access = (
+            "Write"
+            if frame.direction == icsneopy.SPIMessage.Direction.Write
+            else "Read"
+        )
+        print(
+            f"{access}, "
+            f"MMS: 0x{frame.mms:02X}, "
+            f"Register: 0x{frame.address:03X}, "
+            f"Data: {[hex(b) for b in frame.payload]}, "
+            f"Length: {len(frame.payload)}"
+        )
+
+    frame_filter = icsneopy.MessageFilter(icsneopy.Network.NetID.SPI_01)
+    callback = icsneopy.MessageCallback(frame_handler, frame_filter)
+    device.add_message_callback(callback)
+
+    print("SPI frame reception configured")
+
+
+def cleanup_device(device):
+    """Close device connection."""
+    if device:
+        device.close()
+        print("Device connection closed")
+
+
+def main():
+    """Complete SPI example with proper error handling."""
+    device = None
+
+    try:
+        # Setup device
+        device = setup_device()
+
+        # Open device
+        if not open_device(device):
+            raise RuntimeError("Failed to initialize device")
+
+        # Setup frame reception
+        setup_spi_reception(device)
+
+        # Read 10BASE-T1S MACPHY ID register
+        transmit_spi_frame(device, 0x0, 0x0001, icsneopy.SPIMessage.Direction.Read)
+
+        # Change 10BASE-T1S Test mode control
+        transmit_spi_frame(device, 0x3, 0x08FB, icsneopy.SPIMessage.Direction.Read)
+        transmit_spi_frame(
+            device, 0x3, 0x08FB, icsneopy.SPIMessage.Direction.Write, 0x6000
+        )
+        transmit_spi_frame(device, 0x3, 0x08FB, icsneopy.SPIMessage.Direction.Read)
+
+        time.sleep(0.1)
+
+        # Listen for responses
+        print("Listening for SPI frames for 5 seconds...")
+        time.sleep(5)
+
+    except Exception as e:
+        print(f"Error: {e}")
+        return 1
+
+    finally:
+        cleanup_device(device)
+
+    return 0
+
+
+if __name__ == "__main__":
+    main()

include/icsneo/api/event.h

@@ -54,7 +54,16 @@ public:
 		FixedPointOverflow = 0x1018,
 		FixedPointPrecision = 0x1019,
 		SyscallError = 0x1020, // check errno/GetLastError() for details
-
+		MACsecSecYLimit = 0x1021,
+		MACsecSaLimit = 0x1022,
+		MACsecRuleLimit = 0x1023,
+		MACsecInvalidSecYIndex = 0x1024,
+		MACsecInvalidSaIndex = 0x1025,
+		MACsecInvalidRuleIndex = 0x1026,
+		MACsecRekeyNotEnabled = 0x1027,
+		MACsecNotSupported = 0x1028,
+		MACsecConfigMismatch = 0x1029,
+		
 		// Device Events
 		PollingMessageOverflow = 0x2000,
 		NoSerialNumber = 0x2001, // api

include/icsneo/communication/command.h

@@ -8,6 +8,7 @@ namespace icsneo {
 enum class Command : uint8_t {
 	EnableNetworkCommunication = 0x07,
 	EnableNetworkCommunicationEx = 0x08,
+	KeepAlive = 0x09,
 	NeoReadMemory = 0x40,
 	NeoWriteMemory = 0x41,
 	ClearCoreMini = 0x42,

include/icsneo/communication/driver.h

@@ -11,7 +11,7 @@
 #include <condition_variable>
 #include "icsneo/api/eventmanager.h"
 #include "icsneo/third-party/concurrentqueue/blockingconcurrentqueue.h"
-#include "icsneo/communication/ringbuffer.h"
+#include "icsneo/core/ringbuffer.h"
 #include "icsneo/device/founddevice.h"
 
 namespace icsneo {

include/icsneo/communication/message/macsecmessage.h

@@ -1,200 +0,0 @@
-#ifndef __MACSECMESSAGE_H__
-#define __MACSECMESSAGE_H__
-
-#ifdef __cplusplus
-
-#include "icsneo/communication/message/message.h"
-#include "icsneo/communication/packet.h"
-#include "icsneo/api/eventmanager.h"
-#include <vector>
-#include <memory>
-#include <array>
-#include <cstring>
-
-namespace icsneo {
-
-struct MACsecVLANTag
-{
-	uint16_t vid; /*!< 12 bits */
-	uint8_t priCfi; /*!< PRI - 3 bits, CFI - 1bit */
-};
-
-struct MACsecMPLSOuter
-{
-	uint32_t mplsLabel; /*!< 20 bits */
-	uint8_t exp; /*!< 3 bits */
-};
-
-enum class MACsecPacketType : uint8_t
-{
-	NoVLANOrMPLS = 0,
-	SingleVLAN = 1,
-	DualVLAN = 2,
-	MPLS = 3,
-	SingleVLANFollowedByMPLS = 4,
-	DualVLANFollowedByMPLS = 5,
-	Unsupported = 6,
-};
-
-struct MACsecRule
-{
-	uint8_t index;
-	std::array<uint8_t, 6> keyMacDa; /*!< MAC DA field extracted from the packet */
-	std::array<uint8_t, 6> maskMacDa; /*!< Set bits to 1 to mask/exclude corresponding flowid_tcam_data bit from compare */
-	std::array<uint8_t, 6> keyMacSa; /*!< MAC SA field extracted from the packet */
-	std::array<uint8_t, 6> maskMacSa; /*!< Set bits to 1 to mask/exclude corresponding flowid_tcam_data bit from compare */
-	uint16_t keyEthertype; /*!< First E-Type found in the packet that doesn't match one of the preconfigured custom tag. */
-	uint16_t maskEthertype; /*!< Set bits to 1 to mask/exclude corresponding flowid_tcam_data bit from compare */
-	MACsecVLANTag keyVlanTagOuter1; /*!< outermost/1st VLAN ID {8'd0, VLAN_ID[11:0]}, or 20-bit MPLS label. */
-	MACsecMPLSOuter keyMplsOuter1;
-	MACsecVLANTag maskVlanTagOuter1; /*!< Set bits to 1 to mask/exclude corresponding flowid_tcam_data bit from compare */
-	MACsecMPLSOuter maskMplsOuter1;
-	MACsecVLANTag keyVlanTagOuter2; /*!< 2nd outermost VLAN ID {8'd0, VLAN_ID[11:0]}, or 20-bit MPLS label. */
-	MACsecMPLSOuter keyMplsOuter2;
-	MACsecVLANTag maskVlanTagOuter2; /*!< Set bits to 1 to mask/exclude corresponding flowid_tcam_data bit from compare */
-	MACsecMPLSOuter maskMplsOuter2;
-	uint16_t keyBonusData; /*!< 2 bytes of additional bonus data extracted from one of the custom tags. */
-	uint16_t maskBonusData; /*!< Set bits to 1 to mask/exclude corresponding flowid_tcam_data bit from compare */
-	uint8_t keyTagMatchBitmap; /*!< 8 bits total. Maps 1 to 1 bitwise with the set of custom tags. (set bit[N]=1 if check Nth custom tag) */
-	uint8_t maskTagMatchBitmap; /*!< Set bits to 1 to mask/exclude corresponding flowid_tcam_data bit from compare */
-	MACsecPacketType keyPacketType; /*!< Encoded Packet Type, see MACSEC_PACKET_TYPE */
-	uint8_t maskPacketType; /*!< Set bits to 1 to mask/exclude corresponding flowid_tcam_data bit from compare */
-	uint16_t keyInnerVlanType; /*!< 3 bits total. Encoded value indicating which VLAN TPID value matched for the second outermost VLAN Tag. */
-	uint16_t maskInnerVlanType; /*!< Set bits to 1 to mask/exclude corresponding flowid_tcam_data bit from compare */
-	uint16_t keyOuterVlanType; /*!< 3 bits total. Encoded value indicating which VLAN TPID value matched for the outermost VLAN Tag. */
-	uint16_t maskOuterVlanType; /*!< Set bits to 1 to mask/exclude corresponding flowid_tcam_data bit from compare */
-	uint8_t keyNumTags; /*!< 7 bits total. Number of VLAN/custom tags or MPLS lables detected. Ingress: before SecTag; Egress: total detected. Exclude MCS header tags. i.e. Bit 2: 2 tags/labels before SecTAG...Bit 6: 6 or more tags/labels before SecTAG. */
-	uint8_t maskNumTags; /*!< Set bits to 1 to mask/exclude corresponding flowid_tcam_data bit from compare */
-	bool keyExpress; /*!< 1 bits. Express packet. */
-	uint8_t maskExpress; /*!< Set bits to 1 to mask/exclude corresponding flowid_tcam_data bit from compare */
-	bool isMpls;
-	bool enable;
-};
-
-struct MACsecMap
-{
-	uint8_t index;
-	uint64_t secTagSci; /*!< Identifies the SecTAG SCI for this Flow. */
-	uint8_t secYIndex; /*!< index for entry in Egress secY Policy */
-	bool isControlPacket; /*!< Identifies all packets matching this index lookup as control packets. */
-	uint8_t scIndex; /*!< Identifies the SC for this Flow. */
-	uint8_t auxiliaryPlcy; /*!< Auxiliary policy bits. */
-	uint8_t ruleId; /*!< Identifies the Rule for this Flow. */
-	bool enable;
-};
-
-enum class MACsecValidateFrameType : uint8_t
-{
-	Disabled = 0, /*!< Disable validation */
-	Check = 1, /*!< Enable validation, do not discard invalid frames*/
-	Strict = 2, /*!< Enable validation and discard invalid frames */
-	NA = 3 /*!< No processing or accounting */
-};
-
-enum class MACsecSecTagIcvStripType : uint8_t
-{
-	StripBoth = 0, /*!< Strip both SecTag and ICV from packet */
-	StripSecTagPreserveICV = 1,
-	PreserveSecTagStripICV = 2, /*!< Preserve SecTag, Strip ICV */
-	PreserveBoth = 3 /*!< Preserve both SecTag and ICV */
-};
-
-enum class MACsecCipherSuiteType : uint8_t
-{
-	GcmAes128 = 0,
-	GcmAes256 = 1,
-	GcmAes128Xpn = 2,
-	GcmAes256Xpn = 3
-};
-
-struct MACsecSecY
-{
-	uint8_t index; /*!< Identifies the SecY for this Flow. */
-	bool controlledPortEnabled; /*!< Enable (or disable) operation of the Controlled port associated with this SecY */
-	MACsecValidateFrameType frameValidationType; /*!< see MACSEC_VALIDATEFRAME */
-	MACsecSecTagIcvStripType secTagIcvStripType; /*!< see MACSEC_STRIP_SECTAG_ICV */
-	MACsecCipherSuiteType cipher; /*!< Define the cipher suite to use for this SecY see MACSEC_CIPHER_SUITE */
-	uint8_t confidentialOffset; /*!< Define the number of bytes that are unencrypted following the SecTag. */
-	bool icvIncludesDaSa; /*!< When set, the outer DA/SA bytes are included in the authentication GHASH calculation */
-	bool replayProtect; /*!< Enables Anti-Replay protection */
-	uint32_t replayWindow; /*!< Unsigned value indicating the size of the anti-replay window. */
-	bool protectFrames; /*!< 0 = do not encrypt or authenticate this packet; 1 = always Authenticate frame and if SecTag.TCI.E = 1 encrypt the packet as well. */
-	uint8_t secTagOffset; /*!< Define the offset in bytes from either the start of the packet or a matching Etype depending on SecTag_Insertion_Mode. */
-	uint8_t secTagTci; /*!< Tag Control Information excluding the AN field which originates from the SA Policy table */
-	uint16_t mtu; /*!< Specifies the outgoing MTU for this SecY */
-	bool enable;
-};
-
-struct MACsecSc
-{
-	uint8_t index; /*!< SC index. */
-	uint8_t secYIndex; /*!< SecY associated with this packet. */
-	uint64_t sci; /*!< The Secure Channel Identifier. */
-	uint8_t saIndex0; /*!< Define the 1st SA to use */
-	uint8_t saIndex1; /*!< Define the 2nd SA to use */
-	bool saIndex0InUse; /*!< Specifies whether 1st SA is in use or not. */
-	bool saIndex1InUse; /*!< Specifies whether 2nd SA is in use or not.  */
-	bool enableAutoRekey; /*!< If enabled, then once the pn_threshold is reached, auto rekey will happen. */
-	bool isActiveSa1; /*!< If set, then sa_index1 is the currently active SA index. If cleared, the sa_index0 is the currently active SA index). */
-	bool enable;
-};
-
-struct MACsecSa
-{
-	uint8_t index; /*!< SA index */
-	std::array<uint8_t, 32> sak; /*!< 256b SAK: Define the encryption key to be used to encrypte this packet. The lower 128 bits are used for 128-bit ciphers. */
-	std::array<uint8_t, 16> hashKey; /*!< 128b Hash Key: Key used for authentication. */
-	std::array<uint8_t, 12> salt; /*!< 96b Salt value: Salt value used in XPN ciphers. */
-	uint32_t ssci; /*!< 32b SSCI value: Short Secure Channel Identifier, used in XPN ciphers. */
-	uint8_t an; /*!< 2b SecTag Association Number (AN) */
-	uint64_t nextPn; /*!< 64b next_pn value: Next packet number to insert into outgoing packet on a particular SA. */
-	bool enable;
-};
-
-struct MACSecFlags
-{
-	bool en; // '1' = enable; '0' = disable
-};
-
-/* MACSec Settings for 1 port/phy */
-struct MACsecConfig
-{
-	static constexpr int NumFlags = 1;
-	static constexpr int NumRules = 2;
-	static constexpr int NumMaps = 2;
-	static constexpr int NumSecY = 2;
-	static constexpr int NumSc = 2;
-	static constexpr int NumSa = 4;
-
-	MACSecFlags flags;
-	std::array<MACsecRule, NumRules> rule;
-	std::array<MACsecMap, NumMaps> map;
-	std::array<MACsecSecY, NumSecY> secy;
-	std::array<MACsecSc, NumSc> sc;
-	std::array<MACsecSa, NumSa> sa;
-};
-
-struct MACSecGlobalFlags
-{
-	bool en; // '1' = enable; '0' = disable
-	bool nvm; // store macsec config in non-volatile memory
-};
-
-class MACsecMessage : public Message
-{
-public:
-	MACsecMessage(void) : Message(Message::Type::RawMessage) {}
-
-	MACSecGlobalFlags flags;
-	MACsecConfig rx;
-	MACsecConfig tx;
-
-	static std::shared_ptr<MACsecMessage> DecodeToMessage(const std::vector<uint8_t>& bytestream, const device_eventhandler_t& report);
-	bool EncodeFromMessage(std::vector<uint8_t>& bytestream, const device_eventhandler_t& report) const;
-};
-
-}
-
-#endif // __cplusplus
-
-#endif

include/icsneo/communication/packetizer.h

@@ -4,7 +4,7 @@
 #ifdef __cplusplus
 
 #include "icsneo/communication/packet.h"
-#include "icsneo/communication/ringbuffer.h"
+#include "icsneo/core/ringbuffer.h"
 #include "icsneo/api/eventmanager.h"
 #include <queue>
 #include <vector>

include/icsneo/communication/ringbuffer.h

@@ -1,75 +0,0 @@
-#ifndef _RINGBUFFER_H_
-#define _RINGBUFFER_H_
-
-#include <cstdint>
-#include <cstddef>
-#include <memory>
-#include <cstring>
-#include <mutex>
-#include <atomic>
-#include <vector>
-#if __cplusplus >= 202002L
-#include <bit>
-#endif
-namespace icsneo {
-
-class RingBuffer
-{
-private:
-    static constexpr size_t RoundUp(size_t size) {
-        if (size == 0) {
-            // Avoid underflow when decrementing later
-            return 1;
-        } else if (size >= SIZE_MAX) {
-            // overflow case - resolve to max size
-            return MaxSize;
-        }
-#if __cplusplus >= 202002L
-        // c++20 gives us countl_zero which should be more effecient on most platforms
-        auto lzero = std::countl_zero(size - 1);
-        auto shift = (sizeof(size_t) * 8) - lzero;
-        return 1ull << shift;
-#else
-        // Bit twiddling magic! See http://graphics.stanford.edu/~seander/bithacks.html#RoundUpPowerOf2
-        --size;
-        size |= size >> 1;
-        size |= size >> 2;
-        size |= size >> 4;
-        for (size_t i = 1; i < sizeof(size_t); i <<= 1) {
-            size |= size >> (i << 3);
-        }
-        ++size;
-        return size;
-#endif
-    }
-    //static_assert(std::atomic<size_t>::is_always_lock_free, "RingBuffer cursor types are not lock-free");
-    std::atomic<size_t> readCursor;
-    std::atomic<size_t> writeCursor;
-    // Use this to mask the cursor values to the buffer size. This is set to capacity - 1 where capacity is always an integral power of 2 (2, 4, 8, 16, etc)
-    size_t mask;
-    uint8_t* buf;
-
-public:
-    static constexpr auto MaxSize =  1ull << ((8 * sizeof(size_t)) - 1);
-    RingBuffer(size_t bufferSize);
-    ~RingBuffer();
-    const uint8_t& operator[](size_t offset) const;
-    size_t size() const;
-    void pop_front();
-    void pop(size_t count);
-    const uint8_t& get(size_t offset) const;
-    bool write(const uint8_t* addr, size_t count);
-    bool write(const std::vector<uint8_t>& source);
-    bool read(uint8_t* dest, size_t startIndex, size_t length) const;
-    void clear();
-    constexpr size_t capacity() const {
-        return mask + 1;
-    }
-
-protected:
-    inline uint8_t* resolve(size_t cursor, size_t offset) const {
-        return &buf[(cursor + offset) & mask];
-    }
-};
-}
-#endif

include/icsneo/core/crc32.h

@@ -5,13 +5,12 @@
  *      Author: BJones
  */
 
-#pragma once
-
-#ifndef CRC32_H_
-#define CRC32_H_
+#ifndef __CRC32_H_
+#define __CRC32_H_
 
 #include <stdint.h>
 
+namespace icsneo {
 /*
  * When any data/buffer is run through calCRC(), then the resulting CRC value
  *  is appended to the end of the data/buffer and the data/buffer is rerun
@@ -24,4 +23,6 @@
 uint32_t crc32(uint32_t crc, const unsigned char* buf, uint32_t len);
 uint32_t revcrc32(uint32_t crc, const unsigned char* buf, uint32_t len);
 
+}
+
 #endif // CRC32_H_

include/icsneo/core/macseccfg.h

@@ -0,0 +1,217 @@
+#ifndef __MACSEC_CONFIG_H_
+#define __MACSEC_CONFIG_H_
+
+#include <vector>
+#include <array>
+#include <stdint.h>
+#include "icsneo/device/devicetype.h"
+
+namespace icsneo {
+
+
+struct MACsecVLANTag {
+	uint16_t vid = 0xFFFFu; /*!< 12 bits */
+	uint8_t priCfi = 0xFFu; /*!< PRI - 3 bits, CFI - 1bit */
+};
+
+struct MACsecMPLSOuter {
+	uint32_t mplsLabel = 0xFFFFFFFFu; /*!< 20 bits */
+	uint8_t exp = 0xFFu; /*!< 3 bits */
+};
+
+enum class MACsecPacketType : uint8_t {
+	Default = 0,
+	SingleVLAN = 1,
+	DualVLAN = 2,
+	MPLS = 3,
+	SingleVLANFollowedByMPLS = 4,
+	DualVLANFollowedByMPLS = 5,
+	Unsupported = 6,
+};
+
+// Tell the MACsec phy which packets to accept
+struct MACsecRxRule {
+	std::array<uint8_t, 6> keyMacDa = {0xFFu, 0xFFu, 0xFFu, 0xFFu, 0xFFu, 0xFFu}; /*!< MAC DA field extracted from the packet */
+	std::array<uint8_t, 6> maskMacDa = {0xFFu, 0xFFu, 0xFFu, 0xFFu, 0xFFu, 0xFFu}; /*!< Set bits to 1 to mask/exclude corresponding flowid_tcam_data bit from compare */
+	std::array<uint8_t, 6> keyMacSa = {0xFFu, 0xFFu, 0xFFu, 0xFFu, 0xFFu, 0xFFu}; /*!< MAC SA field extracted from the packet */
+	std::array<uint8_t, 6> maskMacSa = {0xFFu, 0xFFu, 0xFFu, 0xFFu, 0xFFu, 0xFFu}; /*!< Set bits to 1 to mask/exclude corresponding flowid_tcam_data bit from compare */
+	uint16_t keyEthertype = 0xFFFFu; /*!< First E-Type found in the packet that doesn't match one of the preconfigured custom tag. */
+	uint16_t maskEthertype = 0xFFFFu; /*!< Set bits to 1 to mask/exclude corresponding flowid_tcam_data bit from compare */
+	MACsecVLANTag keyVlanTagOuter1; /*!< outermost/1st VLAN ID {8'd0, VLAN_ID[11:0]}, or 20-bit MPLS label. */
+	MACsecMPLSOuter keyMplsOuter1;
+	MACsecVLANTag maskVlanTagOuter1; /*!< Set bits to 1 to mask/exclude corresponding flowid_tcam_data bit from compare */
+	MACsecMPLSOuter maskMplsOuter1;
+	MACsecVLANTag keyVlanTagOuter2; /*!< 2nd outermost VLAN ID {8'd0, VLAN_ID[11:0]}, or 20-bit MPLS label. */
+	MACsecMPLSOuter keyMplsOuter2;
+	MACsecVLANTag maskVlanTagOuter2; /*!< Set bits to 1 to mask/exclude corresponding flowid_tcam_data bit from compare */
+	MACsecMPLSOuter maskMplsOuter2;
+	uint16_t keyBonusData = 0xFFFFu; /*!< 2 bytes of additional bonus data extracted from one of the custom tags. */
+	uint16_t maskBonusData = 0xFFFFu; /*!< Set bits to 1 to mask/exclude corresponding flowid_tcam_data bit from compare */
+	uint8_t keyTagMatchBitmap = 0xFFu; /*!< 8 bits total. Maps 1 to 1 bitwise with the set of custom tags. (set bit[N]=1 if check Nth custom tag) */
+	uint8_t maskTagMatchBitmap = 0xFFu; /*!< Set bits to 1 to mask/exclude corresponding flowid_tcam_data bit from compare */
+	MACsecPacketType keyPacketType = MACsecPacketType::Default; /*!< Encoded Packet Type, see MACSEC_PACKET_TYPE */
+	uint8_t maskPacketType = 0xFFu; /*!< Set bits to 1 to mask/exclude corresponding flowid_tcam_data bit from compare */
+	uint16_t keyInnerVlanType = 0xFFFFu; /*!< 3 bits total. Encoded value indicating which VLAN TPID value matched for the second outermost VLAN Tag. */
+	uint16_t maskInnerVlanType = 0xFFFFu; /*!< Set bits to 1 to mask/exclude corresponding flowid_tcam_data bit from compare */
+	uint16_t keyOuterVlanType = 0xFFFFu; /*!< 3 bits total. Encoded value indicating which VLAN TPID value matched for the outermost VLAN Tag. */
+	uint16_t maskOuterVlanType = 0xFFFFu; /*!< Set bits to 1 to mask/exclude corresponding flowid_tcam_data bit from compare */
+	uint8_t keyNumTags = 0xFFu; /*!< 7 bits total. Number of VLAN/custom tags or MPLS lables detected. Ingress: before SecTag; Egress: total detected. Exclude MCS header tags. i.e. Bit 2: 2 tags/labels before SecTAG...Bit 6: 6 or more tags/labels before SecTAG. */
+	uint8_t maskNumTags = 0xFFu; /*!< Set bits to 1 to mask/exclude corresponding flowid_tcam_data bit from compare */
+	bool keyExpress = true; /*!< 1 bits. Express packet. */
+	bool maskExpress = true; /*!< Set bits to 1 to mask/exclude corresponding flowid_tcam_data bit from compare */
+	bool isMpls = false;
+};
+
+enum class MACsecValidation : uint8_t {
+	Disabled = 0, /*!< Disable validation */
+	Check = 1, /*!< Enable validation, do not discard invalid frames*/
+	Strict = 2, /*!< Enable validation and discard invalid frames */
+	NA = 3 /*!< No processing or accounting */
+};
+
+enum class MACsecStrip : uint8_t {
+	StripSecTagAndIcv = 0, /*!< Strip both SecTag and ICV from packet */
+	StripSecTagPreserveICV = 1,
+	PreserveSecTagStripICV = 2, /*!< Preserve SecTag, Strip ICV */
+	NoStrip = 3 /*!< Preserve both SecTag and ICV */
+};
+
+enum class MACsecCipherSuite : uint8_t {
+	GcmAes128 = 0,
+	GcmAes256 = 1,
+	GcmAes128Xpn = 2,
+	GcmAes256Xpn = 3
+};
+
+// Tag control information
+struct MACsecTci {
+	bool es = false; // End station bit
+	bool sc = true; // SCI included bit
+	bool scb = false; // Single Copy Broadcast
+	bool e = false; // Encryption bit
+	bool c = false; // Changed text bit
+};
+
+
+struct MACsecRxSecY {
+	bool enableControlPort = true; /*!< Enable (or disable) operation of the Controlled port associated with this SecY */
+	MACsecValidation frameValidation = MACsecValidation::Strict; /*!< see MACSEC_VALIDATEFRAME */
+	MACsecStrip frameStrip = MACsecStrip::NoStrip; /*!< see MACSEC_STRIP_SECTAG_ICV */
+	MACsecCipherSuite cipher = MACsecCipherSuite::GcmAes128; /*!< Define the cipher suite to use for this SecY see MACSEC_CIPHER_SUITE */
+	uint8_t confidentialityOffset = 0; /*!< Define the number of bytes that are unencrypted following the SecTag. */
+	bool icvIncludesDaSa = true; /*!< When set, the outer DA/SA bytes are included in the authentication GHASH calculation */
+	bool replayProtect = true; /*!< Enables Anti-Replay protection */
+	uint32_t replayWindow = 1; /*!< Unsigned value indicating the size of the anti-replay window. */
+	bool isControlPacket = false; /*!< Identifies all packets matching this index lookup as control packets. */
+	uint64_t sci; /** The SCI of this secY */
+};
+
+struct MACsecTxSecY {
+	bool enableControlPort = true; /*!< Enable (or disable) operation of the Controlled port associated with this SecY */
+	MACsecCipherSuite cipher = MACsecCipherSuite::GcmAes128; /*!< Define the cipher suite to use for this SecY see MACSEC_CIPHER_SUITE */
+	uint8_t confidentialityOffset = 0; /*!< Define the number of bytes that are unencrypted following the SecTag. */
+	bool icvIncludesDaSa = true; /*!< When set, the outer DA/SA bytes are included in the authentication GHASH calculation */
+	bool protectFrames = true; /*!< 0 = do not encrypt or authenticate this packet; 1 = always Authenticate frame and if SecTag.TCI.E = 1 encrypt the packet as well. */
+	uint8_t secTagOffset = 12; /*!< Define the offset in bytes from either the start of the packet or a matching Etype depending on SecTag_Insertion_Mode. */
+	MACsecTci tci; /*!< Tag Control Information excluding the AN field which originates from the SA Policy table */
+	uint16_t mtu = 0xFFFFu; /*!< Specifies the outgoing MTU for this SecY */
+	bool isControlPacket = false; /*!< Identifies all packets matching this index lookup as control packets. */
+	uint8_t auxiliaryPolicy = 0u; /*!< Auxiliary policy bits. */
+	uint64_t sci = 0x1122334455660001u;
+};
+
+struct MACsecTxSa {
+	std::array<uint8_t, 32> sak = {0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 
+		0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u}; /*!< 256b SAK: Define the encryption key to be used to encrypte this packet. The lower 128 bits are used for 128-bit ciphers. */
+	std::array<uint8_t, 16> hashKey = {0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u}; /*!< 128b Hash Key: Key used for authentication. */
+	std::array<uint8_t, 12> salt = {0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u}; /*!< 96b Salt value: Salt value used in XPN ciphers. */
+	uint32_t ssci = 0x01u; /*!< 32b SSCI value: Short Secure Channel Identifier, used in XPN ciphers. */
+	uint8_t an = 0x00;; /*!< 2b SecTag Association Number (AN) */
+	uint64_t nextPn = 0x01u; /*!< 64b next_pn value: Next packet number to insert into outgoing packet on a particular SA. */
+};
+
+struct MACsecRxSa {
+	std::array<uint8_t, 32> sak = {0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 
+		0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u}; /*!< 256b SAK: Define the encryption key to be used to encrypte this packet. The lower 128 bits are used for 128-bit ciphers. */
+	std::array<uint8_t, 16> hashKey = {0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u}; /*!< 128b Hash Key: Key used for authentication. */
+	std::array<uint8_t, 12> salt = {0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u}; /*!< 96b Salt value: Salt value used in XPN ciphers. */
+	uint32_t ssci = 0x01u; /*!< 32b SSCI value: Short Secure Channel Identifier, used in XPN ciphers. */
+	uint64_t nextPn = 0x01u; /*!< 64b next_pn value: Next packet number to insert into outgoing packet on a particular SA. */
+};
+
+class MACsecConfig {
+private:
+	bool enableRx = false;
+	bool enableTx = false;
+	bool nvm = false;
+
+	uint8_t maxSecY;
+	uint8_t maxSa;
+	uint8_t maxRule;
+	uint16_t binIndex;
+	DeviceType type;
+
+	std::vector<MACsecRxRule> rxRule;
+	std::vector<MACsecRxSecY> rxSecY;
+	std::vector<MACsecTxSecY> txSecY;
+	std::vector<MACsecTxSa> txSa;
+	std::vector<MACsecRxSa> rxSa;
+	std::vector<std::pair<uint8_t, uint8_t>> txSecYSaIndices;
+	std::vector<std::pair<uint8_t, uint8_t>> rxSecYSaIndices;
+	std::vector<bool> rxSecYRekey;
+	std::vector<bool> txSecYRekey;
+	std::vector<uint8_t> rxRuleIndices;
+public:
+	MACsecConfig() = delete;
+	MACsecConfig(const DeviceType& deviceType);
+
+	int addRxSecY(const MACsecRxSecY& secY, uint8_t saIndex);
+	int addTxSecY(const MACsecTxSecY& secY, uint8_t saIndex);
+	
+	int addRxRule(const MACsecRxRule& rule, uint8_t secYIndex);
+
+	int addRxSa(const MACsecRxSa& sa);
+	int addTxSa(const MACsecTxSa& sa);
+
+	MACsecRxSecY& getRxSecY(uint8_t secYIndex);
+	const MACsecRxSecY& getRxSecY(uint8_t secYIndex) const;
+	MACsecTxSecY& getTxSecY(uint8_t secYIndex);
+	const MACsecTxSecY& getTxSecY(uint8_t secYIndex) const;
+
+	MACsecRxSa& getRxSa(uint8_t saIndex);
+	const MACsecRxSa& getRxSa(uint8_t saIndex) const;
+	MACsecTxSa& getTxSa(uint8_t saIndex);
+	const MACsecTxSa& getTxSa(uint8_t saIndex) const;
+
+	MACsecRxRule& getRxRule(uint8_t ruleIndex);
+	const MACsecRxRule& getRxRule(uint8_t ruleIndex) const;
+
+	bool setTxSaIndex(uint8_t secYIndex, uint8_t saIndex);
+	bool enableTxRekey(uint8_t secYIndex, uint8_t rekeySaIndex);
+	bool setTxSaRekeyIndex(uint8_t secYIndex, uint8_t saIndex);
+	void disableTxRekey(uint8_t secYIndex);
+
+	bool setRxSaIndex(uint8_t secYIndex, uint8_t saIndex);
+	bool enableRxRekey(uint8_t secYIndex, uint8_t rekeySaIndex);
+	bool setRxSaRekeyIndex(uint8_t secYIndex, uint8_t saIndex);
+	void disableRxRekey(uint8_t secYIndex);
+
+	void setRxEnable(bool rxEnable);
+	void setTxEnable(bool txEnable);
+	void setStorage(bool temporary);
+	
+	void clear();
+	std::vector<uint8_t> serialize() const;
+	operator bool() const;
+	uint16_t getBinIndex() const;
+	DeviceType getType() const;
+	uint8_t getMaxNumRule() const;
+	uint8_t getMaxNumSecY() const;
+	uint8_t getMaxNumSa() const;
+};
+
+}
+
+#endif
+
+

include/icsneo/core/ringbuffer.h

@@ -0,0 +1,75 @@
+#ifndef _RINGBUFFER_H_
+#define _RINGBUFFER_H_
+
+#include <cstdint>
+#include <cstddef>
+#include <memory>
+#include <cstring>
+#include <mutex>
+#include <atomic>
+#include <vector>
+#if __cplusplus >= 202002L
+#include <bit>
+#endif
+namespace icsneo {
+
+class RingBuffer
+{
+private:
+	static constexpr size_t RoundUp(size_t size) {
+		if (size == 0) {
+			// Avoid underflow when decrementing later
+			return 1;
+		} else if (size >= SIZE_MAX) {
+			// overflow case - resolve to max size
+			return MaxSize;
+		}
+#if __cplusplus >= 202002L
+		// c++20 gives us countl_zero which should be more effecient on most platforms
+		auto lzero = std::countl_zero(size - 1);
+		auto shift = (sizeof(size_t) * 8) - lzero;
+		return 1ull << shift;
+#else
+		// Bit twiddling magic! See http://graphics.stanford.edu/~seander/bithacks.html#RoundUpPowerOf2
+		--size;
+		size |= size >> 1;
+		size |= size >> 2;
+		size |= size >> 4;
+		for (size_t i = 1; i < sizeof(size_t); i <<= 1) {
+			size |= size >> (i << 3);
+		}
+		++size;
+		return size;
+#endif
+	}
+	//static_assert(std::atomic<size_t>::is_always_lock_free, "RingBuffer cursor types are not lock-free");
+	std::atomic<size_t> readCursor;
+	std::atomic<size_t> writeCursor;
+	// Use this to mask the cursor values to the buffer size. This is set to capacity - 1 where capacity is always an integral power of 2 (2, 4, 8, 16, etc)
+	size_t mask;
+	uint8_t* buf;
+
+public:
+	static constexpr auto MaxSize =  1ull << ((8 * sizeof(size_t)) - 1);
+	RingBuffer(size_t bufferSize);
+	~RingBuffer();
+	const uint8_t& operator[](size_t offset) const;
+	size_t size() const;
+	void pop_front();
+	void pop(size_t count);
+	const uint8_t& get(size_t offset) const;
+	bool write(const uint8_t* addr, size_t count);
+	bool write(const std::vector<uint8_t>& source);
+	bool read(uint8_t* dest, size_t startIndex, size_t length) const;
+	void clear();
+	constexpr size_t capacity() const {
+		return mask + 1;
+	}
+
+protected:
+	inline uint8_t* resolve(size_t cursor, size_t offset) const {
+		return &buf[(cursor + offset) & mask];
+	}
+};
+}
+#endif

include/icsneo/device/device.h

@@ -46,7 +46,7 @@
 #include "icsneo/communication/message/extendeddatamessage.h"
 #include "icsneo/communication/message/livedatamessage.h"
 #include "icsneo/communication/message/tc10statusmessage.h"
-#include "icsneo/communication/message/macsecmessage.h"
+#include "icsneo/core/macseccfg.h"
 #include "icsneo/communication/packet/genericbinarystatuspacket.h"
 #include "icsneo/communication/packet/livedatapacket.h"
 #include "icsneo/device/extensions/flexray/controller.h"
@@ -855,7 +855,7 @@ public:
 	std::optional<GPTPStatus> getGPTPStatus(std::chrono::milliseconds timeout = std::chrono::milliseconds(100));
 
 	/* MACsec support */
-	virtual bool writeMACsecConfig(const MACsecMessage& message, uint16_t binaryIndex);
+	virtual bool writeMACsecConfig(const MACsecConfig& cfg);
 
 	std::shared_ptr<DeviceExtension> getExtension(const std::string& name) const;
 	
@@ -910,6 +910,8 @@ protected:
 		diskWriteDriver = std::unique_ptr<DiskWrite>(new DiskWrite());
 		setupSupportedRXNetworks(supportedRXNetworks);
 		setupSupportedTXNetworks(supportedTXNetworks);
+		supportedRXNetworks.emplace_back(Network::NetID::Device);
+		supportedTXNetworks.emplace_back(Network::NetID::Device);
 		setupExtensions();
 	}
 

include/icsneo/device/idevicesettings.h

@@ -409,6 +409,14 @@ typedef struct ETHERNET10T1S_SETTINGS_EXT_t
 } ETHERNET10T1S_SETTINGS_EXT;
 #define ETHERNET10T1S_SETTINGS_EXT_SIZE 16
 
+typedef struct ETHERNET10T1L_SETTINGS_t
+{
+	uint8_t tx_mode;
+	uint8_t rsvd[7];
+} ETHERNET10T1L_SETTINGS;
+#define ETHERNET10T1L_SETTINGS_SIZE 8
+
+
 #define ETHERNET_SETTINGS10G_FLAG_FULL_DUPLEX  0x01
 #define ETHERNET_SETTINGS10G_FLAG_AUTO_NEG     0x02
 #define ETHERNET_SETTINGS10G_FLAG_TCPIP_ENABLE 0x04

include/icsneo/device/tree/etherbadge/etherbadgesettings.h

@@ -56,11 +56,15 @@ typedef struct {
 		uint32_t enablePcEthernetComm : 1;
 		uint32_t reserved : 29;
 	} flags;//4
+
+	ETHERNET_SETTINGS2 ethernet2; //16
 } etherbadge_settings_t;
 #pragma pack(pop)
 
 #ifdef __cplusplus
 
+static_assert(sizeof(etherbadge_settings_t) == 316, "EtherBadge settings size mismatch");
+
 #include <iostream>
 
 class EtherBADGESettings : public IDeviceSettings {

include/icsneo/device/tree/neoviconnect/neoviconnect.h

@@ -52,6 +52,7 @@ public:
 			.add<FlashPhase>(ChipID::Connect_LINUX, BootloaderCommunication::Application, false, false, false)
 			.add<FinalizePhase>(ChipID::Connect_ZCHIP, BootloaderCommunication::Application)
 			.add<FinalizePhase>(ChipID::Connect_LINUX, BootloaderCommunication::Application)
+			.add<EnterApplicationPhase>(ChipID::Connect_ZCHIP)
 			.add<ReconnectPhase>()
 			.addSetting(BootloaderSetting::UpdateAll, true);
 	}

include/icsneo/device/tree/neoviconnect/neoviconnectsettings.h

@@ -51,8 +51,6 @@ typedef struct {
 	uint16_t iso_msg_termination_2;
 	ETHERNET_SETTINGS ethernet_1;
 	ETHERNET_SETTINGS2 ethernet2_1;
-	ETHERNET_SETTINGS ethernet_2;
-	ETHERNET_SETTINGS2 ethernet2_2;
 	STextAPISettings text_api;
 	DISK_SETTINGS disk;
 	uint16_t misc_io_report_period;
@@ -84,6 +82,8 @@ typedef struct {
 
 #ifdef __cplusplus
 
+static_assert(sizeof(neoviconnect_settings_t) == 628, "NeoVIConnect settings size mismatch");
+
 #include <iostream>
 
 class NeoVIConnectSettings : public IDeviceSettings {

include/icsneo/device/tree/neovifire/neovifiresettings.h

@@ -95,6 +95,8 @@ typedef struct {
 
 #ifdef __cplusplus
 
+static_assert(sizeof(neovifire_settings_t) == 744, "NeoVIFire settings size mismatch");
+
 #include <iostream>
 
 class NeoVIFIRESettings : public IDeviceSettings {

include/icsneo/device/tree/neovifire2/neovifire2settings.h

@@ -105,6 +105,7 @@ typedef struct {
 	uint16_t digitalIoThresholdEnable;
 	TIMESYNC_ICSHARDWARE_SETTINGS timeSync;
 	DISK_SETTINGS disk;
+	ETHERNET_SETTINGS2 ethernet2; // supercedes ethernet settings
 } neovifire2_settings_t;
 
 typedef struct {
@@ -118,6 +119,8 @@ typedef struct {
 
 #ifdef __cplusplus
 
+static_assert(sizeof(neovifire2_settings_t) == 936, "NeoVIFire2 settings size mismatch");
+
 #include <iostream>
 
 class NeoVIFIRE2Settings : public IDeviceSettings {

include/icsneo/device/tree/neovifire3/neovifire3.h

@@ -75,6 +75,7 @@ public:
 			.add<FinalizePhase>(ChipID::neoVIFIRE3_SCHIP, BootloaderCommunication::Application)
 			.add<FinalizePhase>(ChipID::neoVIFIRE3_LINUX, BootloaderCommunication::Application)
 			.add<FinalizePhase>(ChipID::VEM_01_8DW_ZCHIP, BootloaderCommunication::Application)
+			.add<EnterApplicationPhase>(ChipID::neoVIFIRE3_ZCHIP)
 			.add<ReconnectPhase>()
 			.addSetting(BootloaderSetting::UpdateAll, true);
 	}

include/icsneo/device/tree/neovifire3/neovifire3settings.h

@@ -160,6 +160,8 @@ typedef struct {
 
 #ifdef __cplusplus
 
+static_assert(sizeof(neovifire3_settings_t) == 1722, "NeoVIFire3 settings size mismatch");
+
 #include <iostream>
 
 class NeoVIFIRE3Settings : public IDeviceSettings {

include/icsneo/device/tree/neovifire3flexray/neovifire3flexray.h

@@ -80,6 +80,7 @@ public:
 			.add<FinalizePhase>(ChipID::neoVIFIRE3_LINUX, BootloaderCommunication::Application)
 			.add<FinalizePhase>(ChipID::VEM_02_FR_FCHIP, BootloaderCommunication::Application)
 			.add<FinalizePhase>(ChipID::VEM_02_FR_ZCHIP, BootloaderCommunication::Application)
+			.add<EnterApplicationPhase>(ChipID::neoVIFIRE3_ZCHIP)
 			.add<ReconnectPhase>()
 			.addSetting(BootloaderSetting::UpdateAll, true);
 	}

include/icsneo/device/tree/neovifire3flexray/neovifire3flexraysettings.h

@@ -143,6 +143,8 @@ typedef struct {
 
 #ifdef __cplusplus
 
+static_assert(sizeof(neovifire3flexray_settings_t) == 1372, "NeoVIFire3Flexray settings size mismatch");
+
 #include <iostream>
 
 class NeoVIFIRE3FlexRaySettings : public IDeviceSettings {

include/icsneo/device/tree/neovifire3t1slin/neovifire3t1slinsettings.h

@@ -152,6 +152,8 @@ typedef struct {
 
 #ifdef __cplusplus
 
+static_assert(sizeof(neovifire3t1slin_settings_t) == 1594, "NeoVIFire3T1SLIN settings size mismatch");
+
 #include <iostream>
 
 class NeoVIFIRE3T1SLINSettings : public IDeviceSettings {

include/icsneo/device/tree/neovired2/neovired2.h

@@ -58,6 +58,7 @@ public:
 			.add<FinalizePhase>(ChipID::neoVIFIRE3_ZCHIP, BootloaderCommunication::Application)
 			.add<FinalizePhase>(ChipID::neoVIFIRE3_SCHIP, BootloaderCommunication::Application)
 			.add<FinalizePhase>(ChipID::neoVIFIRE3_LINUX, BootloaderCommunication::Application)
+			.add<EnterApplicationPhase>(ChipID::neoVIFIRE3_ZCHIP)
 			.add<ReconnectPhase>()
 			.addSetting(BootloaderSetting::UpdateAll, true);
 	}

include/icsneo/device/tree/neovired2/neovired2settings.h

@@ -105,6 +105,8 @@ typedef struct {
 
 #ifdef __cplusplus
 
+static_assert(sizeof(neovired2_settings_t) == 918, "NeoVIRED2 settings size mismatch");
+
 #include <iostream>
 
 class NeoVIRED2Settings : public IDeviceSettings {

include/icsneo/device/tree/rada2b/rada2b.h

@@ -58,7 +58,7 @@ public:
 		return BootloaderPipeline()
 			.add<EnterBootloaderPhase>()
 			.add<FlashPhase>(ChipID::RADA2B_ZCHIP, BootloaderCommunication::RAD)
-			.add<ReconnectPhase>()
+			// .add<ReconnectPhase>()
 			.add<WaitPhase>(std::chrono::milliseconds(3000));
 	}
 protected:

include/icsneo/device/tree/rada2b/rada2bsettings.h

@@ -59,12 +59,14 @@ typedef struct {
 	ETHERNET_SETTINGS2 ethernet;
 	RAD_GPTP_SETTINGS gPTP;
 	uint64_t network_enables_5;
+	CMP_GLOBAL_DATA cmp_global_data;
+	CMP_NETWORK_DATA cmp_stream_data[CMP_STREAMS_A2B];
 } rada2b_settings_t;
 #pragma pack(pop)
 
 #ifdef __cplusplus
 
-static_assert(sizeof(rada2b_settings_t) == 340, "RAD-A2B settings size mismatch");
+static_assert(sizeof(rada2b_settings_t) == 416, "RAD-A2B settings size mismatch");
 
 #include <iostream>
 

include/icsneo/device/tree/radcomet/radcometbase.h

@@ -45,8 +45,8 @@ public:
 		return BootloaderPipeline()
 			.add<EnterBootloaderPhase>()
 			.add<FlashPhase>(ChipID::RADComet_ZYNQ, BootloaderCommunication::RAD)
-			.add<ReconnectPhase>()
-			.add<WaitPhase>(std::chrono::milliseconds(3000));
+			.add<WaitPhase>(std::chrono::milliseconds(3000))
+			.add<ReconnectPhase>();
 	}
 
 protected:

include/icsneo/device/tree/radcomet3/radcomet3.h

@@ -69,8 +69,8 @@ public:
 		return BootloaderPipeline()
 			.add<EnterBootloaderPhase>()
 			.add<FlashPhase>(ChipID::RADCOMET3_ZCHIP, BootloaderCommunication::RAD)
-			.add<ReconnectPhase>()
-			.add<WaitPhase>(std::chrono::milliseconds(3000));
+			.add<WaitPhase>(std::chrono::milliseconds(5000))
+			.add<ReconnectPhase>();
 	}
 
 protected:

include/icsneo/device/tree/radepsilon/radepsilon.h

@@ -40,6 +40,7 @@ public:
 		return BootloaderPipeline()
 			.add<EnterBootloaderPhase>()
 			.add<FlashPhase>(ChipID::RADEpsilon_MCHIP, BootloaderCommunication::RED)
+			.add<EnterApplicationPhase>(ChipID::RADEpsilon_MCHIP)
 			.add<ReconnectPhase>();
 	}
 	bool supportsComponentVersions() const override { return true; }

include/icsneo/device/tree/radepsilon/radepsilonsettings.h

@@ -80,6 +80,8 @@ typedef struct {
 
 #ifdef __cplusplus
 
+static_assert(sizeof(radepsilon_settings_t) == 400, "RADEpsilon settings size mismatch");
+
 #include <iostream>
 
 class RADEpsilonSettings : public IDeviceSettings {

include/icsneo/device/tree/radepsilonxl/radepsilonxl.h

@@ -35,7 +35,11 @@ public:
 
 	const std::vector<ChipInfo>& getChipInfo() const override {
 		static std::vector<ChipInfo> chips = {
+			// We add both chips here because there is a mismatch between the id of the chip on the device
+			// and the chip that the bootloader extension expects. The device reports a RADProxima chip,
+			// but we use RADEpsilon firmware.
 			{ChipID::RADProxima_MCHIP, true, "MCHIP", "epsilon_mchip_ief", 0, FirmwareType::IEF},
+			{ChipID::RADEpsilon_MCHIP, true, "MCHIP", "epsilon_mchip_ief", 0, FirmwareType::IEF}
 		};
 		return chips;
 	}
@@ -43,7 +47,8 @@ public:
 	BootloaderPipeline getBootloader() override {
 		return BootloaderPipeline()
 			.add<EnterBootloaderPhase>()
-			.add<FlashPhase>(ChipID::RADProxima_MCHIP, BootloaderCommunication::RED)
+			.add<FlashPhase>(ChipID::RADEpsilon_MCHIP, BootloaderCommunication::RED)
+			.add<EnterApplicationPhase>(ChipID::RADEpsilon_MCHIP)
 			.add<ReconnectPhase>();
 	}
 

include/icsneo/device/tree/radgalaxy/radgalaxysettings.h

@@ -92,6 +92,7 @@ typedef struct {
 	uint16_t network_enables_4;
 	
 	RAD_GPTP_SETTINGS gPTP;
+	uint64_t network_enables_5;
 } radgalaxy_settings_t;
 
 typedef struct {
@@ -102,6 +103,8 @@ typedef struct {
 
 #ifdef __cplusplus
 
+static_assert(sizeof(radgalaxy_settings_t) == 776, "RADGalaxy settings size mismatch");
+
 #include <iostream>
 
 class RADGalaxySettings : public IDeviceSettings {

include/icsneo/device/tree/radgalaxy2/radgalaxy2.h

@@ -85,6 +85,7 @@ public:
 			.add<FlashPhase>(ChipID::RAD_GALAXY_2_ZMPCHIP_ID, BootloaderCommunication::RAD)
 			.add<ReconnectPhase>()
 			.add<FlashPhase>(ChipID::RADGALAXY2_SYSMON_CHIP, BootloaderCommunication::RADGalaxy2Peripheral)
+			.add<EnterApplicationPhase>(ChipID::RAD_GALAXY_2_ZMPCHIP_ID)
 			.add<ReconnectPhase>()
 			.add<WaitPhase>(std::chrono::milliseconds(3000));
 	}

include/icsneo/device/tree/radgalaxy2/radgalaxy2settings.h

@@ -103,6 +103,11 @@ typedef struct {
 	uint64_t network_enables_5;
 
 	LIN_SETTINGS lin2;
+
+	uint16_t iso_9141_kwp_enable_reserved_2;
+	ISO9141_KEYWORD2000_SETTINGS iso9141_kwp_settings_2;
+	uint16_t iso_parity_2;
+	uint16_t iso_msg_termination_2;
 } radgalaxy2_settings_t;
 
 typedef struct {
@@ -114,6 +119,8 @@ typedef struct {
 
 #ifdef __cplusplus
 
+static_assert(sizeof(radgalaxy2_settings_t) == 960, "RADGalaxy2 settings size mismatch");
+
 #include <iostream>
 
 class RADGalaxy2Settings : public IDeviceSettings {

include/icsneo/device/tree/radgemini/radgeminisettings.h

@@ -36,6 +36,8 @@ typedef struct {
 
 #ifdef __cplusplus
 
+static_assert(sizeof(radgemini_settings_t) == 86, "RADGemini settings size mismatch");
+
 #include <iostream>
 
 class RADGeminiSettings : public IDeviceSettings {

include/icsneo/device/tree/radgigastar/radgigastar.h

@@ -84,8 +84,8 @@ public:
 					pipeline.add<FlashPhase>(version.id, BootloaderCommunication::RADMultiChip);
 				}
 				pipeline.add<EnterApplicationPhase>(mainChipID);
-				pipeline.add<ReconnectPhase>();
 				pipeline.add<WaitPhase>(std::chrono::milliseconds(3000));
+				pipeline.add<ReconnectPhase>();
 				return pipeline;
 			}
 		}
@@ -93,13 +93,13 @@ public:
 		if(com->driver->isEthernet()) {
 			return BootloaderPipeline()
 				.add<FlashPhase>(ChipID::RADGigastar_ZYNQ, BootloaderCommunication::RAD)
-				.add<ReconnectPhase>()
-				.add<WaitPhase>(std::chrono::milliseconds(3000));
+				.add<WaitPhase>(std::chrono::milliseconds(3000))
+				.add<ReconnectPhase>();
 		}
 		return BootloaderPipeline()
 			.add<FlashPhase>(ChipID::RADGigastar_USBZ_ZYNQ, BootloaderCommunication::RAD)
-			.add<ReconnectPhase>()
-			.add<WaitPhase>(std::chrono::milliseconds(3000));
+			.add<WaitPhase>(std::chrono::milliseconds(3000))
+			.add<ReconnectPhase>();
 	}
 
 	std::vector<VersionReport> getChipVersions(bool refreshComponents = true) override {

include/icsneo/device/tree/radgigastar/radgigastarsettings.h

@@ -84,12 +84,24 @@ typedef struct {
 
 	RAD_GPTP_SETTINGS gPTP;
 	uint64_t network_enables_5;
+
+	// SFP T1S
+	ETHERNET10T1S_SETTINGS sfp_t1s_1;
+	ETHERNET10T1S_SETTINGS_EXT sfp_t1s_ext_1;
+	ETHERNET10T1S_SETTINGS sfp_t1s_2;
+	ETHERNET10T1S_SETTINGS_EXT sfp_t1s_ext_2;
+
+	CMP_GLOBAL_DATA cmp_global_data;
+	CMP_NETWORK_DATA cmp_stream_data[CMP_STREAMS_GIGASTAR];
+	// SFP T1L
+	ETHERNET10T1L_SETTINGS sfp_t1l_1;
+	ETHERNET10T1L_SETTINGS sfp_t1l_2;
 } radgigastar_settings_t;
 #pragma pack(pop)
 
 #ifdef __cplusplus
 
-static_assert(sizeof(radgigastar_settings_t) == 710, "RADGigastar settings size mismatch");
+static_assert(sizeof(radgigastar_settings_t) == 1026, "RADGigastar settings size mismatch");
 
 #include <iostream>
 

include/icsneo/device/tree/radgigastar2/radgigastar2.h

@@ -163,8 +163,8 @@ public:
 			pipeline.add<FlashPhase>(version.id, BootloaderCommunication::RADMultiChip);
 		}
 		pipeline.add<EnterApplicationPhase>(mainChipID);
-		pipeline.add<ReconnectPhase>();
 		pipeline.add<WaitPhase>(std::chrono::milliseconds(3000));
+		pipeline.add<ReconnectPhase>();
 		return pipeline;
 	}
 

include/icsneo/device/tree/radgigastar2/radgigastar2settings.h

@@ -127,18 +127,29 @@ namespace icsneo
 		ETHERNET_SETTINGS2 ethT1s8;
 		ETHERNET10T1S_SETTINGS t1s8;
 		ETHERNET10T1S_SETTINGS_EXT t1s8Ext;
+
+		// SFP T1S
+		ETHERNET10T1S_SETTINGS sfp_t1s_1;
+		ETHERNET10T1S_SETTINGS_EXT sfp_t1s_ext_1;
+		ETHERNET10T1S_SETTINGS sfp_t1s_2;
+		ETHERNET10T1S_SETTINGS_EXT sfp_t1s_ext_2;
+
 		LIN_SETTINGS lin11;
 		LIN_SETTINGS lin12;
 		LIN_SETTINGS lin13;
 		LIN_SETTINGS lin14;
 		LIN_SETTINGS lin15;
 		LIN_SETTINGS lin16;
+
+		// SFP T1L
+		ETHERNET10T1L_SETTINGS sfp_t1l_1;
+		ETHERNET10T1L_SETTINGS sfp_t1l_2;
 	} radgigastar2_settings_t;
 #pragma pack(pop)
 
 #ifdef __cplusplus
 
-	static_assert(sizeof(radgigastar2_settings_t) == 2084, "RADGigastar2 settings size mismatch");
+	static_assert(sizeof(radgigastar2_settings_t) == 2156, "RADGigastar2 settings size mismatch");
 
 #include <iostream>
 

include/icsneo/device/tree/radmoon2/radmoon2.h

@@ -33,8 +33,9 @@ public:
 		return BootloaderPipeline()
 			.add<EnterBootloaderPhase>()
 			.add<FlashPhase>(ChipID::RADMoon2_ZYNQ, BootloaderCommunication::RAD)
-			.add<ReconnectPhase>()
-			.add<WaitPhase>(std::chrono::milliseconds(3000));
+			.add<EnterApplicationPhase>(ChipID::RADMoon2_ZYNQ)
+			.add<WaitPhase>(std::chrono::milliseconds(3000))
+			.add<ReconnectPhase>();
 	}
 protected:
 	RADMoon2(neodevice_t neodevice, const driver_factory_t& makeDriver) : RADMoon2Base(neodevice) {

include/icsneo/device/tree/radmoon2/radmoon2settings.h

@@ -36,6 +36,8 @@ typedef struct {
 
 #ifdef __cplusplus
 
+static_assert(sizeof(radmoon2_settings_t) == 170, "RADMoon2 settings size mismatch");
+
 #include <iostream>
 
 class RADMoon2Settings : public IDeviceSettings {

include/icsneo/device/tree/radmoon2/radmoon2zl.h

@@ -33,6 +33,8 @@ public:
 		return BootloaderPipeline()
 			.add<EnterBootloaderPhase>()
 			.add<FlashPhase>(ChipID::RADMoon2_ZL_MCHIP, BootloaderCommunication::RED)
+			.add<EnterApplicationPhase>(ChipID::RADMoon2_ZL_MCHIP)
+			.add<WaitPhase>(std::chrono::milliseconds(3000))
 			.add<ReconnectPhase>();
 	}
 protected:

include/icsneo/device/tree/radmoon3/radmoon3.h

@@ -45,8 +45,9 @@ public:
 		return BootloaderPipeline()
 			.add<EnterBootloaderPhase>()
 			.add<FlashPhase>(ChipID::RADMoon3_MCHIP, BootloaderCommunication::RED)
-			.add<ReconnectPhase>()
-			.add<WaitPhase>(std::chrono::milliseconds(3000));
+			.add<EnterApplicationPhase>(ChipID::RADMoon3_MCHIP)
+			.add<WaitPhase>(std::chrono::milliseconds(3000))
+			.add<ReconnectPhase>();
 	}
 protected:
 	RADMoon3(neodevice_t neodevice, const driver_factory_t& makeDriver) : Device(neodevice) {

include/icsneo/device/tree/radmoon3/radmoon3settings.h

@@ -33,6 +33,8 @@ typedef struct {
 
 #ifdef __cplusplus
 
+static_assert(sizeof(radmoon3_settings_t) == 68, "RADMoon3 settings size mismatch");
+
 #include <iostream>
 
 class RADMoon3Settings : public IDeviceSettings {

include/icsneo/device/tree/radmoont1s/radmoont1ssettings.h

@@ -32,11 +32,16 @@ typedef struct {
 	// 10T1S
 	ETHERNET_SETTINGS2 ethT1s;
 	ETHERNET10T1S_SETTINGS t1s;
+	// 10T1S Extended Settings
+	ETHERNET10T1S_SETTINGS_EXT t1sExt;
+	RAD_GPTP_SETTINGS gPTP;
 } radmoont1s_settings_t;
 #pragma pack(pop)
 
 #ifdef __cplusplus
 
+static_assert(sizeof(radmoont1s_settings_t) == 160, "RADMoonT1S settings size mismatch");
+
 #include <iostream>
 
 class RADMoonT1SSettings : public IDeviceSettings {

include/icsneo/device/tree/radstar2/radstar2settings.h

@@ -60,11 +60,17 @@ typedef struct {
 	TIMESYNC_ICSHARDWARE_SETTINGS timeSyncSettings;
 	uint16_t hwComLatencyTestEn;
 	RAD_REPORTING_SETTINGS reporting;
+	ETHERNET_SETTINGS2 ethernet;
+
+	RAD_GPTP_SETTINGS gPTP;
+	uint64_t network_enables_5;
 } radstar2_settings_t;
 #pragma pack(pop)
 
 #ifdef __cplusplus
 
+static_assert(sizeof(radstar2_settings_t) == 422, "RADStar2 settings size mismatch");
+
 #include <iostream>
 
 class RADStar2Settings : public IDeviceSettings {

include/icsneo/device/tree/valuecan3/valuecan3settings.h

@@ -31,6 +31,8 @@ typedef struct {
 
 #ifdef __cplusplus
 
+static_assert(sizeof(valuecan3_settings_t) == 40, "ValueCAN3 settings size mismatch");
+
 #include <iostream>
 
 class ValueCAN3Settings : public IDeviceSettings {

include/icsneo/device/tree/valuecan4/valuecan4-1.h

@@ -31,11 +31,13 @@ public:
 		};
 		return chips;
 	}
-	
+
 	BootloaderPipeline getBootloader() override {
 		return BootloaderPipeline()
 			.add<EnterBootloaderPhase>()
 			.add<FlashPhase>(ChipID::ValueCAN4_1_MCHIP, BootloaderCommunication::RED)
+			.add<EnterApplicationPhase>(ChipID::ValueCAN4_1_MCHIP)
+			.add<WaitPhase>(std::chrono::milliseconds(3000))
 			.add<ReconnectPhase>();
 	}
 

include/icsneo/device/tree/valuecan4/valuecan4-2.h

@@ -61,8 +61,9 @@ public:
 		return BootloaderPipeline()
 			.add<EnterBootloaderPhase>()
 			.add<FlashPhase>(ChipID::ValueCAN4_2_MCHIP, BootloaderCommunication::RED)
-			.add<ReconnectPhase>()
-			.add<WaitPhase>(std::chrono::milliseconds(3000));
+			.add<EnterApplicationPhase>(ChipID::ValueCAN4_2_MCHIP)
+			.add<WaitPhase>(std::chrono::milliseconds(3000))
+			.add<ReconnectPhase>();
 	}
 
 protected:

include/icsneo/device/tree/valuecan4/valuecan4-2el.h

@@ -66,7 +66,7 @@ public:
 
 	const std::vector<ChipInfo>& getChipInfo() const override {
 		static std::vector<ChipInfo> chips = {
-			{ChipID::ValueCAN4_2EL_MCHIP, true, "MCHIP", "vcan44_mchip_ief", 0, FirmwareType::IEF}
+			{ChipID::ValueCAN4_2EL_MCHIP, true, "MCHIP", "vcan44_mchip_ief", 0, FirmwareType::IEF},
 		};
 		return chips;
 	}
@@ -75,6 +75,8 @@ public:
 		return BootloaderPipeline()
 			.add<EnterBootloaderPhase>()
 			.add<FlashPhase>(ChipID::ValueCAN4_2EL_MCHIP, BootloaderCommunication::RED)
+			.add<EnterApplicationPhase>(ChipID::ValueCAN4_2EL_MCHIP)
+			.add<WaitPhase>(std::chrono::milliseconds(3000))
 			.add<ReconnectPhase>();
 	}
 

include/icsneo/device/tree/valuecan4/valuecan4-4.h

@@ -64,7 +64,8 @@ public:
 	const std::vector<ChipInfo>& getChipInfo() const override {
 		static std::vector<ChipInfo> chips = {
 			{ChipID::ValueCAN4_4_MCHIP, true, "MCHIP", "vcan44_mchip_ief", 0, FirmwareType::IEF},
-			{ChipID::ValueCAN4_4_SCHIP, true, "SCHIP", "vcan44_schip_ief", 1, FirmwareType::IEF}
+			{ChipID::ValueCAN4_4_SCHIP, true, "SCHIP", "vcan44_schip_ief", 1, FirmwareType::IEF},
+			{ChipID::ValueCAN4_4_2EL_Core, true, "Core", "vcan44_core_ief", 2, FirmwareType::IEF}
 		};
 		return chips;
 	}
@@ -73,7 +74,10 @@ public:
 		return BootloaderPipeline()
 			.add<EnterBootloaderPhase>()
 			.add<FlashPhase>(ChipID::ValueCAN4_4_MCHIP, BootloaderCommunication::RED)
-			.add<FlashPhase>(ChipID::ValueCAN4_4_SCHIP, BootloaderCommunication::RED, false, true)
+			.add<FlashPhase>(ChipID::ValueCAN4_4_SCHIP, BootloaderCommunication::RED)
+			.add<FlashPhase>(ChipID::ValueCAN4_4_2EL_Core, BootloaderCommunication::REDCore)
+			.add<EnterApplicationPhase>(ChipID::ValueCAN4_4_MCHIP)
+			.add<WaitPhase>(std::chrono::milliseconds(3000))
 			.add<ReconnectPhase>();
 	}
 protected:

include/icsneo/device/tree/vividcan/vividcansettings.h

@@ -42,6 +42,8 @@ typedef struct {
 
 #ifdef __cplusplus
 
+static_assert(sizeof(vividcan_settings_t) == 64, "VividCAN settings size mismatch");
+
 #include <iostream>
 
 class VividCANSettings : public IDeviceSettings {

platform/windows/pcap.cpp

@@ -10,7 +10,7 @@
 #include "icsneo/communication/ethernetpacketizer.h"
 #include "icsneo/communication/packetizer.h"
 #include "icsneo/communication/decoder.h"
-#include "icsneo/communication/ringbuffer.h"
+#include "icsneo/core/ringbuffer.h"
 #include <pcap.h>
 #include <iphlpapi.h>
 #pragma comment(lib, "IPHLPAPI.lib")

pyproject.toml

@@ -23,6 +23,7 @@ classifiers = [
     'Programming Language :: Python :: 3.11',
     'Programming Language :: Python :: 3.12',
     'Programming Language :: Python :: 3.13',
+    'Programming Language :: Python :: 3.14',
     'Programming Language :: Python :: 3 :: Only',
     'Programming Language :: Python :: Implementation :: CPython',
     'Operating System :: Microsoft :: Windows',