From 7ec476cb79a49fe9691ab736362fb5f9a376a7d0 Mon Sep 17 00:00:00 2001
From: Jared Boone <jboone@earfeast.com>
Date: Tue, 16 Feb 2016 11:09:00 -0800
Subject: [PATCH] Rename m4_startup.* to more appropriate core_control.*

Now that there is M0- and M4-related code.
---
 firmware/application/Makefile                             | 2 +-
 firmware/application/{m4_startup.cpp => core_control.cpp} | 2 +-
 firmware/application/{m4_startup.hpp => core_control.hpp} | 6 +++---
 firmware/application/main.cpp                             | 2 +-
 firmware/application/ui_navigation.cpp                    | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)
 rename firmware/application/{m4_startup.cpp => core_control.cpp} (98%)
 rename firmware/application/{m4_startup.hpp => core_control.hpp} (92%)

diff --git a/firmware/application/Makefile b/firmware/application/Makefile
index ca1be09a2..37f1a4f0b 100755
--- a/firmware/application/Makefile
+++ b/firmware/application/Makefile
@@ -187,7 +187,7 @@ CPPSRC = main.cpp \
          ../common/chibios_cpp.cpp \
          ../common/debug.cpp \
          ../common/gcc.cpp \
-         m4_startup.cpp \
+         core_control.cpp \
          cpld_max5.cpp \
          jtag.cpp \
          cpld_update.cpp \
diff --git a/firmware/application/m4_startup.cpp b/firmware/application/core_control.cpp
similarity index 98%
rename from firmware/application/m4_startup.cpp
rename to firmware/application/core_control.cpp
index 9b5f2b4fb..ebaca90d2 100644
--- a/firmware/application/m4_startup.cpp
+++ b/firmware/application/core_control.cpp
@@ -19,7 +19,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include "m4_startup.hpp"
+#include "core_control.hpp"
 
 #include "hal.h"
 
diff --git a/firmware/application/m4_startup.hpp b/firmware/application/core_control.hpp
similarity index 92%
rename from firmware/application/m4_startup.hpp
rename to firmware/application/core_control.hpp
index 95042f759..3ec373fa7 100644
--- a/firmware/application/m4_startup.hpp
+++ b/firmware/application/core_control.hpp
@@ -19,8 +19,8 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifndef __M4_STARTUP_H__
-#define __M4_STARTUP_H__
+#ifndef __CORE_CONTROL_H__
+#define __CORE_CONTROL_H__
 
 #include <cstddef>
 
@@ -32,4 +32,4 @@ void m4_request_shutdown();
 
 void m0_halt();
 
-#endif/*__M4_STARTUP_H__*/
+#endif/*__CORE_CONTROL_H__*/
diff --git a/firmware/application/main.cpp b/firmware/application/main.cpp
index d98caa53f..24040b923 100755
--- a/firmware/application/main.cpp
+++ b/firmware/application/main.cpp
@@ -39,7 +39,7 @@
 
 #include "event_m0.hpp"
 
-#include "m4_startup.hpp"
+#include "core_control.hpp"
 #include "spi_image.hpp"
 
 #include "debug.hpp"
diff --git a/firmware/application/ui_navigation.cpp b/firmware/application/ui_navigation.cpp
index 248b84d5d..7a2d44510 100644
--- a/firmware/application/ui_navigation.cpp
+++ b/firmware/application/ui_navigation.cpp
@@ -32,7 +32,7 @@
 #include "ert_app.hpp"
 #include "tpms_app.hpp"
 
-#include "m4_startup.hpp"
+#include "core_control.hpp"
 
 namespace ui {