adapt all variants to changed DataLinkLayer Constructor

OpenKNX · Jun 4, 2024 · ea18c2e · ea18c2e
1 parent 4e6a6e5
commit ea18c2e
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/src/knx/bau07B0.cpp b/src/knx/bau07B0.cpp
@@ -10,7 +10,7 @@ using namespace std;
 
 Bau07B0::Bau07B0(Platform& platform)
     : BauSystemBDevice(platform),
-      _dlLayer(_deviceObj, _netLayer.getInterface(), _platform, (ITpUartCallBacks&) *this, (DataLinkLayerCallbacks*) this),
+      _dlLayer(_deviceObj, _netLayer.getInterface(), _platform, *this, (ITpUartCallBacks&) *this, (DataLinkLayerCallbacks*) this),
       DataLinkLayerCallbacks()
 #ifdef USE_CEMI_SERVER
     , _cemiServer(*this)

diff --git a/src/knx/bau27B0.cpp b/src/knx/bau27B0.cpp
@@ -10,7 +10,7 @@ using namespace std;
 
 Bau27B0::Bau27B0(Platform& platform)
     : BauSystemBDevice(platform),
-      _dlLayer(_deviceObj, _rfMediumObj, _netLayer.getInterface(), _platform)
+      _dlLayer(_deviceObj, _rfMediumObj, _netLayer.getInterface(), _platform, *this)
 #ifdef USE_CEMI_SERVER
     , _cemiServer(*this)
 #endif      

diff --git a/src/knx/bau2920.cpp b/src/knx/bau2920.cpp
@@ -14,8 +14,8 @@ Bau2920::Bau2920(Platform& platform)
       _rtObjPrimary(memory()),
       _rtObjSecondary(memory()),
       _rfMediumObject(),
-      _dlLayerPrimary(_deviceObj, _netLayer.getPrimaryInterface(), _platform, (ITpUartCallBacks&) *this),
-      _dlLayerSecondary(_deviceObj, _rfMediumObject, _netLayer.getSecondaryInterface(), platform)
+      _dlLayerPrimary(_deviceObj, _netLayer.getPrimaryInterface(), _platform, *this, (ITpUartCallBacks&) *this),
+      _dlLayerSecondary(_deviceObj, _rfMediumObject, _netLayer.getSecondaryInterface(), platform, *this)
 #ifdef USE_CEMI_SERVER
       ,
       _cemiServer(*this)

diff --git a/src/knx/bau57B0.cpp b/src/knx/bau57B0.cpp
@@ -11,7 +11,7 @@ using namespace std;
 Bau57B0::Bau57B0(Platform& platform)
     : BauSystemBDevice(platform),
       _ipParameters(_deviceObj, platform),
-      _dlLayer(_deviceObj, _ipParameters, _netLayer.getInterface(), _platform, (DataLinkLayerCallbacks*) this),
+      _dlLayer(_deviceObj, _ipParameters, _netLayer.getInterface(), _platform, *this, (DataLinkLayerCallbacks*) this),
       DataLinkLayerCallbacks()
 #ifdef USE_CEMI_SERVER
       ,

diff --git a/src/knx/rf_data_link_layer.cpp b/src/knx/rf_data_link_layer.cpp
@@ -78,8 +78,8 @@ bool RfDataLinkLayer::sendFrame(CemiFrame& frame)
 }
 
 RfDataLinkLayer::RfDataLinkLayer(DeviceObject& devObj, RfMediumObject& rfMediumObj,
-                                         NetworkLayerEntity &netLayerEntity, Platform& platform)
-    : DataLinkLayer(devObj, netLayerEntity, platform),
+                                         NetworkLayerEntity &netLayerEntity, Platform& platform, BusAccessUnit& busAccessUnit)
+    : DataLinkLayer(devObj, netLayerEntity, platform, busAccessUnit),
       _rfMediumObj(rfMediumObj),
       _rfPhy(*this, platform)
 {

diff --git a/src/knx/rf_data_link_layer.h b/src/knx/rf_data_link_layer.h
@@ -22,7 +22,7 @@ class RfDataLinkLayer : public DataLinkLayer
 
   public:
     RfDataLinkLayer(DeviceObject& devObj, RfMediumObject& rfMediumObj, NetworkLayerEntity& netLayerEntity,
-                    Platform& platform);
+                    Platform& platform, BusAccessUnit& busAccessUnit);
 
     void loop();
     void enabled(bool value);