From 0456caf0ad12482b05033e9423f42fd2df2aee8a Mon Sep 17 00:00:00 2001
From: Dave Johnson <davejohnson3000@gmail.com>
Date: Mon, 20 Aug 2018 19:11:12 -0700
Subject: [PATCH] Consolidate shared HALs and isolate HAL compile (#11552)
---
Marlin/src/HAL/HAL_DUE/DebugMonitor_Due.cpp | 4 ++--
Marlin/src/HAL/{ => shared}/backtrace/backtrace.cpp | 2 +-
Marlin/src/HAL/{ => shared}/backtrace/backtrace.h | 0
Marlin/src/HAL/{ => shared}/backtrace/unwarm.cpp | 0
Marlin/src/HAL/{ => shared}/backtrace/unwarm.h | 0
Marlin/src/HAL/{ => shared}/backtrace/unwarm_arm.cpp | 0
Marlin/src/HAL/{ => shared}/backtrace/unwarm_thumb.cpp | 0
Marlin/src/HAL/{ => shared}/backtrace/unwarmbytab.cpp | 0
Marlin/src/HAL/{ => shared}/backtrace/unwarmbytab.h | 0
Marlin/src/HAL/{ => shared}/backtrace/unwarmmem.cpp | 0
Marlin/src/HAL/{ => shared}/backtrace/unwarmmem.h | 0
Marlin/src/HAL/{ => shared}/backtrace/unwinder.cpp | 0
Marlin/src/HAL/{ => shared}/backtrace/unwinder.h | 0
Marlin/src/HAL/{ => shared}/backtrace/unwmemaccess.cpp | 0
Marlin/src/HAL/{ => shared}/backtrace/unwmemaccess.h | 0
platformio.ini | 2 +-
16 files changed, 4 insertions(+), 4 deletions(-)
rename Marlin/src/HAL/{ => shared}/backtrace/backtrace.cpp (98%)
rename Marlin/src/HAL/{ => shared}/backtrace/backtrace.h (100%)
rename Marlin/src/HAL/{ => shared}/backtrace/unwarm.cpp (100%)
rename Marlin/src/HAL/{ => shared}/backtrace/unwarm.h (100%)
rename Marlin/src/HAL/{ => shared}/backtrace/unwarm_arm.cpp (100%)
rename Marlin/src/HAL/{ => shared}/backtrace/unwarm_thumb.cpp (100%)
rename Marlin/src/HAL/{ => shared}/backtrace/unwarmbytab.cpp (100%)
rename Marlin/src/HAL/{ => shared}/backtrace/unwarmbytab.h (100%)
rename Marlin/src/HAL/{ => shared}/backtrace/unwarmmem.cpp (100%)
rename Marlin/src/HAL/{ => shared}/backtrace/unwarmmem.h (100%)
rename Marlin/src/HAL/{ => shared}/backtrace/unwinder.cpp (100%)
rename Marlin/src/HAL/{ => shared}/backtrace/unwinder.h (100%)
rename Marlin/src/HAL/{ => shared}/backtrace/unwmemaccess.cpp (100%)
rename Marlin/src/HAL/{ => shared}/backtrace/unwmemaccess.h (100%)
diff --git a/Marlin/src/HAL/HAL_DUE/DebugMonitor_Due.cpp b/Marlin/src/HAL/HAL_DUE/DebugMonitor_Due.cpp
index 51064f9ba2..f12f0df7fb 100644
--- a/Marlin/src/HAL/HAL_DUE/DebugMonitor_Due.cpp
+++ b/Marlin/src/HAL/HAL_DUE/DebugMonitor_Due.cpp
@@ -26,8 +26,8 @@
#include "../../core/serial.h"
#include <stdarg.h>
-#include "../backtrace/unwinder.h"
-#include "../backtrace/unwmemaccess.h"
+#include "../shared/backtrace/unwinder.h"
+#include "../shared/backtrace/unwmemaccess.h"
// Debug monitor that dumps to the Programming port all status when
// an exception or WDT timeout happens - And then resets the board
diff --git a/Marlin/src/HAL/backtrace/backtrace.cpp b/Marlin/src/HAL/shared/backtrace/backtrace.cpp
similarity index 98%
rename from Marlin/src/HAL/backtrace/backtrace.cpp
rename to Marlin/src/HAL/shared/backtrace/backtrace.cpp
index 4a688b369c..95f1fc0b0f 100644
--- a/Marlin/src/HAL/backtrace/backtrace.cpp
+++ b/Marlin/src/HAL/shared/backtrace/backtrace.cpp
@@ -27,7 +27,7 @@
#include "unwinder.h"
#include "unwmemaccess.h"
-#include "../../core/serial.h"
+#include "../../../core/serial.h"
#include <stdarg.h>
// Dump a backtrace entry
diff --git a/Marlin/src/HAL/backtrace/backtrace.h b/Marlin/src/HAL/shared/backtrace/backtrace.h
similarity index 100%
rename from Marlin/src/HAL/backtrace/backtrace.h
rename to Marlin/src/HAL/shared/backtrace/backtrace.h
diff --git a/Marlin/src/HAL/backtrace/unwarm.cpp b/Marlin/src/HAL/shared/backtrace/unwarm.cpp
similarity index 100%
rename from Marlin/src/HAL/backtrace/unwarm.cpp
rename to Marlin/src/HAL/shared/backtrace/unwarm.cpp
diff --git a/Marlin/src/HAL/backtrace/unwarm.h b/Marlin/src/HAL/shared/backtrace/unwarm.h
similarity index 100%
rename from Marlin/src/HAL/backtrace/unwarm.h
rename to Marlin/src/HAL/shared/backtrace/unwarm.h
diff --git a/Marlin/src/HAL/backtrace/unwarm_arm.cpp b/Marlin/src/HAL/shared/backtrace/unwarm_arm.cpp
similarity index 100%
rename from Marlin/src/HAL/backtrace/unwarm_arm.cpp
rename to Marlin/src/HAL/shared/backtrace/unwarm_arm.cpp
diff --git a/Marlin/src/HAL/backtrace/unwarm_thumb.cpp b/Marlin/src/HAL/shared/backtrace/unwarm_thumb.cpp
similarity index 100%
rename from Marlin/src/HAL/backtrace/unwarm_thumb.cpp
rename to Marlin/src/HAL/shared/backtrace/unwarm_thumb.cpp
diff --git a/Marlin/src/HAL/backtrace/unwarmbytab.cpp b/Marlin/src/HAL/shared/backtrace/unwarmbytab.cpp
similarity index 100%
rename from Marlin/src/HAL/backtrace/unwarmbytab.cpp
rename to Marlin/src/HAL/shared/backtrace/unwarmbytab.cpp
diff --git a/Marlin/src/HAL/backtrace/unwarmbytab.h b/Marlin/src/HAL/shared/backtrace/unwarmbytab.h
similarity index 100%
rename from Marlin/src/HAL/backtrace/unwarmbytab.h
rename to Marlin/src/HAL/shared/backtrace/unwarmbytab.h
diff --git a/Marlin/src/HAL/backtrace/unwarmmem.cpp b/Marlin/src/HAL/shared/backtrace/unwarmmem.cpp
similarity index 100%
rename from Marlin/src/HAL/backtrace/unwarmmem.cpp
rename to Marlin/src/HAL/shared/backtrace/unwarmmem.cpp
diff --git a/Marlin/src/HAL/backtrace/unwarmmem.h b/Marlin/src/HAL/shared/backtrace/unwarmmem.h
similarity index 100%
rename from Marlin/src/HAL/backtrace/unwarmmem.h
rename to Marlin/src/HAL/shared/backtrace/unwarmmem.h
diff --git a/Marlin/src/HAL/backtrace/unwinder.cpp b/Marlin/src/HAL/shared/backtrace/unwinder.cpp
similarity index 100%
rename from Marlin/src/HAL/backtrace/unwinder.cpp
rename to Marlin/src/HAL/shared/backtrace/unwinder.cpp
diff --git a/Marlin/src/HAL/backtrace/unwinder.h b/Marlin/src/HAL/shared/backtrace/unwinder.h
similarity index 100%
rename from Marlin/src/HAL/backtrace/unwinder.h
rename to Marlin/src/HAL/shared/backtrace/unwinder.h
diff --git a/Marlin/src/HAL/backtrace/unwmemaccess.cpp b/Marlin/src/HAL/shared/backtrace/unwmemaccess.cpp
similarity index 100%
rename from Marlin/src/HAL/backtrace/unwmemaccess.cpp
rename to Marlin/src/HAL/shared/backtrace/unwmemaccess.cpp
diff --git a/Marlin/src/HAL/backtrace/unwmemaccess.h b/Marlin/src/HAL/shared/backtrace/unwmemaccess.h
similarity index 100%
rename from Marlin/src/HAL/backtrace/unwmemaccess.h
rename to Marlin/src/HAL/shared/backtrace/unwmemaccess.h
diff --git a/platformio.ini b/platformio.ini
index c93fbfdda6..cf16b70a21 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -24,7 +24,7 @@ boards_dir = buildroot/share/PlatformIO/boards
env_default = megaatmega2560
[common]
-default_src_filter = +<src/*> -<src/config>
+default_src_filter = +<src/*> -<src/config> -<src/HAL> +<src/HAL/shared>
build_flags = -fmax-errors=5
-g
-ggdb
--
GitLab