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>2021-02-04 20:42:09 +0300
committerDavid Crocker <dcrocker@eschertech.com>2021-02-04 20:42:09 +0300
commit21b914a3d3d2c980d22b77c3c0776ad0f23a0244 (patch)
tree2478e31bafacd3ad938439d14ec2ce9a49292946 /src/Libraries
parented3b2306a7df90ece49d6640bbf1aee3de7491f5 (diff)
Fixed build errors
Diffstat (limited to 'src/Libraries')
-rw-r--r--src/Libraries/sd_mmc/conf_sd_mmc.h11
1 files changed, 8 insertions, 3 deletions
diff --git a/src/Libraries/sd_mmc/conf_sd_mmc.h b/src/Libraries/sd_mmc/conf_sd_mmc.h
index 3edc6633..9a96d9dd 100644
--- a/src/Libraries/sd_mmc/conf_sd_mmc.h
+++ b/src/Libraries/sd_mmc/conf_sd_mmc.h
@@ -44,8 +44,8 @@
* Support and FAQ: visit <a href="http://www.atmel.com/design-support/">Atmel Support</a>
*/
-#ifndef CONF_SD_MMC_H_INCLUDED
-#define CONF_SD_MMC_H_INCLUDED
+#ifndef SD_MMC_CONF_SD_MMC_H_INCLUDED
+#define SD_MMC_CONF_SD_MMC_H_INCLUDED
// Define this to enable the SPI mode instead of Multimedia Card interface mode
//#define SD_MMC_SPI_MODE
@@ -62,6 +62,11 @@
* in board.h file.
*/
+// Include the version of this file for ASF to ensure we get consistent definitions, and to get the definition of CONF_HSMCI_XDMAC_CHANNEL
+#if SAM4E || SAM4S || SAME70
+# include <asf/conf_sd_mmc.h>
+#endif
+
// SD card configuration for Duet and Duet WiFi
#define SD_MMC_ENABLE
@@ -110,5 +115,5 @@
#define SD_MMC_MEM_CNT (SD_MMC_HSMCI_MEM_CNT + SD_MMC_SPI_MEM_CNT)
-#endif /* CONF_SD_MMC_H_INCLUDED */
+#endif /* SD_MMC_CONF_SD_MMC_H_INCLUDED */