diff options
| author | David Crocker <dcrocker@eschertech.com> | 2020-06-23 13:35:29 +0300 |
|---|---|---|
| committer | David Crocker <dcrocker@eschertech.com> | 2020-06-23 13:35:29 +0300 |
| commit | 70f8c2fe30f5237cc8a7f2cf594ae6d49fcedf4a (patch) | |
| tree | 895688bb127b76ddd6ee8981f7ad005ec6509de7 /src/Hardware/SAME70 | |
| parent | 16967cacaab617c4d66bf5ff39e75586b2d65a61 (diff) | |
Renamed gmac.cpp,.h to GmacInterface.cpp,.h
Also added extra #includes needed to work with latest CoreNG
Diffstat (limited to 'src/Hardware/SAME70')
| -rw-r--r-- | src/Hardware/SAME70/Ethernet/GmacInterface.cpp (renamed from src/Hardware/SAME70/Ethernet/gmac.cpp) | 10 | ||||
| -rw-r--r-- | src/Hardware/SAME70/Ethernet/GmacInterface.h (renamed from src/Hardware/SAME70/Ethernet/gmac.h) | 6 | ||||
| -rw-r--r-- | src/Hardware/SAME70/Ethernet/Phy/ethernet_phy.c | 3 |
3 files changed, 9 insertions, 10 deletions
diff --git a/src/Hardware/SAME70/Ethernet/gmac.cpp b/src/Hardware/SAME70/Ethernet/GmacInterface.cpp index 2b770d68..85b47aa9 100644 --- a/src/Hardware/SAME70/Ethernet/gmac.cpp +++ b/src/Hardware/SAME70/Ethernet/GmacInterface.cpp @@ -31,7 +31,7 @@ * */ -#include "gmac.h" +#include "GmacInterface.h" #include "pmc/pmc.h" #include "conf_eth.h" @@ -51,7 +51,7 @@ extern "C" { #define __nocache __attribute__((section(".ram_nocache"))) -extern void delay(uint32_t ms); +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 <RTOSIface/RTOSIface.h> @@ -221,7 +221,7 @@ static void gmac_rx_populate_queue(struct gmac_device *p_gmac_dev, uint32_t star LWIP_DEBUGF(NETIF_DEBUG, ("gmac_rx_populate_queue: new pbuf allocated: %p [idx=%u]\n", - p, ul_index)); + p, (unsigned int)ul_index)); } ++ul_index; @@ -422,7 +422,7 @@ static err_t gmac_low_level_output(netif *p_netif, struct pbuf *p) noexcept LWIP_DEBUGF(NETIF_DEBUG, ("gmac_low_level_output: DMA buffer sent, size=%d [idx=%u]\n", - p->tot_len, ps_gmac_dev->us_tx_idx)); + p->tot_len, (unsigned int)ps_gmac_dev->us_tx_idx)); ps_gmac_dev->us_tx_idx = (ps_gmac_dev->us_tx_idx + 1) % GMAC_TX_BUFFERS; @@ -498,7 +498,7 @@ static pbuf *gmac_low_level_input(struct netif *netif) noexcept LWIP_DEBUGF(NETIF_DEBUG, ("gmac_low_level_input: DMA buffer %p received, size=%u [idx=%u]\n", - p, length, ps_gmac_dev->us_rx_idx)); + p, (unsigned int)length, (unsigned int)ps_gmac_dev->us_rx_idx)); /* Set pbuf total packet size. */ p->tot_len = length; diff --git a/src/Hardware/SAME70/Ethernet/gmac.h b/src/Hardware/SAME70/Ethernet/GmacInterface.h index c989abd6..1cbe7ad9 100644 --- a/src/Hardware/SAME70/Ethernet/gmac.h +++ b/src/Hardware/SAME70/Ethernet/GmacInterface.h @@ -42,8 +42,8 @@ * */ -#ifndef SAME70_ETHERNET_GMAC_H_INCLUDED -#define SAME70_ETHERNET_GMAC_H_INCLUDED +#ifndef SAME70_ETHERNET_GMACINTERFACE_H_INCLUDED +#define SAME70_ETHERNET_GMACINTERFACE_H_INCLUDED #ifdef __cplusplus extern "C" { @@ -80,4 +80,4 @@ extern unsigned int txErrorCount; extern unsigned int txBufferNotFreeCount; extern unsigned int txBufferTooShortCount; -#endif /* SAME70_ETHERNET_GMAC_H_INCLUDED */ +#endif /* SAME70_ETHERNET_GMACINTERFACE_H_INCLUDED */ diff --git a/src/Hardware/SAME70/Ethernet/Phy/ethernet_phy.c b/src/Hardware/SAME70/Ethernet/Phy/ethernet_phy.c index 0ca27033..c185c1aa 100644 --- a/src/Hardware/SAME70/Ethernet/Phy/ethernet_phy.c +++ b/src/Hardware/SAME70/Ethernet/Phy/ethernet_phy.c @@ -50,9 +50,8 @@ #include "pio/pio.h" #endif -#include "gmac/gmac.h" +#include <gmac/gmac.h> // ASF3 gmac driver #include "conf_eth.h" -#include "board.h" /// @cond 0 /**INDENT-OFF**/ |