aboutsummaryrefslogtreecommitdiff
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)
downloadqmk_firmware-fb8d23c60c757d5d9c2270cb0123a53be2049a28.tar.gz
qmk_firmware-fb8d23c60c757d5d9c2270cb0123a53be2049a28.zip
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 25948ddf7..03db3257a 100644
--- a/keyboard.c
+++ b/keyboard.c
@@ -1,7 +1,7 @@
1#include "keyboard.h" 1#include "keyboard.h"
2#include "host.h" 2#include "host.h"
3#include "layer.h" 3#include "layer.h"
4#include "matrix_skel.h" 4#include "matrix.h"
5#include "led.h" 5#include "led.h"
6#include "usb_keycodes.h" 6#include "usb_keycodes.h"
7#include "timer.h" 7#include "timer.h"
@@ -11,6 +11,11 @@
11#ifdef MOUSEKEY_ENABLE 11#ifdef MOUSEKEY_ENABLE
12#include "mousekey.h" 12#include "mousekey.h"
13#endif 13#endif
14/* TODO: shoud make new API */
15#ifdef USB_EXTRA_ENABLE
16#include "usb_extra.h"
17#include <util/delay.h>
18#endif
14 19
15 20
16static uint8_t last_leds = 0; 21static uint8_t last_leds = 0;
@@ -61,7 +66,6 @@ void keyboard_proc(void)
61 fn_bits |= FN_BIT(code); 66 fn_bits |= FN_BIT(code);
62 } 67 }
63#ifdef USB_EXTRA_ENABLE 68#ifdef USB_EXTRA_ENABLE
64/* TODO: use new API
65 // audio control & system control 69 // audio control & system control
66 else if (code == KB_MUTE) { 70 else if (code == KB_MUTE) {
67 usb_extra_audio_send(AUDIO_MUTE); 71 usb_extra_audio_send(AUDIO_MUTE);
@@ -83,7 +87,6 @@ void keyboard_proc(void)
83 } 87 }
84 _delay_ms(1000); 88 _delay_ms(1000);
85 } 89 }
86*/
87#endif 90#endif
88 else if (IS_KEY(code)) { 91 else if (IS_KEY(code)) {
89 host_add_key(code); 92 host_add_key(code);
@@ -102,7 +105,6 @@ void keyboard_proc(void)
102 layer_switching(fn_bits); 105 layer_switching(fn_bits);
103 106
104 if (command_proc()) { 107 if (command_proc()) {
105 // not send report
106 return; 108 return;
107 } 109 }
108 110