From 574b408cd10bf39ebf9952a7aa718b06ff304308 Mon Sep 17 00:00:00 2001
From: Joe Finney <joe@comp.lancs.ac.uk>
Date: Mon, 7 Sep 2015 10:26:48 +0100
Subject: [PATCH] microbit: Code Structure Cleanup

Create subdirectories for assembler code and BLE specific functionality
---
 source/CMakeLists.txt                              | 14 +++++++-------
 source/{ => asm}/CortexContextSwitch.s.armcc       |  0
 source/{ => asm}/CortexContextSwitch.s.gcc         |  0
 source/{ => ble-services}/MicroBitDFUService.cpp   |  0
 source/{ => ble-services}/MicroBitEventService.cpp |  0
 5 files changed, 7 insertions(+), 7 deletions(-)
 rename source/{ => asm}/CortexContextSwitch.s.armcc (100%)
 rename source/{ => asm}/CortexContextSwitch.s.gcc (100%)
 rename source/{ => ble-services}/MicroBitDFUService.cpp (100%)
 rename source/{ => ble-services}/MicroBitEventService.cpp (100%)

diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
index e23a9bc..c3edb67 100755
--- a/source/CMakeLists.txt
+++ b/source/CMakeLists.txt
@@ -14,12 +14,10 @@ set(YOTTA_AUTO_MICROBIT-DAL_CPP_FILES
     "MicroBitButton.cpp"
     "MicroBitMessageBus.cpp"
     "MicroBitCompass.cpp"
-    "MicroBitEventService.cpp"
     "MicroBitEvent.cpp"
     "MicroBitFiber.cpp"
     "ManagedString.cpp"
     "MicroBitAccelerometer.cpp"
-    "MicroBitDFUService.cpp"
     "MicroBitIO.cpp"
     "MicroBitCompat.cpp"
     "MicroBitImage.cpp"
@@ -28,6 +26,8 @@ set(YOTTA_AUTO_MICROBIT-DAL_CPP_FILES
     "MicroBitPin.cpp"
     "MicroBitSerial.cpp"
     "MicroBitHeapAllocator.cpp"
+    "ble-services/MicroBitDFUService.cpp"
+    "ble-services/MicroBitEventService.cpp"
 )
 
 if (YOTTA_CFG_MICROBIT_CONFIGFILE)
@@ -35,15 +35,15 @@ if (YOTTA_CFG_MICROBIT_CONFIGFILE)
 endif ()
 
 if(CMAKE_COMPILER_IS_GNUCC)
-  file(REMOVE "CortexContextSwitch.s")
-  configure_file("CortexContextSwitch.s.gcc" "CortexContextSwitch.s" COPYONLY)
+  file(REMOVE "asm/CortexContextSwitch.s")
+  configure_file("asm/CortexContextSwitch.s.gcc" "asm/CortexContextSwitch.s" COPYONLY)
 else()
-  file(REMOVE "CortexContextSwitch.s")
-  configure_file("CortexContextSwitch.s.armcc" "CortexContextSwitch.s" COPYONLY)
+  file(REMOVE "asm/CortexContextSwitch.s")
+  configure_file("asm/CortexContextSwitch.s.armcc" "asm/CortexContextSwitch.s" COPYONLY)
 endif()
 
 set(YOTTA_AUTO_MICROBIT-DAL_S_FILES
-    "CortexContextSwitch.s"
+    "asm/CortexContextSwitch.s"
 )
 
 add_library(microbit-dal
diff --git a/source/CortexContextSwitch.s.armcc b/source/asm/CortexContextSwitch.s.armcc
similarity index 100%
rename from source/CortexContextSwitch.s.armcc
rename to source/asm/CortexContextSwitch.s.armcc
diff --git a/source/CortexContextSwitch.s.gcc b/source/asm/CortexContextSwitch.s.gcc
similarity index 100%
rename from source/CortexContextSwitch.s.gcc
rename to source/asm/CortexContextSwitch.s.gcc
diff --git a/source/MicroBitDFUService.cpp b/source/ble-services/MicroBitDFUService.cpp
similarity index 100%
rename from source/MicroBitDFUService.cpp
rename to source/ble-services/MicroBitDFUService.cpp
diff --git a/source/MicroBitEventService.cpp b/source/ble-services/MicroBitEventService.cpp
similarity index 100%
rename from source/MicroBitEventService.cpp
rename to source/ble-services/MicroBitEventService.cpp