diff options
| author | David Crocker <dcrocker@eschertech.com> | 2020-06-16 12:16:56 +0300 |
|---|---|---|
| committer | David Crocker <dcrocker@eschertech.com> | 2020-06-16 12:16:56 +0300 |
| commit | da9c9f5f56dec2cbf13c2f0cdc1681d11375fa68 (patch) | |
| tree | 9086983593b37f51f5343c8ed4738490717f22b3 /src/Networking/LwipEthernet/GMAC | |
| parent | 408697a46e19736638b6fc7eb5c2c8a21f09c29e (diff) | |
Moved ksz8081rna driver to this project from CoreNG
Diffstat (limited to 'src/Networking/LwipEthernet/GMAC')
| -rw-r--r-- | src/Networking/LwipEthernet/GMAC/ethernet_sam.cpp | 2 | ||||
| -rw-r--r-- | src/Networking/LwipEthernet/GMAC/same70_gmac.cpp | 12 |
2 files changed, 8 insertions, 6 deletions
diff --git a/src/Networking/LwipEthernet/GMAC/ethernet_sam.cpp b/src/Networking/LwipEthernet/GMAC/ethernet_sam.cpp index da87c94f..ef0aa4aa 100644 --- a/src/Networking/LwipEthernet/GMAC/ethernet_sam.cpp +++ b/src/Networking/LwipEthernet/GMAC/ethernet_sam.cpp @@ -46,7 +46,7 @@ extern "C" { -#include "ethernet_phy.h" +#include <Hardware/ksz8081rna/ethernet_phy.h> /* lwIP includes */ #include "lwip/api.h" diff --git a/src/Networking/LwipEthernet/GMAC/same70_gmac.cpp b/src/Networking/LwipEthernet/GMAC/same70_gmac.cpp index 79704484..33212834 100644 --- a/src/Networking/LwipEthernet/GMAC/same70_gmac.cpp +++ b/src/Networking/LwipEthernet/GMAC/same70_gmac.cpp @@ -32,12 +32,16 @@ */ #include "same70_gmac.h" + +#if defined(SAME70) && SAME70 #include "pmc/pmc.h" +#endif + #include "conf_eth.h" #include <cstring> extern "C" { -#include "ethernet_phy.h" +#include <Hardware/ksz8081rna/ethernet_phy.h> #include "lwip/opt.h" #include "lwip/sys.h" #include "lwip/def.h" @@ -92,11 +96,9 @@ unsigned int txBufferTooShortCount; #define GMAC_RX_ERRORS (GMAC_RSR_RXOVR | GMAC_RSR_HNO) /** TX descriptor lists */ -COMPILER_ALIGNED(8) -static gmac_tx_descriptor_t gs_tx_desc_null; +alignas(8) static gmac_tx_descriptor_t gs_tx_desc_null; /** RX descriptors lists */ -COMPILER_ALIGNED(8) -static gmac_rx_descriptor_t gs_rx_desc_null; +alignas(8) static gmac_rx_descriptor_t gs_rx_desc_null; /** * GMAC driver structure. */ |