Merge branch 'keymap2'

Conflicts:
	common/keyboard.c

1 files changed, 9 insertions, 4 deletions

diff --git a/common/host.c b/common/host.c
index 261ec6472..6ed3d780f 100644
--- a/common/host.c
+++ b/common/host.c
@@ -127,14 +127,19 @@ void host_clear_keys(void)
     }
 }
 
-void host_add_mod_bit(uint8_t mod)
+uint8_t host_get_mods(void)
 {
-    keyboard_report->mods |= mod;
+    return keyboard_report->mods;
 }
 
-void host_del_mod_bit(uint8_t mod)
+void host_add_mods(uint8_t mods)
 {
-    keyboard_report->mods &= ~mod;
+    keyboard_report->mods |= mods;
+}
+
+void host_del_mods(uint8_t mods)
+{
+    keyboard_report->mods &= ~mods;
 }
 
 void host_set_mods(uint8_t mods)