From 3dda86dd7e3e071ee98b433af71a0d645a8d5c66 Mon Sep 17 00:00:00 2001 From: Stefan Dorn Date: Sat, 11 Jun 2016 20:13:46 +0100 Subject: [PATCH] remove useless headers --- src/keyboard/controller.h | 16 ---------------- src/keyboard/layout.h | 16 ---------------- src/keyboard/matrix.h | 16 ---------------- src/lib/key-functions/private.c | 4 ++-- src/lib/key-functions/private.h | 2 +- src/lib/key-functions/public/basic.c | 2 +- src/lib/key-functions/public/special.c | 2 +- src/main.c | 6 +++--- src/main.h | 4 ++-- 9 files changed, 10 insertions(+), 58 deletions(-) delete mode 100644 src/keyboard/controller.h delete mode 100644 src/keyboard/layout.h delete mode 100644 src/keyboard/matrix.h diff --git a/src/keyboard/controller.h b/src/keyboard/controller.h deleted file mode 100644 index af2d4bb..0000000 --- a/src/keyboard/controller.h +++ /dev/null @@ -1,16 +0,0 @@ -/* ---------------------------------------------------------------------------- - * controller specific exports - * - * Files for different keyboards are used by modifying a variable in the - * Makefile - * ---------------------------------------------------------------------------- - * Copyright (c) 2012 Ben Blazak - * Released under The MIT License (MIT) (see "license.md") - * Project located at - * ------------------------------------------------------------------------- */ - - -#include "../lib/variable-include.h" -#define INCLUDE EXP_STR( ./MAKEFILE_KEYBOARD/controller.h ) -#include INCLUDE - diff --git a/src/keyboard/layout.h b/src/keyboard/layout.h deleted file mode 100644 index d2ccdee..0000000 --- a/src/keyboard/layout.h +++ /dev/null @@ -1,16 +0,0 @@ -/* ---------------------------------------------------------------------------- - * layout specific exports - * - * Files for different keyboards are used by modifying a variable in the - * Makefile - * ---------------------------------------------------------------------------- - * Copyright (c) 2012 Ben Blazak - * Released under The MIT License (MIT) (see "license.md") - * Project located at - * ------------------------------------------------------------------------- */ - - -#include "../lib/variable-include.h" -#define INCLUDE EXP_STR( ./MAKEFILE_KEYBOARD/layout.h ) -#include INCLUDE - diff --git a/src/keyboard/matrix.h b/src/keyboard/matrix.h deleted file mode 100644 index ef3a2d5..0000000 --- a/src/keyboard/matrix.h +++ /dev/null @@ -1,16 +0,0 @@ -/* ---------------------------------------------------------------------------- - * matrix specific exports - * - * Files for different keyboards are used by modifying a variable in the - * Makefile - * ---------------------------------------------------------------------------- - * Copyright (c) 2012 Ben Blazak - * Released under The MIT License (MIT) (see "license.md") - * Project located at - * ------------------------------------------------------------------------- */ - - -#include "../lib/variable-include.h" -#define INCLUDE EXP_STR( ./MAKEFILE_KEYBOARD/matrix.h ) -#include INCLUDE - diff --git a/src/lib/key-functions/private.c b/src/lib/key-functions/private.c index bcd131d..2768bc8 100644 --- a/src/lib/key-functions/private.c +++ b/src/lib/key-functions/private.c @@ -10,8 +10,8 @@ #include #include "../../lib-other/pjrc/usb_keyboard/usb_keyboard.h" #include "../../lib/usb/usage-page/keyboard.h" -#include "../../keyboard/layout.h" -#include "../../keyboard/matrix.h" +#include "../../keyboard/ergodox/layout.h" +#include "../../keyboard/ergodox/matrix.h" #include "../../main.h" #include "./public.h" diff --git a/src/lib/key-functions/private.h b/src/lib/key-functions/private.h index a45e3d7..df67769 100644 --- a/src/lib/key-functions/private.h +++ b/src/lib/key-functions/private.h @@ -15,7 +15,7 @@ #include #include -#include "../../keyboard/matrix.h" +#include "../../keyboard/ergodox/matrix.h" // -------------------------------------------------------------------- diff --git a/src/lib/key-functions/public/basic.c b/src/lib/key-functions/public/basic.c index 6866138..a921c04 100644 --- a/src/lib/key-functions/public/basic.c +++ b/src/lib/key-functions/public/basic.c @@ -8,7 +8,7 @@ #include "../../../main.h" -#include "../../../keyboard/layout.h" +#include "../../../keyboard/ergodox/layout.h" #include "../public.h" #include "../private.h" diff --git a/src/lib/key-functions/public/special.c b/src/lib/key-functions/public/special.c index 80108ea..66c72a2 100644 --- a/src/lib/key-functions/public/special.c +++ b/src/lib/key-functions/public/special.c @@ -11,7 +11,7 @@ #include #include "../../../lib-other/pjrc/usb_keyboard/usb_keyboard.h" #include "../../../lib/usb/usage-page/keyboard.h" -#include "../../../keyboard/layout.h" +#include "../../../keyboard/ergodox/layout.h" #include "../../../main.h" #include "../public.h" #include "../private.h" diff --git a/src/main.c b/src/main.c index 86b97e6..ad1b3d7 100644 --- a/src/main.c +++ b/src/main.c @@ -12,9 +12,9 @@ #include #include "./lib-other/pjrc/usb_keyboard/usb_keyboard.h" #include "./lib/key-functions/public.h" -#include "./keyboard/controller.h" -#include "./keyboard/layout.h" -#include "./keyboard/matrix.h" +#include "./keyboard/ergodox/controller.h" +#include "./keyboard/ergodox/layout.h" +#include "./keyboard/ergodox/matrix.h" #include "./main.h" // ---------------------------------------------------------------------------- diff --git a/src/main.h b/src/main.h index b46ffa9..c98573d 100644 --- a/src/main.h +++ b/src/main.h @@ -12,8 +12,8 @@ #include #include -#include "./keyboard/layout.h" -#include "./keyboard/matrix.h" +#include "keyboard/ergodox/layout.h" +#include "keyboard/ergodox/matrix.h" // --------------------------------------------------------------------