summaryrefslogtreecommitdiff
path: root/usb_keyboard.c
diff options
context:
space:
mode:
authortmk2010-12-08 01:47:57 +0900
committertmk2010-12-08 01:57:55 +0900
commit51f17f02317700e64b3c1113fe230d78bac7fecd (patch)
treea040a624004cd3cec2d2fd122069554a4039b8e1 /usb_keyboard.c
parent66ece29b0e14534d57b680db47a5967d5264ca85 (diff)
add build option: NKRO_ENABLE(remove: USB_12KRO)
Diffstat (limited to 'usb_keyboard.c')
-rw-r--r--usb_keyboard.c210
1 files changed, 129 insertions, 81 deletions
diff --git a/usb_keyboard.c b/usb_keyboard.c
index 3e13ae4e3..7055a653f 100644
--- a/usb_keyboard.c
+++ b/usb_keyboard.c
@@ -4,11 +4,12 @@
#include "usb_keyboard.h"
#include "print.h"
#include "debug.h"
+#include "util.h"
// keyboard report.
-static usb_keyboard_report_t _report0 = { {0}, 0 };
-static usb_keyboard_report_t _report1 = { {0}, 0 };
+static usb_keyboard_report_t _report0 = { {0}, 0, false };
+static usb_keyboard_report_t _report1 = { {0}, 0, false };
usb_keyboard_report_t *usb_keyboard_report = &_report0;
usb_keyboard_report_t *usb_keyboard_report_prev = &_report1;
@@ -27,75 +28,37 @@ uint8_t usb_keyboard_idle_count=0;
// 1=num lock, 2=caps lock, 4=scroll lock, 8=compose, 16=kana
volatile uint8_t usb_keyboard_leds=0;
+// enable NKRO
+bool usb_keyboard_nkro = false;
+
int8_t usb_keyboard_send(void)
{
return usb_keyboard_send_report(usb_keyboard_report);
}
-
+static inline int8_t _send_report(usb_keyboard_report_t *report, uint8_t endpoint, uint8_t keys_start, uint8_t keys_end);
int8_t usb_keyboard_send_report(usb_keyboard_report_t *report)
{
- uint8_t i, intr_state, timeout;
-
- if (!usb_configured()) return -1;
- intr_state = SREG;
- cli();
- UENUM = KEYBOARD_ENDPOINT;
- timeout = UDFNUML + 50;
- while (1) {
- // are we ready to transmit?
- if (UEINTX & (1<<RWAL)) break;
- SREG = intr_state;
- // has the USB gone offline?
- if (!usb_configured()) return -1;
- // have we waited too long?
- if (UDFNUML == timeout) return -1;
- // get ready to try checking again
- intr_state = SREG;
- cli();
- UENUM = KEYBOARD_ENDPOINT;
- }
- UEDATX = report->mods;
- UEDATX = 0;
- for (i = 0; i < 6; i++) {
- UEDATX = report->keys[i];
- }
- UEINTX = 0x3A;
- SREG = intr_state;
-
-#ifdef USB_12KRO
- if (!usb_configured()) return -1;
- intr_state = SREG;
- cli();
- UENUM = KEYBOARD_ENDPOINT2;
- timeout = UDFNUML + 50;
- while (1) {
- // are we ready to transmit?
- if (UEINTX & (1<<RWAL)) break;
- SREG = intr_state;
- // has the USB gone offline?
- if (!usb_configured()) return -1;
- // have we waited too long?
- if (UDFNUML == timeout) return -1;
- // get ready to try checking again
- intr_state = SREG;
- cli();
- UENUM = KEYBOARD_ENDPOINT2;
- }
- UEDATX = report->mods;
- UEDATX = 0;
- for (i = 6; i < 12; i++) {
- UEDATX = report->keys[i];
- }
- UEINTX = 0x3A;
- SREG = intr_state;
+ int8_t result = 0;
+
+#ifdef NKRO_ENABLE
+ if (usb_keyboard_nkro)
+ result = _send_report(report, KBD2_ENDPOINT, 0, KBD2_REPORT_KEYS);
+ else
#endif
+ {
+ if (usb_keyboard_protocol)
+ result = _send_report(report, KBD_ENDPOINT, 0, KBD_REPORT_KEYS);
+ else
+ result = _send_report(report, KBD_ENDPOINT, 0, 6);
+ }
- usb_keyboard_idle_count = 0;
- report->is_sent =true;
- usb_keyboard_print_report(report);
- return 0;
+ if (result) return result;
+ usb_keyboard_idle_count = 0;
+ report->is_sent =true;
+ usb_keyboard_print_report(report);
+ return 0;
}
void usb_keyboard_swap_report(void) {
@@ -111,7 +74,7 @@ void usb_keyboard_clear_report(void) {
}
void usb_keyboard_clear_keys(void) {
- for (int i = 0; i < KEYBOARD_REPORT_MAX; i++) usb_keyboard_report->keys[i] = 0;
+ for (int i = 0; i < KEYS_MAX; i++) usb_keyboard_report->keys[i] = 0;
}
void usb_keyboard_clear_mods(void)
@@ -119,6 +82,17 @@ void usb_keyboard_clear_mods(void)
usb_keyboard_report->mods = 0;
}
+void usb_keyboard_set_keys(uint8_t *keys)
+{
+ for (int i = 0; i < KEYS_MAX; i++)
+ usb_keyboard_report->keys[i] = keys[i];
+}
+
+void usb_keyboard_set_mods(uint8_t mods)
+{
+ usb_keyboard_report->mods = mods;
+}
+
void usb_keyboard_add_code(uint8_t code)
{
if (IS_MOD(code)) {
@@ -128,25 +102,17 @@ void usb_keyboard_add_code(uint8_t code)
}
}
+static inline void _add_key_byte(uint8_t code);
+static inline void _add_key_bit(uint8_t code);
void usb_keyboard_add_key(uint8_t code)
{
- for (int i = 0; i < KEYBOARD_REPORT_MAX; i++) {
- if (!usb_keyboard_report->keys[i]) {
- usb_keyboard_report->keys[i] = code;
- return;
- }
+#ifdef NKRO_ENABLE
+ if (usb_keyboard_nkro) {
+ _add_key_bit(code);
+ return;
}
-}
-
-void usb_keyboard_set_keys(uint8_t *keys)
-{
- for (int i = 0; i < KEYBOARD_REPORT_MAX; i++)
- usb_keyboard_report->keys[i] = keys[i];
-}
-
-void usb_keyboard_set_mods(uint8_t mods)
-{
- usb_keyboard_report->mods = mods;
+#endif
+ _add_key_byte(code);
}
void usb_keyboard_add_mod(uint8_t code)
@@ -165,12 +131,18 @@ void usb_keyboard_del_code(uint8_t code)
void usb_keyboard_del_key(uint8_t code)
{
- for (int i = 0; i < KEYBOARD_REPORT_MAX; i++) {
+#ifdef NKRO_ENABLE
+ if ((code>>3) < KEYS_MAX) {
+ usb_keyboard_keys[code>>3] &= ~(1<<(code&7));
+ }
+#else
+ for (int i = 0; i < KEYS_MAX; i++) {
if (usb_keyboard_report->keys[i] == code) {
usb_keyboard_report->keys[i] = KB_NO;
return;
}
}
+#endif
}
void usb_keyboard_del_mod(uint8_t code)
@@ -186,7 +158,7 @@ bool usb_keyboard_is_sent(void)
bool usb_keyboard_has_key(void)
{
uint8_t keys = 0;
- for (int i = 0; i < KEYBOARD_REPORT_MAX; i++) keys |= usb_keyboard_report->keys[i];
+ for (int i = 0; i < KEYS_MAX; i++) keys |= usb_keyboard_report->keys[i];
return keys ? true : false;
}
@@ -195,10 +167,86 @@ bool usb_keyboard_has_mod(void)
return usb_keyboard_report->mods ? true : false;
}
+uint8_t usb_keyboard_get_key(void)
+{
+#ifdef NKRO_ENABLE
+ if (usb_keyboard_nkro) {
+ uint8_t i = 0;
+ for (; i < KEYS_MAX && !usb_keyboard_keys[i]; i++);
+ return i<<3 | biton(usb_keyboard_keys[i]);
+ }
+#endif
+ return usb_keyboard_keys[0];
+}
+
void usb_keyboard_print_report(usb_keyboard_report_t *report)
{
if (!debug_keyboard) return;
print("keys: ");
- for (int i = 0; i < KEYBOARD_REPORT_MAX; i++) { phex(report->keys[i]); print(" "); }
+ for (int i = 0; i < KEYS_MAX; i++) { phex(report->keys[i]); print(" "); }
print(" mods: "); phex(report->mods); print("\n");
}
+
+
+static inline int8_t _send_report(usb_keyboard_report_t *report, uint8_t endpoint, uint8_t keys_start, uint8_t keys_end)
+{
+ uint8_t intr_state, timeout;
+
+ if (!usb_configured()) return -1;
+ intr_state = SREG;
+ cli();
+ UENUM = endpoint;
+ timeout = UDFNUML + 50;
+ while (1) {
+ // are we ready to transmit?
+ if (UEINTX & (1<<RWAL)) break;
+ SREG = intr_state;
+ // has the USB gone offline?
+ if (!usb_configured()) return -1;
+ // have we waited too long?
+ if (UDFNUML == timeout) return -1;
+ // get ready to try checking again
+ intr_state = SREG;
+ cli();
+ UENUM = endpoint;
+ }
+ UEDATX = report->mods;
+ UEDATX = 0;
+ for (uint8_t i = keys_start; i < keys_end; i++) {
+ UEDATX = report->keys[i];
+ }
+ UEINTX = 0x3A;
+ SREG = intr_state;
+ return 0;
+}
+
+static inline void _add_key_byte(uint8_t code)
+{
+ // TODO: fix ugly code
+ int8_t i = 0;
+ int8_t empty = -1;
+ for (; i < KEYS_MAX; i++) {
+ if (usb_keyboard_keys_prev[i] == code) {
+ usb_keyboard_keys[i] = code;
+ break;
+ }
+ if (empty == -1 &&
+ usb_keyboard_keys_prev[i] == 0 &&
+ usb_keyboard_keys[i] == 0) {
+ empty = i;
+ }
+ }
+ if (i == KEYS_MAX) {
+ if (empty != -1) {
+ usb_keyboard_keys[empty] = code;
+ }
+ }
+}
+
+static inline void _add_key_bit(uint8_t code)
+{
+ if ((code>>3) < KEYS_MAX) {
+ usb_keyboard_keys[code>>3] |= 1<<(code&7);
+ }
+}
+