From c1cd739af2e3c1bd189fff78d069c6ea12cb4054 Mon Sep 17 00:00:00 2001
From: Stefan Dorn <mail@muflax.com>
Date: Sat, 11 Jun 2016 20:19:04 +0100
Subject: [PATCH] less headers

---
 src/keyboard/ergodox/controller/mcp23018.c   |  3 +--
 src/keyboard/ergodox/controller/teensy-2-0.c |  4 ++--
 src/lib/{twi => }/teensy-2-0.c               |  5 ++---
 src/lib/{twi => }/teensy-2-0.h               |  0
 src/lib/{twi => }/teensy-2-0.md              |  0
 src/lib/twi.h                                | 12 ------------
 6 files changed, 5 insertions(+), 19 deletions(-)
 rename src/lib/{twi => }/teensy-2-0.c (94%)
 rename src/lib/{twi => }/teensy-2-0.h (100%)
 rename src/lib/{twi => }/teensy-2-0.md (100%)
 delete mode 100644 src/lib/twi.h

diff --git a/src/keyboard/ergodox/controller/mcp23018.c b/src/keyboard/ergodox/controller/mcp23018.c
index 61429f8..19890f9 100644
--- a/src/keyboard/ergodox/controller/mcp23018.c
+++ b/src/keyboard/ergodox/controller/mcp23018.c
@@ -10,7 +10,7 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include <util/twi.h>
-#include "../../../lib/twi.h"  // `TWI_FREQ` defined in "teensy-2-0.c"
+#include "../../../lib/teensy-2-0.h"  // `TWI_FREQ` defined in "teensy-2-0.c"
 #include "../options.h"
 #include "../matrix.h"
 #include "./mcp23018--functions.h"
@@ -203,4 +203,3 @@ uint8_t mcp23018_update_matrix(bool matrix[KB_ROWS][KB_COLUMNS]) {
 
 	return ret;  // success
 }
-
diff --git a/src/keyboard/ergodox/controller/teensy-2-0.c b/src/keyboard/ergodox/controller/teensy-2-0.c
index 8b20fa4..e3768ea 100644
--- a/src/keyboard/ergodox/controller/teensy-2-0.c
+++ b/src/keyboard/ergodox/controller/teensy-2-0.c
@@ -7,14 +7,14 @@
  * ------------------------------------------------------------------------- */
 
 
-// for "lib/twi.h"
+// for "lib/teensy-2-0.h"
 #define TWI_FREQ 400000
 
 #include <stdbool.h>
 #include <stdint.h>
 #include <avr/io.h>
 #include <util/delay.h>
-#include "../../../lib/twi.h"
+#include "../../../lib/teensy-2-0.h"
 #include "../options.h"
 #include "../matrix.h"
 #include "./teensy-2-0--functions.h"
diff --git a/src/lib/twi/teensy-2-0.c b/src/lib/teensy-2-0.c
similarity index 94%
rename from src/lib/twi/teensy-2-0.c
rename to src/lib/teensy-2-0.c
index c956b38..f753e0d 100644
--- a/src/lib/twi/teensy-2-0.c
+++ b/src/lib/teensy-2-0.c
@@ -3,8 +3,8 @@
  *
  * - This is mostly straight from the datasheet, section 20.6.6, figure 20-11
  *   (the code example in C), and section 20.8.1, figure 20-12
- * - Also see the documentation for `<util/twi.h>` at
- *   <http://www.nongnu.org/avr-libc/user-manual/group__util__twi.html#ga8d3aca0acc182f459a51797321728168>
+ * - Also see the documentation for `<util/teensy-2-0.h>` at
+ *   <http://www.nongnu.org/avr-libc/user-manual/group__util__teensy-2-0.html#ga8d3aca0acc182f459a51797321728168>
  *
  * Some other (more complete) TWI libraries for the Teensy 2.0 (and other Atmel
  * processors):
@@ -92,4 +92,3 @@ uint8_t twi_read(uint8_t * data) {
 // ----------------------------------------------------------------------------
 #endif
 // ----------------------------------------------------------------------------
-
diff --git a/src/lib/twi/teensy-2-0.h b/src/lib/teensy-2-0.h
similarity index 100%
rename from src/lib/twi/teensy-2-0.h
rename to src/lib/teensy-2-0.h
diff --git a/src/lib/twi/teensy-2-0.md b/src/lib/teensy-2-0.md
similarity index 100%
rename from src/lib/twi/teensy-2-0.md
rename to src/lib/teensy-2-0.md
diff --git a/src/lib/twi.h b/src/lib/twi.h
deleted file mode 100644
index 366291b..0000000
--- a/src/lib/twi.h
+++ /dev/null
@@ -1,12 +0,0 @@
-/* ----------------------------------------------------------------------------
- * TWI (I2C) : exports
- *
- * Code specific to different development boards is used by modifying a
- * variable in the makefile.
- * ----------------------------------------------------------------------------
- * Copyright (c) 2012 Ben Blazak <benblazak.dev@gmail.com>
- * Released under The MIT License (MIT) (see "license.md")
- * Project located at <https://github.com/benblazak/ergodox-firmware>
- * ------------------------------------------------------------------------- */
-
-#include "./twi/teensy-2-0.h"