12 years ago · f412570739
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,27 +0,0 @@
 Codes are released under each license. See heading of each file for details.

 Modified BSD license:
 ps2.c
 ps2.h
 adb.c
 adb.h

 GPLv2 or later:
 other codes

 PJRC's license:
 print.c
 print.h
 pjrc/

 GPLv2 or GPLv3 or OBJECTIVE DEVELOPMENT's commercial license:
 vusb/




 This software includes following codes from other parties.
 - V-USB from OBJECTIVE DEVELOPMENT
 http://www.obdev.at/products/vusb/index.html
 - Teensy example codes from PJRC
 http://www.pjrc.com/teensy/
--- a/common/bootloader.c
+++ b/common/bootloader.c
--- a/common/bootloader.h
+++ b/common/bootloader.h
--- a/common/command.c
+++ b/common/command.c
--- a/common/command.h
+++ b/common/command.h
--- a/common/controller_teensy.h
+++ b/common/controller_teensy.h
--- a/common/debug.h
+++ b/common/debug.h
--- a/common/host.c
+++ b/common/host.c
--- a/common/host.h
+++ b/common/host.h
--- a/common/host_driver.h
+++ b/common/host_driver.h
--- a/common/keyboard.c
+++ b/common/keyboard.c
--- a/common/keyboard.h
+++ b/common/keyboard.h
--- a/common/keymap.h
+++ b/common/keymap.h
--- a/common/layer.c
+++ b/common/layer.c
--- a/common/layer.h
+++ b/common/layer.h
--- a/common/led.h
+++ b/common/led.h
--- a/common/matrix.h
+++ b/common/matrix.h
--- a/common/mousekey.c
+++ b/common/mousekey.c
--- a/common/mousekey.h
+++ b/common/mousekey.h
--- a/common/print.c
+++ b/common/print.c
--- a/common/print.h
+++ b/common/print.h
--- a/common/report.h
+++ b/common/report.h
--- a/common/sendchar.h
+++ b/common/sendchar.h
--- a/common/sendchar_null.c
+++ b/common/sendchar_null.c
--- a/common/sendchar_uart.c
+++ b/common/sendchar_uart.c
--- a/common/timer.c
+++ b/common/timer.c
--- a/common/timer.h
+++ b/common/timer.h
--- a/common/uart.c
+++ b/common/uart.c
--- a/common/uart.h
+++ b/common/uart.h
--- a/common/usb_keycodes.h
+++ b/common/usb_keycodes.h
--- a/common/util.c
+++ b/common/util.c
--- a/common/util.h
+++ b/common/util.h
--- a/doc/COPYING.GPLv2
+++ b/doc/COPYING.GPLv2
--- a/doc/COPYING.GPLv3
+++ b/doc/COPYING.GPLv3
--- a/hhkb/FUSE.txt
+++ b/hhkb/FUSE.txt
--- a/doc/POWER.txt
+++ b/doc/POWER.txt
--- a/doc/USB_NKRO.txt
+++ b/doc/USB_NKRO.txt
--- a/pjrc/host.c
+++ b/pjrc/host.c
@@ -1,183 +0,0 @@
 /*
 Copyright 2011 Jun Wako <[email protected]>

 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
 the Free Software Foundation, either version 2 of the License, or
 (at your option) any later version.

 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 GNU General Public License for more details.

 You should have received a copy of the GNU General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>.
 */

 #include <stdint.h>
 #include <avr/interrupt.h>
 #include "usb_keycodes.h"
 #include "usb_keyboard.h"
 #if defined(MOUSEKEY_ENABLE) || defined(PS2_MOUSE_ENABLE)
 #include "usb_mouse.h"
 #endif
 #ifdef EXTRAKEY_ENABLE
 #include "usb_extra.h"
 #endif
 #include "debug.h"
 #include "host.h"
 #include "util.h"


 #ifdef NKRO_ENABLE
 bool keyboard_nkro = false;
 #endif

 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 add_key_bit(uint8_t code);


 uint8_t host_keyboard_leds(void)
 {
 return usb_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_add_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_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)
 {
 usb_keyboard_send_report(keyboard_report);
 }

 #if defined(MOUSEKEY_ENABLE) || defined(PS2_MOUSE_ENABLE)
 void host_mouse_send(report_mouse_t *report)
 {
 usb_mouse_send(report->x, report->y, report->v, report->h, report->buttons);
 }
 #endif

 #ifdef EXTRAKEY_ENABLE
 void host_system_send(uint16_t data)
 {
 usb_extra_system_send(data);
 }

 void host_consumer_send(uint16_t data)
 {
 static uint16_t last_data = 0;
 if (data == last_data) return;
 last_data = data;

 usb_extra_consumer_send(data);
 }
 #endif


 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 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");
 }
 }
--- a/protocol/adb.c
+++ b/protocol/adb.c
--- a/protocol/adb.h
+++ b/protocol/adb.h
--- a/protocol/iwrap.mk
+++ b/protocol/iwrap.mk
--- a/protocol/iwrap/iWRAP.txt
+++ b/protocol/iwrap/iWRAP.txt
--- a/protocol/iwrap/iwrap.c
+++ b/protocol/iwrap/iwrap.c
--- a/protocol/iwrap/iwrap.h
+++ b/protocol/iwrap/iwrap.h
--- a/protocol/iwrap/main.c
+++ b/protocol/iwrap/main.c
--- a/protocol/iwrap/suart.S
+++ b/protocol/iwrap/suart.S
--- a/protocol/iwrap/suart.h
+++ b/protocol/iwrap/suart.h
--- a/protocol/iwrap/wd.h
+++ b/protocol/iwrap/wd.h
--- a/protocol/m0110.c
+++ b/protocol/m0110.c
--- a/protocol/m0110.h
+++ b/protocol/m0110.h
--- a/protocol/pjrc.mk
+++ b/protocol/pjrc.mk
--- a/protocol/pjrc/bootloader_teensy.c
+++ b/protocol/pjrc/bootloader_teensy.c
--- a/protocol/pjrc/main.c
+++ b/protocol/pjrc/main.c
--- a/protocol/pjrc/pjrc.c
+++ b/protocol/pjrc/pjrc.c
--- a/protocol/pjrc/pjrc.h
+++ b/protocol/pjrc/pjrc.h
--- a/protocol/pjrc/usb.c
+++ b/protocol/pjrc/usb.c
--- a/protocol/pjrc/usb.h
+++ b/protocol/pjrc/usb.h
--- a/protocol/pjrc/usb_debug.c
+++ b/protocol/pjrc/usb_debug.c
--- a/protocol/pjrc/usb_debug.h
+++ b/protocol/pjrc/usb_debug.h
--- a/protocol/pjrc/usb_extra.c
+++ b/protocol/pjrc/usb_extra.c
--- a/protocol/pjrc/usb_extra.h
+++ b/protocol/pjrc/usb_extra.h
--- a/protocol/pjrc/usb_keyboard.c
+++ b/protocol/pjrc/usb_keyboard.c
--- a/protocol/pjrc/usb_keyboard.h
+++ b/protocol/pjrc/usb_keyboard.h
--- a/protocol/pjrc/usb_mouse.c
+++ b/protocol/pjrc/usb_mouse.c
--- a/protocol/pjrc/usb_mouse.h
+++ b/protocol/pjrc/usb_mouse.h
--- a/protocol/ps2.c
+++ b/protocol/ps2.c
--- a/protocol/ps2.h
+++ b/protocol/ps2.h
--- a/protocol/ps2_mouse.c
+++ b/protocol/ps2_mouse.c
--- a/protocol/ps2_mouse.h
+++ b/protocol/ps2_mouse.h
--- a/protocol/ps2_usart.c
+++ b/protocol/ps2_usart.c
--- a/protocol/vusb.mk
+++ b/protocol/vusb.mk
--- a/protocol/vusb/bootloader_usbasp.c
+++ b/protocol/vusb/bootloader_usbasp.c
--- a/protocol/vusb/main.c
+++ b/protocol/vusb/main.c
--- a/protocol/vusb/sendchar_usart.c
+++ b/protocol/vusb/sendchar_usart.c
--- a/protocol/vusb/usbdrv/Changelog.txt
+++ b/protocol/vusb/usbdrv/Changelog.txt
--- a/protocol/vusb/usbdrv/CommercialLicense.txt
+++ b/protocol/vusb/usbdrv/CommercialLicense.txt
--- a/protocol/vusb/usbdrv/License.txt
+++ b/protocol/vusb/usbdrv/License.txt
--- a/protocol/vusb/usbdrv/Readme.txt
+++ b/protocol/vusb/usbdrv/Readme.txt
--- a/protocol/vusb/usbdrv/USB-ID-FAQ.txt
+++ b/protocol/vusb/usbdrv/USB-ID-FAQ.txt
--- a/protocol/vusb/usbdrv/USB-IDs-for-free.txt
+++ b/protocol/vusb/usbdrv/USB-IDs-for-free.txt
--- a/protocol/vusb/usbdrv/asmcommon.inc
+++ b/protocol/vusb/usbdrv/asmcommon.inc
--- a/protocol/vusb/usbdrv/oddebug.c
+++ b/protocol/vusb/usbdrv/oddebug.c
--- a/protocol/vusb/usbdrv/oddebug.h
+++ b/protocol/vusb/usbdrv/oddebug.h
--- a/protocol/vusb/usbdrv/usbconfig-prototype.h
+++ b/protocol/vusb/usbdrv/usbconfig-prototype.h
--- a/protocol/vusb/usbdrv/usbdrv.c
+++ b/protocol/vusb/usbdrv/usbdrv.c
--- a/protocol/vusb/usbdrv/usbdrv.h
+++ b/protocol/vusb/usbdrv/usbdrv.h
--- a/protocol/vusb/usbdrv/usbdrvasm.S
+++ b/protocol/vusb/usbdrv/usbdrvasm.S
--- a/protocol/vusb/usbdrv/usbdrvasm.asm
+++ b/protocol/vusb/usbdrv/usbdrvasm.asm
--- a/protocol/vusb/usbdrv/usbdrvasm12.inc
+++ b/protocol/vusb/usbdrv/usbdrvasm12.inc
--- a/protocol/vusb/usbdrv/usbdrvasm128.inc
+++ b/protocol/vusb/usbdrv/usbdrvasm128.inc
--- a/protocol/vusb/usbdrv/usbdrvasm15.inc
+++ b/protocol/vusb/usbdrv/usbdrvasm15.inc
--- a/protocol/vusb/usbdrv/usbdrvasm16.inc
+++ b/protocol/vusb/usbdrv/usbdrvasm16.inc
--- a/protocol/vusb/usbdrv/usbdrvasm165.inc
+++ b/protocol/vusb/usbdrv/usbdrvasm165.inc
--- a/protocol/vusb/usbdrv/usbdrvasm18-crc.inc
+++ b/protocol/vusb/usbdrv/usbdrvasm18-crc.inc
--- a/protocol/vusb/usbdrv/usbdrvasm20.inc
+++ b/protocol/vusb/usbdrv/usbdrvasm20.inc
--- a/protocol/vusb/usbdrv/usbportability.h
+++ b/protocol/vusb/usbdrv/usbportability.h
--- a/protocol/vusb/vusb.c
+++ b/protocol/vusb/vusb.c
--- a/protocol/vusb/vusb.h
+++ b/protocol/vusb/vusb.h