/*
-Copyright 2011 Jun Wako <wakojun@gmail.com>
+Copyright 2011,2012 Jun Wako <wakojun@gmail.com>
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
*/
#include <stdint.h>
-#include <avr/interrupt.h>
+
//#include <avr/interrupt.h>
#include "keycode.h"
#include "host.h"
#include "util.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)
if (!driver) return 0;
return (*driver->keyboard_leds)();
}
-
-/* new interface */
-void host_register_key(uint8_t key)
-{
- host_add_key(key);
- host_send_keyboard_report();
-}
-
-void host_unregister_key(uint8_t key)
-{
- host_del_key(key);
- host_send_keyboard_report();
-}
-
-void host_clear_all_keys_but_mods(void)
-{
- for (int8_t i = 0; i < REPORT_KEYS; i++) {
- keyboard_report->keys[i] = 0;
- }
- host_send_keyboard_report();
-}
-
-/* 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)
-{
- 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;
-}
-
-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]);
- }
-#endif
- return keyboard_report->keys[0];
-}
-
-
-void host_send_keyboard_report(void)
+/* send report */
+void host_keyboard_send(report_keyboard_t *report)
{
if (!driver) return;
- (*driver->send_keyboard)(keyboard_report);
+ (*driver->send_keyboard)(report);
if (debug_keyboard) {
- print("keys: ");
- for (int i = 0; i < REPORT_KEYS; i++) {
- phex(keyboard_report->keys[i]); print(" ");
+ dprint("keyboard_report: ");
+ for (uint8_t i = 0; i < KEYBOARD_REPORT_SIZE; i++) {
+ dprintf("%02X ", report->raw[i]);
}
- print(" mods: "); phex(keyboard_report->mods); print("\n");
+ dprint("\n");
}
}
(*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)
+uint16_t host_last_sysytem_report(void)
{
- // 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;
- }
- }
+ return last_system_report;
}
-static inline void del_key_byte(uint8_t code)
+uint16_t host_last_consumer_report(void)
{
- int i = 0;
- for (; i < REPORT_KEYS; i++) {
- if (keyboard_report->keys[i] == code) {
- keyboard_report->keys[i] = 0;
- }
- }
-}
-
-static inline void add_key_bit(uint8_t code)
-{
- 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");
- }
-}
-
-static inline void del_key_bit(uint8_t code)
-{
- 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;
}
projects / tmk_firmware.git / blobdiff