5 files changed, 12 insertions, 42 deletions
diff --git a/serial_link/protocol/transport.h b/serial_link/protocol/transport.h
index e518aaa6e..9a052d880 100644
--- a/serial_link/protocol/transport.h
+++ b/serial_link/protocol/transport.h
@@ -26,7 +26,7 @@ SOFTWARE.
 #define SERIAL_LINK_TRANSPORT_H
 
 #include "serial_link/protocol/triple_buffered_object.h"
-#include "serial_link/system/system.h"
+#include "serial_link/system/serial_link.h"
 
 #define NUM_SLAVES 8
 #define LOCAL_OBJECT_EXTRA 16
diff --git a/serial_link/protocol/triple_buffered_object.c b/serial_link/protocol/triple_buffered_object.c
index c6bf28af0..e3e8989d3 100644
--- a/serial_link/protocol/triple_buffered_object.c
+++ b/serial_link/protocol/triple_buffered_object.c
@@ -23,7 +23,7 @@ SOFTWARE.
 */
 
 #include "serial_link/protocol/triple_buffered_object.h"
-#include "serial_link/system/system.h"
+#include "serial_link/system/serial_link.h"
 #include <stdbool.h>
 #include <stddef.h>
 
diff --git a/serial_link/system/driver.h b/serial_link/system/driver.h
deleted file mode 100644
index 76e2d682c..000000000
--- a/serial_link/system/driver.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
-The MIT License (MIT)
-
-Copyright (c) 2016 Fred Sundvik
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
-
-#ifndef SERIAL_LINK_DRIVER_H
-#define SERIAL_LINK_DRIVER_H
-
-#include "host_driver.h"
-
-void init_serial_link(void);
-void init_serial_link_hal(void);
-bool is_serial_link_connected(void);
-host_driver_t* get_serial_link_driver(void);
-void serial_link_update(void);
-
-#endif
diff --git a/serial_link/system/system.c b/serial_link/system/serial_link.c
index f5af9baa7..27e61a9e9 100644
--- a/serial_link/system/system.c
+++ b/serial_link/system/serial_link.c
@@ -23,8 +23,7 @@ SOFTWARE.
 */
 #include "report.h"
 #include "host_driver.h"
-#include "serial_link/system/system.h"
-#include "serial_link/system/driver.h"
+#include "serial_link/system/serial_link.h"
 #include "hal.h"
 #include "serial_link/protocol/byte_stuffer.h"
 #include "serial_link/protocol/transport.h"
diff --git a/serial_link/system/system.h b/serial_link/system/serial_link.h
index fcc27425e..132cb657f 100644
--- a/serial_link/system/system.h
+++ b/serial_link/system/serial_link.h
@@ -22,10 +22,17 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#ifndef SERIAL_LINK_SYSTEM_H
-#define SERIAL_LINK_SYSTEM_H
+#ifndef SERIAL_LINK_H
+#define SERIAL_LINK_H
 
+#include "host_driver.h"
+#include <stdbool.h>
 
+void init_serial_link(void);
+void init_serial_link_hal(void);
+bool is_serial_link_connected(void);
+host_driver_t* get_serial_link_driver(void);
+void serial_link_update(void);
 
 #if defined(PROTOCOL_CHIBIOS)
 #include "ch.h"