diff options
author | David Crocker <dcrocker@eschertech.com> | 2020-06-23 17:05:30 +0300 |
---|---|---|
committer | David Crocker <dcrocker@eschertech.com> | 2020-06-23 17:05:30 +0300 |
commit | 4a0c7b6d276043547d0efc9a64dd48db2baad542 (patch) | |
tree | 7e6cedbfa5485a75f058a58f31541cfe85b1169c /src/Hardware/SAME70/Ethernet | |
parent | 70f8c2fe30f5237cc8a7f2cf594ae6d49fcedf4a (diff) |
Added Ethernet support for 5LC
Diffstat (limited to 'src/Hardware/SAME70/Ethernet')
-rw-r--r-- | src/Hardware/SAME70/Ethernet/GmacInterface.cpp | 8 | ||||
-rw-r--r-- | src/Hardware/SAME70/Ethernet/ksz8081rna/ethernet_phy.c (renamed from src/Hardware/SAME70/Ethernet/Phy/ethernet_phy.c) | 0 | ||||
-rw-r--r-- | src/Hardware/SAME70/Ethernet/ksz8081rna/ethernet_phy.h (renamed from src/Hardware/SAME70/Ethernet/Phy/ethernet_phy.h) | 0 |
3 files changed, 2 insertions, 6 deletions
diff --git a/src/Hardware/SAME70/Ethernet/GmacInterface.cpp b/src/Hardware/SAME70/Ethernet/GmacInterface.cpp index 85b47aa9..6f14ac23 100644 --- a/src/Hardware/SAME70/Ethernet/GmacInterface.cpp +++ b/src/Hardware/SAME70/Ethernet/GmacInterface.cpp @@ -38,7 +38,7 @@ #include <cstring> extern "C" { -#include "Phy/ethernet_phy.h" +#include "ksz8081rna/ethernet_phy.h" #include "lwip/opt.h" #include "lwip/sys.h" #include "lwip/def.h" @@ -51,9 +51,7 @@ extern "C" { #define __nocache __attribute__((section(".ram_nocache"))) -extern void delay(uint32_t ms) noexcept; - -// We can't #include RepRapFirmware.h here because that leads to a duplicate definition of ERR_TIMEOUT +#include <RepRapFirmware.h> #include <RTOSIface/RTOSIface.h> #include <TaskPriorities.h> @@ -784,8 +782,6 @@ void ethernetif_terminate() noexcept ethernetTask.TerminateAndUnlink(); } -extern "C" u32_t millis() noexcept; - extern "C" u32_t sys_now() noexcept { return millis(); diff --git a/src/Hardware/SAME70/Ethernet/Phy/ethernet_phy.c b/src/Hardware/SAME70/Ethernet/ksz8081rna/ethernet_phy.c index c185c1aa..c185c1aa 100644 --- a/src/Hardware/SAME70/Ethernet/Phy/ethernet_phy.c +++ b/src/Hardware/SAME70/Ethernet/ksz8081rna/ethernet_phy.c diff --git a/src/Hardware/SAME70/Ethernet/Phy/ethernet_phy.h b/src/Hardware/SAME70/Ethernet/ksz8081rna/ethernet_phy.h index 7baa3e63..7baa3e63 100644 --- a/src/Hardware/SAME70/Ethernet/Phy/ethernet_phy.h +++ b/src/Hardware/SAME70/Ethernet/ksz8081rna/ethernet_phy.h |