Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/Duet3D/RepRapFirmware.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Crocker <dcrocker@eschertech.com>2020-06-23 11:53:14 +0300
committerDavid Crocker <dcrocker@eschertech.com>2020-06-23 11:53:14 +0300
commit16967cacaab617c4d66bf5ff39e75586b2d65a61 (patch)
tree804486a451edbe50712addd7bb16452cf58a070a /src/Networking/LwipEthernet
parentd0f4ed7d36262598bc92606a49e271fbb8346f32 (diff)
Reorganised the location of Ethernet files in Hardware folders
Diffstat (limited to 'src/Networking/LwipEthernet')
-rw-r--r--src/Networking/LwipEthernet/GMAC/ethernet_sam.cpp9
-rw-r--r--src/Networking/LwipEthernet/LwipEthernetInterface.cpp7
2 files changed, 14 insertions, 2 deletions
diff --git a/src/Networking/LwipEthernet/GMAC/ethernet_sam.cpp b/src/Networking/LwipEthernet/GMAC/ethernet_sam.cpp
index e7e438b5..528977c3 100644
--- a/src/Networking/LwipEthernet/GMAC/ethernet_sam.cpp
+++ b/src/Networking/LwipEthernet/GMAC/ethernet_sam.cpp
@@ -43,7 +43,14 @@
#include "ethernet_sam.h"
-#include <Hardware/SAME70/same70_gmac.h>
+#if defined(__SAME70Q20B__)
+# include <Hardware/SAME70/Ethernet/gmac.h>
+#elif defined(__SAME54P20A__)
+# include <Hardware/SAME5x/Ethernet/gmac.h>
+#else
+# error Unsupported processor
+#endif
+
#include "lwip/netif.h"
#include <cstring>
diff --git a/src/Networking/LwipEthernet/LwipEthernetInterface.cpp b/src/Networking/LwipEthernet/LwipEthernetInterface.cpp
index 5b9aa927..5b8a726a 100644
--- a/src/Networking/LwipEthernet/LwipEthernetInterface.cpp
+++ b/src/Networking/LwipEthernet/LwipEthernetInterface.cpp
@@ -20,7 +20,12 @@
#include "General/IP4String.h"
#include "Version.h" // version is reported by MDNS
#include "GMAC/ethernet_sam.h"
-#include <Hardware/SAME70/same70_gmac.h> // for error counts used in function Diagnostics
+
+#if SAME70
+# include <Hardware/SAME70/Ethernet/gmac.h>
+#elif SAME5x
+# include <Hardware/SAME5x/Ethernet/gmac.h>
+#endif
extern "C"
{