Code cleanup

[kiibohd-controller.git] / Lib / ScanLib.h

diff --git a/Lib/ScanLib.h b/Lib/ScanLib.h
index d14b09102ccf9d7dbee90d4f3254ed8925f183ac..bbc4f4bf0831e0e4ef9a98af3afb315b7c452875 100644 (file)
--- a/Lib/ScanLib.h
+++ b/Lib/ScanLib.h
@@ -1,15 +1,15 @@
-/* Copyright (C) 2013 by Jacob Alexander
- * 
+/* Copyright (C) 2013-2015 by Jacob Alexander
+ *
  * 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
@@ -23,9 +23,7 @@
 // This include file decides which set of compiler family include files to use on typical Scan modules.
 // Additional includes should only be added to this file if they should be added to *all* Scan modules.
 
-
-#ifndef __SCANLIB_H
-#define __SCANLIB_H
+#pragma once
 
 // ----- Includes -----
 
@@ -34,10 +32,9 @@
 
 
 // ARM
-#if defined(_mk20dx128_)
+#if defined(_mk20dx128_) || defined(_mk20dx128vlf5_) || defined(_mk20dx256_) || defined(_mk20dx256vlh7_)
 
-#include <Lib/mk20dx128.h>
-#include <Lib/aliased_bitband.h>
+#include <Lib/mk20dx.h>
 #include <Lib/delay.h>
 
 #endif
@@ -52,6 +49,3 @@
 
 #endif
 
-
-#endif
-