summaryrefslogtreecommitdiff
path: root/keyboard.c
diff options
context:
space:
mode:
authortmk <nobody@nowhere>2011-02-21 15:43:17 +0900
committertmk <nobody@nowhere>2011-02-22 03:09:14 +0900
commitfb8d23c60c757d5d9c2270cb0123a53be2049a28 (patch)
tree2f5d695f9d501468dc83f4861e7367cdf905ed3f /keyboard.c
parent47f5d8b545eec12ca74d8e7048bb5daa290d937e (diff)
integrate V-USB support into ps2_usb
Diffstat (limited to 'keyboard.c')
-rw-r--r--keyboard.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/keyboard.c b/keyboard.c
index 25948ddf71..03db3257a2 100644
--- a/keyboard.c
+++ b/keyboard.c
@@ -1,7 +1,7 @@
#include "keyboard.h"
#include "host.h"
#include "layer.h"
-#include "matrix_skel.h"
+#include "matrix.h"
#include "led.h"
#include "usb_keycodes.h"
#include "timer.h"
@@ -11,6 +11,11 @@
#ifdef MOUSEKEY_ENABLE
#include "mousekey.h"
#endif
+/* TODO: shoud make new API */
+#ifdef USB_EXTRA_ENABLE
+#include "usb_extra.h"
+#include <util/delay.h>
+#endif
static uint8_t last_leds = 0;
@@ -61,7 +66,6 @@ void keyboard_proc(void)
fn_bits |= FN_BIT(code);
}
#ifdef USB_EXTRA_ENABLE
-/* TODO: use new API
// audio control & system control
else if (code == KB_MUTE) {
usb_extra_audio_send(AUDIO_MUTE);
@@ -83,7 +87,6 @@ void keyboard_proc(void)
}
_delay_ms(1000);
}
-*/
#endif
else if (IS_KEY(code)) {
host_add_key(code);
@@ -102,7 +105,6 @@ void keyboard_proc(void)
layer_switching(fn_bits);
if (command_proc()) {
- // not send report
return;
}