From d02ce2dd167702f93e93d1fa9110467b5cce6834 Mon Sep 17 00:00:00 2001
From: Romain Goyet <romain.goyet@numworks.com>
Date: Thu, 3 Sep 2020 19:12:42 -0400
Subject: [PATCH] [ion] Sort dummy functions

Dummy Ion-level functions should be in the top-level shared folder. And
dummy functions for simulator headers should be in the simulator folder.
---
 .../shared/dummy/backlight.cpp                |  0
 .../{simulator => }/shared/dummy/battery.cpp  |  0
 .../{simulator => }/shared/dummy/display.cpp  |  0
 .../shared/dummy/exam_mode.cpp                |  0
 .../{simulator => }/shared/dummy/fcc_id.cpp   |  0
 ion/src/{simulator => }/shared/dummy/led.cpp  |  0
 .../shared/dummy/serial_number.cpp            |  0
 .../{simulator => }/shared/dummy/stack.cpp    |  0
 .../shared/dummy/timing_msleep.cpp            |  0
 ion/src/{simulator => }/shared/dummy/usb.cpp  |  0
 ion/src/simulator/Makefile                    | 25 +++++++++++--------
 11 files changed, 14 insertions(+), 11 deletions(-)
 rename ion/src/{simulator => }/shared/dummy/backlight.cpp (100%)
 rename ion/src/{simulator => }/shared/dummy/battery.cpp (100%)
 rename ion/src/{simulator => }/shared/dummy/display.cpp (100%)
 rename ion/src/{simulator => }/shared/dummy/exam_mode.cpp (100%)
 rename ion/src/{simulator => }/shared/dummy/fcc_id.cpp (100%)
 rename ion/src/{simulator => }/shared/dummy/led.cpp (100%)
 rename ion/src/{simulator => }/shared/dummy/serial_number.cpp (100%)
 rename ion/src/{simulator => }/shared/dummy/stack.cpp (100%)
 rename ion/src/{simulator => }/shared/dummy/timing_msleep.cpp (100%)
 rename ion/src/{simulator => }/shared/dummy/usb.cpp (100%)

diff --git a/ion/src/simulator/shared/dummy/backlight.cpp b/ion/src/shared/dummy/backlight.cpp
similarity index 100%
rename from ion/src/simulator/shared/dummy/backlight.cpp
rename to ion/src/shared/dummy/backlight.cpp
diff --git a/ion/src/simulator/shared/dummy/battery.cpp b/ion/src/shared/dummy/battery.cpp
similarity index 100%
rename from ion/src/simulator/shared/dummy/battery.cpp
rename to ion/src/shared/dummy/battery.cpp
diff --git a/ion/src/simulator/shared/dummy/display.cpp b/ion/src/shared/dummy/display.cpp
similarity index 100%
rename from ion/src/simulator/shared/dummy/display.cpp
rename to ion/src/shared/dummy/display.cpp
diff --git a/ion/src/simulator/shared/dummy/exam_mode.cpp b/ion/src/shared/dummy/exam_mode.cpp
similarity index 100%
rename from ion/src/simulator/shared/dummy/exam_mode.cpp
rename to ion/src/shared/dummy/exam_mode.cpp
diff --git a/ion/src/simulator/shared/dummy/fcc_id.cpp b/ion/src/shared/dummy/fcc_id.cpp
similarity index 100%
rename from ion/src/simulator/shared/dummy/fcc_id.cpp
rename to ion/src/shared/dummy/fcc_id.cpp
diff --git a/ion/src/simulator/shared/dummy/led.cpp b/ion/src/shared/dummy/led.cpp
similarity index 100%
rename from ion/src/simulator/shared/dummy/led.cpp
rename to ion/src/shared/dummy/led.cpp
diff --git a/ion/src/simulator/shared/dummy/serial_number.cpp b/ion/src/shared/dummy/serial_number.cpp
similarity index 100%
rename from ion/src/simulator/shared/dummy/serial_number.cpp
rename to ion/src/shared/dummy/serial_number.cpp
diff --git a/ion/src/simulator/shared/dummy/stack.cpp b/ion/src/shared/dummy/stack.cpp
similarity index 100%
rename from ion/src/simulator/shared/dummy/stack.cpp
rename to ion/src/shared/dummy/stack.cpp
diff --git a/ion/src/simulator/shared/dummy/timing_msleep.cpp b/ion/src/shared/dummy/timing_msleep.cpp
similarity index 100%
rename from ion/src/simulator/shared/dummy/timing_msleep.cpp
rename to ion/src/shared/dummy/timing_msleep.cpp
diff --git a/ion/src/simulator/shared/dummy/usb.cpp b/ion/src/shared/dummy/usb.cpp
similarity index 100%
rename from ion/src/simulator/shared/dummy/usb.cpp
rename to ion/src/shared/dummy/usb.cpp
diff --git a/ion/src/simulator/Makefile b/ion/src/simulator/Makefile
index 228a23764..83140cf17 100644
--- a/ion/src/simulator/Makefile
+++ b/ion/src/simulator/Makefile
@@ -1,14 +1,18 @@
+ion_src += $(addprefix ion/src/shared/dummy/, \
+  backlight.cpp \
+  battery.cpp \
+  display.cpp \
+  exam_mode.cpp \
+  fcc_id.cpp \
+  led.cpp \
+  power.cpp \
+  serial_number.cpp \
+  stack.cpp \
+  timing_msleep.cpp:+headless \
+  usb.cpp \
+)
+
 ion_src += $(addprefix ion/src/simulator/shared/, \
-  dummy/backlight.cpp \
-  dummy/battery.cpp \
-  dummy/display.cpp \
-  dummy/exam_mode.cpp \
-  dummy/fcc_id.cpp \
-  dummy/led.cpp \
-  dummy/serial_number.cpp \
-  dummy/stack.cpp \
-  dummy/timing_msleep.cpp:+headless \
-  dummy/usb.cpp \
   clipboard.cpp \
   console_stdio.cpp:-consoledisplay \
   crc32.cpp \
@@ -22,7 +26,6 @@ ion_src += $(addprefix ion/src/simulator/shared/, \
   keyboard_sdl.cpp:-headless \
   layout.cpp:-headless \
   main.cpp \
-  power.cpp \
   random.cpp \
   timing.cpp \
   timing_msleep.cpp:-headless \