summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authortmk2013-03-11 15:28:14 +0900
committertmk2013-03-11 15:28:46 +0900
commitef8439bddb2d7fe5fd95faf2b6bebd8235acf160 (patch)
tree4af03a20658cb7e6cd43f9c65dfa002f1b544332 /common
parentd055e0633e36e97802d60554f6002e47021ba5fd (diff)
Add build option BOOTMAGIC_ENABLE
Diffstat (limited to 'common')
-rw-r--r--common/command.c4
-rw-r--r--common/keyboard.c6
2 files changed, 7 insertions, 3 deletions
diff --git a/common/command.c b/common/command.c
index d7ba3f232..372ca291e 100644
--- a/common/command.c
+++ b/common/command.c
@@ -123,6 +123,7 @@ static void command_common_help(void)
print("Paus: jump to bootloader\n");
}
+#ifdef BOOTMAGIC_ENABLE
static void print_eeprom_config(void)
{
uint8_t eebyte;
@@ -145,15 +146,18 @@ static void print_eeprom_config(void)
print("keyconf.swap_grave_esc: "); print_hex8(kc.swap_grave_esc); print("\n");
print("keyconf.swap_backslash_backspace: "); print_hex8(kc.swap_backslash_backspace); print("\n");
}
+#endif
static bool command_common(uint8_t code)
{
static host_driver_t *host_driver = 0;
switch (code) {
+#ifdef BOOTMAGIC_ENABLE
case KC_E:
print("eeprom config\n");
print_eeprom_config();
break;
+#endif
case KC_CAPSLOCK:
if (host_get_driver()) {
host_driver = host_get_driver();
diff --git a/common/keyboard.c b/common/keyboard.c
index 1acb79861..401fdb4e1 100644
--- a/common/keyboard.c
+++ b/common/keyboard.c
@@ -29,10 +29,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "util.h"
#include "sendchar.h"
#include "bootmagic.h"
-#ifdef MOUSEKEY_ENABLE
-#include "mousekey.h"
-#endif
#include "eeconfig.h"
+#include "mousekey.h"
#ifdef MATRIX_HAS_GHOST
@@ -64,6 +62,7 @@ void keyboard_init(void)
ps2_mouse_init();
#endif
+#ifdef BOOTMAGIC_ENABLE
bootmagic();
if (eeconfig_is_enabled()) {
@@ -77,6 +76,7 @@ void keyboard_init(void)
} else {
eeconfig_init();
}
+#endif
}
/*