X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=common%2Fhost.c;h=e9b791670670eed07b9956495c1fc38dde989bab;hb=1f96edaed60def1f513ddd8adcdfa3e12b971006;hp=8dd2abbee8d86048ff21ad9c9cd4c0b42054695e;hpb=a112f3614e0e3204ce35dcdfbf2723c3382c4c35;p=tmk_firmware.git diff --git a/common/host.c b/common/host.c index 8dd2abb..e9b7916 100644 --- a/common/host.c +++ b/common/host.c @@ -1,5 +1,5 @@ /* -Copyright 2011 Jun Wako +Copyright 2011,2012 Jun Wako This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -16,28 +16,20 @@ along with this program. If not, see . */ #include -#include -#include "usb_keycodes.h" +//#include +#include "keycode.h" #include "host.h" #include "util.h" #include "debug.h" #ifdef NKRO_ENABLE -bool keyboard_nkro = false; +bool keyboard_nkro = true; #endif static host_driver_t *driver; -static report_keyboard_t report0; -static report_keyboard_t report1; -report_keyboard_t *keyboard_report = &report0; -report_keyboard_t *keyboard_report_prev = &report1; - - -static inline void add_key_byte(uint8_t code); -static inline void del_key_byte(uint8_t code); -static inline void add_key_bit(uint8_t code); -static inline void del_key_bit(uint8_t code); +static uint16_t last_system_report = 0; +static uint16_t last_consumer_report = 0; void host_set_driver(host_driver_t *d) @@ -55,109 +47,19 @@ uint8_t host_keyboard_leds(void) if (!driver) return 0; return (*driver->keyboard_leds)(); } - -/* keyboard report operations */ -void host_add_key(uint8_t key) -{ -#ifdef NKRO_ENABLE - if (keyboard_nkro) { - add_key_bit(key); - return; - } -#endif - add_key_byte(key); -} - -void host_del_key(uint8_t key) -{ -#ifdef NKRO_ENABLE - if (keyboard_nkro) { - del_key_bit(key); - return; - } -#endif - del_key_byte(key); -} - -void host_add_mod_bit(uint8_t mod) -{ - keyboard_report->mods |= mod; -} - -void host_del_mod_bit(uint8_t mod) +/* send report */ +void host_keyboard_send(report_keyboard_t *report) { - keyboard_report->mods &= ~mod; -} - -void host_set_mods(uint8_t mods) -{ - keyboard_report->mods = mods; -} - -void host_add_code(uint8_t code) -{ - if (IS_MOD(code)) { - host_add_mod_bit(MOD_BIT(code)); - } else { - host_add_key(code); - } -} - -void host_del_code(uint8_t code) -{ - if (IS_MOD(code)) { - host_del_mod_bit(MOD_BIT(code)); - } else { - host_del_key(code); - } -} - -void host_swap_keyboard_report(void) -{ - uint8_t sreg = SREG; - cli(); - report_keyboard_t *tmp = keyboard_report_prev; - keyboard_report_prev = keyboard_report; - keyboard_report = tmp; - SREG = sreg; -} - -void host_clear_keyboard_report(void) -{ - keyboard_report->mods = 0; - for (int8_t i = 0; i < REPORT_KEYS; i++) { - keyboard_report->keys[i] = 0; - } -} - -uint8_t host_has_anykey(void) -{ - uint8_t cnt = 0; - for (int i = 0; i < REPORT_KEYS; i++) { - if (keyboard_report->keys[i]) - cnt++; - } - return cnt; -} + if (!driver) return; + (*driver->send_keyboard)(report); -uint8_t host_get_first_key(void) -{ -#ifdef NKRO_ENABLE - if (keyboard_nkro) { - uint8_t i = 0; - for (; i < REPORT_KEYS && !keyboard_report->keys[i]; i++) - ; - return i<<3 | biton(keyboard_report->keys[i]); + if (debug_keyboard) { + dprint("keyboard_report: "); + for (uint8_t i = 0; i < KEYBOARD_REPORT_SIZE; i++) { + dprintf("%02X ", report->raw[i]); + } + dprint("\n"); } -#endif - return keyboard_report->keys[0]; -} - - -void host_send_keyboard_report(void) -{ - if (!driver) return; - (*driver->send_keyboard)(keyboard_report); } void host_mouse_send(report_mouse_t *report) @@ -166,75 +68,30 @@ void host_mouse_send(report_mouse_t *report) (*driver->send_mouse)(report); } -void host_system_send(uint16_t data) +void host_system_send(uint16_t report) { - static uint16_t last_data = 0; - if (data == last_data) return; - last_data = data; + if (report == last_system_report) return; + last_system_report = report; if (!driver) return; - (*driver->send_system)(data); + (*driver->send_system)(report); } -void host_consumer_send(uint16_t data) +void host_consumer_send(uint16_t report) { - static uint16_t last_data = 0; - if (data == last_data) return; - last_data = data; + if (report == last_consumer_report) return; + last_consumer_report = report; if (!driver) return; - (*driver->send_consumer)(data); + (*driver->send_consumer)(report); } - -static inline void add_key_byte(uint8_t code) -{ - // TODO: fix ugly code - int8_t i = 0; - int8_t empty = -1; - for (; i < REPORT_KEYS; i++) { - if (keyboard_report_prev->keys[i] == code) { - keyboard_report->keys[i] = code; - break; - } - if (empty == -1 && - keyboard_report_prev->keys[i] == 0 && - keyboard_report->keys[i] == 0) { - empty = i; - } - } - if (i == REPORT_KEYS) { - if (empty != -1) { - keyboard_report->keys[empty] = code; - } - } -} - -static inline void del_key_byte(uint8_t code) -{ - int i = 0; - for (; i < REPORT_KEYS; i++) { - if (keyboard_report->keys[i] == code) { - keyboard_report->keys[i] = 0; - break; - } - } -} - -static inline void add_key_bit(uint8_t code) +uint16_t host_last_sysytem_report(void) { - if ((code>>3) < REPORT_KEYS) { - keyboard_report->keys[code>>3] |= 1<<(code&7); - } else { - debug("add_key_bit: can't add: "); phex(code); debug("\n"); - } + return last_system_report; } -static inline void del_key_bit(uint8_t code) +uint16_t host_last_consumer_report(void) { - if ((code>>3) < REPORT_KEYS) { - keyboard_report->keys[code>>3] &= ~(1<<(code&7)); - } else { - debug("del_key_bit: can't del: "); phex(code); debug("\n"); - } + return last_consumer_report; }