From fb8d23c60c757d5d9c2270cb0123a53be2049a28 Mon Sep 17 00:00:00 2001 From: tmk Date: Mon, 21 Feb 2011 15:43:17 +0900 Subject: integrate V-USB support into ps2_usb --- Makefile.rules | 11 +- command.c | 4 +- key_process.c | 392 ---------------------------------------- key_process.h | 7 - keyboard.c | 10 +- keymap.h | 18 ++ keymap_skel.h | 21 --- layer.c | 2 +- main_pjrc.c | 97 ++++++++++ matrix.h | 32 ++++ matrix_skel.h | 32 ---- ps2.c | 12 +- ps2_usb/Makefile | 56 ++---- ps2_usb/Makefile.vusb | 84 +++++++++ ps2_usb/README | 15 +- ps2_usb/config.h | 38 ---- ps2_usb/config_pjrc.h | 42 +++++ ps2_usb/config_vusb.h | 116 ++++++++++++ ps2_usb/keymap.c | 9 +- ps2_usb/led.c | 16 ++ ps2_usb/main_vusb.c | 62 +++++++ ps2_usb/matrix.c | 50 +----- ps2_usb/ps2_usart.c | 325 +++++++++++++++++++++++++++++++++ ps2_usb/sendchar_dummy.c | 8 + ps2_usb/sendchar_usart.c | 58 ++++++ ps2_usb/usbconfig.h | 378 +++++++++++++++++++++++++++++++++++++++ ps2_vusb/Makefile | 78 -------- ps2_vusb/README | 12 -- ps2_vusb/config.h | 118 ------------ ps2_vusb/keymap.c | 189 -------------------- ps2_vusb/led.c | 16 -- ps2_vusb/main.c | 62 ------- ps2_vusb/matrix.c | 444 ---------------------------------------------- ps2_vusb/ps2_usart.c | 325 --------------------------------- ps2_vusb/sendchar_dummy.c | 8 - ps2_vusb/sendchar_usart.c | 58 ------ ps2_vusb/usbconfig.h | 378 --------------------------------------- tmk.c | 2 +- 38 files changed, 1289 insertions(+), 2296 deletions(-) delete mode 100644 key_process.c delete mode 100644 key_process.h create mode 100644 keymap.h delete mode 100644 keymap_skel.h create mode 100644 main_pjrc.c create mode 100644 matrix.h delete mode 100644 matrix_skel.h create mode 100644 ps2_usb/Makefile.vusb delete mode 100644 ps2_usb/config.h create mode 100644 ps2_usb/config_pjrc.h create mode 100644 ps2_usb/config_vusb.h create mode 100644 ps2_usb/led.c create mode 100644 ps2_usb/main_vusb.c create mode 100644 ps2_usb/ps2_usart.c create mode 100644 ps2_usb/sendchar_dummy.c create mode 100644 ps2_usb/sendchar_usart.c create mode 100644 ps2_usb/usbconfig.h delete mode 100644 ps2_vusb/Makefile delete mode 100644 ps2_vusb/README delete mode 100644 ps2_vusb/config.h delete mode 100644 ps2_vusb/keymap.c delete mode 100644 ps2_vusb/led.c delete mode 100644 ps2_vusb/main.c delete mode 100644 ps2_vusb/matrix.c delete mode 100644 ps2_vusb/ps2_usart.c delete mode 100644 ps2_vusb/sendchar_dummy.c delete mode 100644 ps2_vusb/sendchar_usart.c delete mode 100644 ps2_vusb/usbconfig.h diff --git a/Makefile.rules b/Makefile.rules index 96d1d7e1e4..f1d0a301ca 100644 --- a/Makefile.rules +++ b/Makefile.rules @@ -47,7 +47,7 @@ FORMAT = ihex # Object files directory # To put object files in current directory, use a dot (.), do NOT make # this an empty or blank macro! -OBJDIR = obj +OBJDIR = obj_$(TARGET) # Optimization level, can be [0, 1, 2, 3, s]. @@ -121,7 +121,7 @@ CFLAGS += -Wstrict-prototypes CFLAGS += -Wa,-adhlns=$(@:%.o=%.lst) CFLAGS += $(patsubst %,-I%,$(EXTRAINCDIRS)) CFLAGS += $(CSTANDARD) -CFLAGS += -include config.h +CFLAGS += -include $(CONFIG_H) #---------------- Compiler Options C++ ---------------- @@ -149,7 +149,7 @@ CPPFLAGS += -Wundef CPPFLAGS += -Wa,-adhlns=$(@:%.o=%.lst) CPPFLAGS += $(patsubst %,-I%,$(EXTRAINCDIRS)) #CPPFLAGS += $(CSTANDARD) -CPPFLAGS += -include config.h +CPPFLAGS += -include $(CONFIG_H) #---------------- Assembler Options ---------------- @@ -162,7 +162,7 @@ CPPFLAGS += -include config.h # -listing-cont-lines: Sets the maximum number of continuation lines of hex # dump that will be displayed for a given single line of source input. ASFLAGS = $(ADEFS) -Wa,-adhlns=$(@:%.o=%.lst),-gstabs,--listing-cont-lines=100 -ASFLAGS += -include config.h +ASFLAGS += -include $(CONFIG_H) #---------------- Library Options ---------------- @@ -273,7 +273,6 @@ OBJDUMP = avr-objdump SIZE = avr-size AR = avr-ar rcs NM = avr-nm -AVRDUDE = avrdude REMOVE = rm -f REMOVEDIR = rmdir COPY = cp @@ -377,7 +376,7 @@ gccversion : # Program the device. program: $(TARGET).hex $(TARGET).eep - $(AVRDUDE) $(AVRDUDE_FLAGS) $(AVRDUDE_WRITE_FLASH) $(AVRDUDE_WRITE_EEPROM) + $(PROGRAM_CMD) # Generate avr-gdb config/init file which does the following: diff --git a/command.c b/command.c index a31a4007b3..0152ccd87b 100644 --- a/command.c +++ b/command.c @@ -8,7 +8,7 @@ #include "util.h" #include "timer.h" #include "layer.h" -#include "matrix_skel.h" +#include "matrix.h" #include "command.h" #ifdef HOST_PJRC @@ -107,6 +107,8 @@ uint8_t command_proc(void) break; #ifdef USB_NKRO_ENABLE case KB_N: + host_clear_keyboard_report(); + host_send_keyboard_report(); keyboard_nkro = !keyboard_nkro; if (keyboard_nkro) print("USB_NKRO: enabled\n"); diff --git a/key_process.c b/key_process.c deleted file mode 100644 index 4367f471da..0000000000 --- a/key_process.c +++ /dev/null @@ -1,392 +0,0 @@ -#include -#include -#include -#include -#include "print.h" -#include "debug.h" -#include "timer.h" -#include "util.h" -#include "jump_bootloader.h" -#include "usb_keyboard.h" -#include "usb_keycodes.h" -#include "usb.h" -#include "layer.h" -#include "matrix_skel.h" -#include "keymap_skel.h" -#include "key_process.h" -#ifdef MOUSEKEY_ENABLE -# include "mousekey.h" -#endif -#ifdef PS2_MOUSE_ENABLE -# include "ps2_mouse.h" -#endif -#ifdef USB_EXTRA_ENABLE -# include "usb_extra.h" -#endif -#ifdef USB_MOUSE_ENABLE -# include "usb_mouse.h" -#endif - - -// TODO: refactoring -void proc_matrix(void) { - bool modified = false; - uint8_t fn_bits = 0; - - matrix_scan(); - modified = matrix_is_modified(); - - if (modified) { - if (debug_matrix) matrix_print(); -#ifdef DEBUG_LED - // LED flash for debug - DEBUG_LED_CONFIG; - DEBUG_LED_ON; -#endif - } - - if (matrix_has_ghost()) { - // should send error? - debug("matrix has ghost!!\n"); - return; - } - - usb_keyboard_swap_report(); - usb_keyboard_clear_report(); - for (int row = 0; row < matrix_rows(); row++) { - for (int col = 0; col < matrix_cols(); col++) { - if (!matrix_is_on(row, col)) continue; - - uint8_t code = layer_get_keycode(row, col); - if (code == KB_NO) { - // do nothing - } else if (IS_MOD(code)) { - usb_keyboard_add_mod(code); - } else if (IS_FN(code)) { - fn_bits |= FN_BIT(code); - } -#ifdef MOUSEKEY_ENABLE - else if (IS_MOUSEKEY(code)) { - mousekey_decode(code); - } -#endif -#ifdef USB_EXTRA_ENABLE - // audio control & system control - else if (code == KB_MUTE) { - usb_extra_audio_send(AUDIO_MUTE); - usb_extra_audio_send(0); - _delay_ms(500); - } else if (code == KB_VOLU) { - usb_extra_audio_send(AUDIO_VOL_UP); - usb_extra_audio_send(0); - _delay_ms(200); - } else if (code == KB_VOLD) { - usb_extra_audio_send(AUDIO_VOL_DOWN); - usb_extra_audio_send(0); - _delay_ms(200); - } else if (code == KB_PWR) { - if (suspend && remote_wakeup) { - usb_remote_wakeup(); - } else { - usb_extra_system_send(SYSTEM_POWER_DOWN); - } - _delay_ms(1000); - } -#endif - // normal key - else if (IS_KEY(code)) { - usb_keyboard_add_key(code); - } else { - debug("ignore keycode: "); debug_hex(code); debug("\n"); - } - } - } - - if (modified) { -#ifdef DEBUG_LED - // LED flash for debug - DEBUG_LED_CONFIG; - DEBUG_LED_OFF; -#endif - } - - layer_switching(fn_bits); - - // TODO: clean code - // special mode for control, develop and debug - if (keymap_is_special_mode(fn_bits)) { - switch (usb_keyboard_get_key()) { - case KB_H: // help - usb_keyboard_clear_report(); - usb_keyboard_send(); - print_enable = true; - print("b: jump to bootloader\n"); - print("d: toggle debug enable\n"); - print("x: toggle matrix debug\n"); - print("k: toggle keyboard debug\n"); - print("m: toggle mouse debug\n"); - print("p: toggle print enable\n"); - print("v: print version\n"); - print("t: print timer count\n"); - print("s: print status\n"); - print("`: toggle protcol(boot/report)\n"); -#ifdef USB_NKRO_ENABLE - print("n: toggle USB_NKRO\n"); -#endif - print("Backspace: clear matrix\n"); - print("ESC: power down/wake up\n"); - print("0: switch to Layer0 \n"); - print("1: switch to Layer1 \n"); - print("2: switch to Layer2 \n"); - print("3: switch to Layer3 \n"); - print("4: switch to Layer4 \n"); -#ifdef PS2_MOUSE_ENABLE - print("[: ps2_mouse_init \n"); - print("]: ps2_mouse_read \n"); - print("\: ps2_mouse: on/off toggle \n"); -#endif - _delay_ms(500); - print_enable = false; - break; - case KB_BSPC: - usb_keyboard_clear_report(); - usb_keyboard_send(); - matrix_init(); - print("clear matrix\n"); - _delay_ms(500); - break; - case KB_0: - usb_keyboard_clear_report(); - usb_keyboard_send(); - print("current_layer: "); phex(current_layer); print("\n"); - print("default_layer: "); phex(default_layer); print("\n"); - current_layer = 0; - default_layer = 0; - print("switch to Layer0 \n"); - _delay_ms(500); - break; - case KB_1: - usb_keyboard_clear_report(); - usb_keyboard_send(); - print("current_layer: "); phex(current_layer); print("\n"); - print("default_layer: "); phex(default_layer); print("\n"); - current_layer = 1; - default_layer = 1; - print("switch to Layer1 \n"); - _delay_ms(500); - break; - case KB_2: - usb_keyboard_clear_report(); - usb_keyboard_send(); - print("current_layer: "); phex(current_layer); print("\n"); - print("default_layer: "); phex(default_layer); print("\n"); - current_layer = 2; - default_layer = 2; - print("switch to Layer2 \n"); - _delay_ms(500); - break; - case KB_3: - usb_keyboard_clear_report(); - usb_keyboard_send(); - print("current_layer: "); phex(current_layer); print("\n"); - print("default_layer: "); phex(default_layer); print("\n"); - current_layer = 3; - default_layer = 3; - print("switch to Layer3 \n"); - _delay_ms(500); - break; - case KB_4: - usb_keyboard_clear_report(); - usb_keyboard_send(); - print("current_layer: "); phex(current_layer); print("\n"); - print("default_layer: "); phex(default_layer); print("\n"); - current_layer = 4; - default_layer = 4; - print("switch to Layer4 \n"); - _delay_ms(500); - break; -#ifdef PS2_MOUSE_ENABLE - case KB_LBRC: - usb_keyboard_clear_report(); - usb_keyboard_send(); - print_enable = true; - print("ps2_mouse_init...\n"); - _delay_ms(500); - ps2_mouse_init(); - break; - case KB_RBRC: - usb_keyboard_clear_report(); - usb_keyboard_send(); - print_enable = true; - print("ps2_mouse_read[btn x y]: "); - _delay_ms(100); - ps2_mouse_read(); - phex(ps2_mouse_btn); print(" "); - phex(ps2_mouse_x); print(" "); - phex(ps2_mouse_y); print("\n"); - print("ps2_mouse_error_count: "); phex(ps2_mouse_error_count); print("\n"); - break; - case KB_BSLS: - ps2_mouse_enable = !ps2_mouse_enable; - print("ps2_mouse: "); - if (ps2_mouse_enable) - print("on"); - else - print("off"); - print("\n"); - _delay_ms(500); - break; -#endif - case KB_B: // bootloader - usb_keyboard_clear_report(); - usb_keyboard_send(); - print_enable = true; - print("jump to bootloader...\n"); - _delay_ms(1000); - jump_bootloader(); // not return - break; - case KB_D: // debug all toggle - usb_keyboard_clear_report(); - usb_keyboard_send(); - debug_enable = !debug_enable; - if (debug_enable) { - print_enable = true; - print("debug enabled.\n"); - //debug_matrix = true; - //debug_keyboard = true; - //debug_mouse = true; - } else { - print("debug disabled.\n"); - print_enable = false; - //debug_matrix = false; - //debug_keyboard = false; - //debug_mouse = false; - } - _delay_ms(1000); - break; - case KB_X: // debug matrix toggle - usb_keyboard_clear_report(); - usb_keyboard_send(); - debug_matrix = !debug_matrix; - if (debug_matrix) - print("debug matrix enabled.\n"); - else - print("debug matrix disabled.\n"); - _delay_ms(1000); - break; - case KB_K: // debug keyboard toggle - usb_keyboard_clear_report(); - usb_keyboard_send(); - debug_keyboard = !debug_keyboard; - if (debug_keyboard) - print("debug keyboard enabled.\n"); - else - print("debug keyboard disabled.\n"); - _delay_ms(1000); - break; - case KB_M: // debug mouse toggle - usb_keyboard_clear_report(); - usb_keyboard_send(); - debug_mouse = !debug_mouse; - if (debug_mouse) - print("debug mouse enabled.\n"); - else - print("debug mouse disabled.\n"); - _delay_ms(1000); - break; - case KB_V: // print version & information - usb_keyboard_clear_report(); - usb_keyboard_send(); - print_enable = true; - print(STR(DESCRIPTION) "\n"); - _delay_ms(1000); - break; - case KB_T: // print timer - usb_keyboard_clear_report(); - usb_keyboard_send(); - print_enable = true; - print("timer: "); phex16(timer_count); print("\n"); - _delay_ms(500); - break; - case KB_P: // print toggle - usb_keyboard_clear_report(); - usb_keyboard_send(); - if (print_enable) { - print("print disabled.\n"); - print_enable = false; - } else { - print_enable = true; - print("print enabled.\n"); - } - _delay_ms(1000); - break; - case KB_S: - usb_keyboard_clear_report(); - usb_keyboard_send(); - print("UDCON: "); phex(UDCON); print("\n"); - print("UDIEN: "); phex(UDIEN); print("\n"); - print("UDINT: "); phex(UDINT); print("\n"); - print("usb_keyboard_leds:"); phex(usb_keyboard_leds); print("\n"); - print("usb_keyboard_protocol:"); phex(usb_keyboard_protocol); print("\n"); - print("usb_keyboard_idle_config:"); phex(usb_keyboard_idle_config); print("\n"); - print("usb_keyboard_idle_count:"); phex(usb_keyboard_idle_count); print("\n"); -#ifdef USB_MOUSE_ENABLE - print("usb_mouse_protocol:"); phex(usb_mouse_protocol); print("\n"); -#endif - if (usb_keyboard_nkro) print("USB_NKRO: enabled\n"); else print("USB_NKRO: disabled\n"); - _delay_ms(500); - break; - case KB_GRV: - usb_keyboard_clear_report(); - usb_keyboard_send(); - usb_keyboard_protocol = !usb_keyboard_protocol; - print("keyboard protcol: "); - if (usb_keyboard_protocol) print("report"); else print("boot"); - print("\n"); - -#ifdef USB_MOUSE_ENABLE - usb_mouse_protocol = !usb_mouse_protocol; - print("mouse protcol: "); - if (usb_mouse_protocol) print("report"); else print("boot"); - print("\n"); -#endif - _delay_ms(1000); - break; -#ifdef USB_NKRO_ENABLE - case KB_N: - usb_keyboard_clear_report(); - usb_keyboard_send(); - usb_keyboard_nkro = !usb_keyboard_nkro; - if (usb_keyboard_nkro) print("USB_NKRO: enabled\n"); else print("USB_NKRO: disabled\n"); - _delay_ms(1000); - break; -#endif -#ifdef USB_EXTRA_ENABLE - case KB_ESC: - usb_keyboard_clear_report(); - usb_keyboard_send(); - if (suspend && remote_wakeup) { - usb_remote_wakeup(); - } else { - usb_extra_system_send(SYSTEM_POWER_DOWN); - } - _delay_ms(1000); - break; -#endif - } - } - - - if (modified) { - usb_keyboard_send(); - } - -#ifdef MOUSEKEY_ENABLE - mousekey_usb_send(); -#endif - -#ifdef PS2_MOUSE_ENABLE - if (ps2_mouse_read() == 0) - ps2_mouse_usb_send(); -#endif -} diff --git a/key_process.h b/key_process.h deleted file mode 100644 index bfc0218f3e..0000000000 --- a/key_process.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef KEY_PROCESS_H -#define KEY_PROCESS_H 1 - - -void proc_matrix(void); - -#endif diff --git a/keyboard.c b/keyboard.c index 25948ddf71..03db3257a2 100644 --- a/keyboard.c +++ b/keyboard.c @@ -1,7 +1,7 @@ #include "keyboard.h" #include "host.h" #include "layer.h" -#include "matrix_skel.h" +#include "matrix.h" #include "led.h" #include "usb_keycodes.h" #include "timer.h" @@ -11,6 +11,11 @@ #ifdef MOUSEKEY_ENABLE #include "mousekey.h" #endif +/* TODO: shoud make new API */ +#ifdef USB_EXTRA_ENABLE +#include "usb_extra.h" +#include +#endif static uint8_t last_leds = 0; @@ -61,7 +66,6 @@ void keyboard_proc(void) fn_bits |= FN_BIT(code); } #ifdef USB_EXTRA_ENABLE -/* TODO: use new API // audio control & system control else if (code == KB_MUTE) { usb_extra_audio_send(AUDIO_MUTE); @@ -83,7 +87,6 @@ void keyboard_proc(void) } _delay_ms(1000); } -*/ #endif else if (IS_KEY(code)) { host_add_key(code); @@ -102,7 +105,6 @@ void keyboard_proc(void) layer_switching(fn_bits); if (command_proc()) { - // not send report return; } diff --git a/keymap.h b/keymap.h new file mode 100644 index 0000000000..79ef0359d9 --- /dev/null +++ b/keymap.h @@ -0,0 +1,18 @@ +#ifndef KEYMAP_H +#define KEYMAP_H + +#include +#include +#include "usb_keycodes.h" + + +/* keycode in specific layer */ +uint8_t keymap_get_keycode(uint8_t layer, uint8_t row, uint8_t col); + +/* layer to move during press Fn key */ +uint8_t keymap_fn_layer(uint8_t fn_bits); + +/* keycode to send when release Fn key without using */ +uint8_t keymap_fn_keycode(uint8_t fn_bits); + +#endif diff --git a/keymap_skel.h b/keymap_skel.h deleted file mode 100644 index 300801ff62..0000000000 --- a/keymap_skel.h +++ /dev/null @@ -1,21 +0,0 @@ -#ifndef KEYMAP_SKEL_H -#define KEYMAP_SKEL_H 1 - -#include -#include -#include "usb_keycodes.h" - - -/* keycode in specific layer */ -uint8_t keymap_get_keycode(uint8_t layer, uint8_t row, uint8_t col); - -/* layer to move during press Fn key */ -uint8_t keymap_fn_layer(uint8_t fn_bits); - -/* keycode to send when release Fn key without using */ -uint8_t keymap_fn_keycode(uint8_t fn_bits); - -/* whether special key combination */ -bool keymap_is_special_mode(uint8_t fn_bits); - -#endif diff --git a/layer.c b/layer.c index 90314e4429..0c59c91fb7 100644 --- a/layer.c +++ b/layer.c @@ -1,4 +1,4 @@ -#include "keymap_skel.h" +#include "keymap.h" #include "host.h" #include "debug.h" #include "timer.h" diff --git a/main_pjrc.c b/main_pjrc.c new file mode 100644 index 0000000000..18a05ffdff --- /dev/null +++ b/main_pjrc.c @@ -0,0 +1,97 @@ +/* 2010/08/23 noname + * keyboard firmware based on PJRC USB keyboard example + */ +/* Keyboard example with debug channel, for Teensy USB Development Board + * http://www.pjrc.com/teensy/usb_keyboard.html + * Copyright (c) 2008 PJRC.COM, LLC + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +#include +#include +#include +#include +#include "keyboard.h" +#include "usb.h" +#include "matrix.h" +#include "print.h" +#include "debug.h" +#include "util.h" +#include "jump_bootloader.h" +#ifdef PS2_MOUSE_ENABLE +# include "ps2_mouse.h" +#endif + + +#define CPU_PRESCALE(n) (CLKPR = 0x80, CLKPR = (n)) + + +bool debug_enable = false; +bool debug_matrix = false; +bool debug_keyboard = false; +bool debug_mouse = false; + + +int main(void) +{ + DEBUG_LED_CONFIG; + DEBUG_LED_OFF; + + // set for 16 MHz clock + CPU_PRESCALE(0); + + // Initialize the USB, and then wait for the host to set configuration. + // If the Teensy is powered without a PC connected to the USB port, + // this will wait forever. + usb_init(); + while (!usb_configured()) /* wait */ ; + + keyboard_init(); + matrix_scan(); + if (matrix_key_count() >= 3) { +#ifdef DEBUG_LED + for (int i = 0; i < 6; i++) { + DEBUG_LED_CONFIG; + DEBUG_LED_ON; + _delay_ms(500); + DEBUG_LED_OFF; + _delay_ms(500); + } +#else + _delay_ms(5000); +#endif + print_enable = true; + debug_enable = true; + debug_matrix = true; + debug_keyboard = true; + debug_mouse = true; + print("debug enabled.\n"); + } + if (matrix_key_count() >= 4) { + print("jump to bootloader...\n"); + _delay_ms(1000); + jump_bootloader(); // not return + } + + + while (1) { + keyboard_proc(); + } +} diff --git a/matrix.h b/matrix.h new file mode 100644 index 0000000000..1bcd0915fe --- /dev/null +++ b/matrix.h @@ -0,0 +1,32 @@ +#ifndef MATRIX_H +#define MATRIX_H + +#include + +/* number of matrix rows */ +uint8_t matrix_rows(void); +/* number of matrix columns */ +uint8_t matrix_cols(void); +/* intialize matrix for scaning. should be called once. */ +void matrix_init(void); +/* scan all key states on matrix */ +uint8_t matrix_scan(void); +/* whether modified from previous scan. used after matrix_scan. */ +bool matrix_is_modified(void); +/* whether ghosting occur on matrix. */ +bool matrix_has_ghost(void); +/* whether a swtich is on */ +bool matrix_is_on(uint8_t row, uint8_t col); +/* matrix state on row */ +#if (MATRIX_COLS <= 8) +uint8_t matrix_get_row(uint8_t row); +#else +uint16_t matrix_get_row(uint8_t row); +#endif +/* count keys pressed */ +uint8_t matrix_key_count(void); +/* print matrix for debug */ +void matrix_print(void); + + +#endif diff --git a/matrix_skel.h b/matrix_skel.h deleted file mode 100644 index 2379ce44ab..0000000000 --- a/matrix_skel.h +++ /dev/null @@ -1,32 +0,0 @@ -#ifndef MATRIX_SKEL_H -#define MATRIX_SKEL_H 1 - -#include - -/* number of matrix rows */ -uint8_t matrix_rows(void); -/* number of matrix columns */ -uint8_t matrix_cols(void); -/* intialize matrix for scaning. should be called once. */ -void matrix_init(void); -/* scan all key states on matrix */ -uint8_t matrix_scan(void); -/* whether modified from previous scan. used after matrix_scan. */ -bool matrix_is_modified(void); -/* whether ghosting occur on matrix. */ -bool matrix_has_ghost(void); -/* whether a swtich is on */ -bool matrix_is_on(uint8_t row, uint8_t col); -/* matrix state on row */ -#if (MATRIX_COLS <= 8) -uint8_t matrix_get_row(uint8_t row); -#else -uint16_t matrix_get_row(uint8_t row); -#endif -/* count keys pressed */ -uint8_t matrix_key_count(void); -/* print matrix for debug */ -void matrix_print(void); - - -#endif diff --git a/ps2.c b/ps2.c index 52ee1691fb..99749cf6ba 100644 --- a/ps2.c +++ b/ps2.c @@ -187,6 +187,9 @@ static inline void pbuf_enqueue(uint8_t data) { if (!data) return; + + uint8_t sreg = SREG; + cli(); uint8_t next = (pbuf_head + 1) % PBUF_SIZE; if (next != pbuf_tail) { pbuf[pbuf_head] = data; @@ -194,10 +197,12 @@ static inline void pbuf_enqueue(uint8_t data) } else { debug("pbuf: full\n"); } + SREG = sreg; } static inline uint8_t pbuf_dequeue(void) { uint8_t val = 0; + uint8_t sreg = SREG; cli(); if (pbuf_head != pbuf_tail) { @@ -205,17 +210,20 @@ static inline uint8_t pbuf_dequeue(void) pbuf_tail = (pbuf_tail + 1) % PBUF_SIZE; } SREG = sreg; + return val; } /* get data received by interrupt */ uint8_t ps2_host_recv(void) { - // TODO: release clock line after 100us when inhibited by error if (ps2_error) { + print("x"); + phex(ps2_error); ps2_host_send(0xFE); // request to resend ps2_error = PS2_ERR_NONE; } + idle(); return pbuf_dequeue(); } @@ -281,7 +289,7 @@ ISR(PS2_INT_VECT) } goto RETURN; ERROR: - DEBUGP(0xFF); + DEBUGP(0x0F); inhibit(); ps2_error = state; DONE: diff --git a/ps2_usb/Makefile b/ps2_usb/Makefile index bd9a76eb85..af73be2c92 100644 --- a/ps2_usb/Makefile +++ b/ps2_usb/Makefile @@ -1,46 +1,5 @@ -# Hey Emacs, this is a -*- makefile -*- -#---------------------------------------------------------------------------- -# WinAVR Makefile Template written by Eric B. Weddington, Jörg Wunsch, et al. -# -# Released to the Public Domain -# -# Additional material for this makefile was written by: -# Peter Fleury -# Tim Henigan -# Colin O'Flynn -# Reiner Patommel -# Markus Pfaff -# Sander Pool -# Frederik Rouleau -# Carlos Lamas -# -#---------------------------------------------------------------------------- -# On command line: -# -# make all = Make software. -# -# make clean = Clean out built project files. -# -# make coff = Convert ELF to AVR COFF. -# -# make extcoff = Convert ELF to AVR Extended COFF. -# -# make program = Download the hex file to the device, using avrdude. -# Please customize the avrdude settings below first! -# -# make debug = Start either simulavr or avarice as specified for debugging, -# with avr-gdb or avr-insight as the front end for debugging. -# -# make filename.s = Just compile filename.c into the assembler code only. -# -# make filename.i = Create a preprocessed source file for use in submitting -# bug reports to the GCC project. -# -# To rebuild project do "make clean" then "make all". -#---------------------------------------------------------------------------- - # Target file name (without extension). -TARGET = tmk_ps2_usb +TARGET = ps2_usb # Directory common source filess exist COMMON_DIR = .. @@ -49,10 +8,14 @@ COMMON_DIR = .. TARGET_DIR = . # keyboard dependent files -TARGET_SRC = keymap.c \ +TARGET_SRC = main_pjrc.c \ + keymap.c \ matrix.c \ + led.c \ ps2.c +CONFIG_H = config_pjrc.h + # MCU name, you MUST set this to match the board you are using # type "make clean" after changing this, so all files will be rebuilt @@ -78,4 +41,11 @@ USB_EXTRA_ENABLE = yes # Enhanced feature for Windows(Audio control and System c USB_NKRO_ENABLE = yes # USB Nkey Rollover + +#---------------- Programming Options -------------------------- +PROGRAM_CMD = teensy_loader_cli.exe -mmcu=$(MCU) -w -v $(TARGET).hex + + + +include $(COMMON_DIR)/Makefile.pjrc include $(COMMON_DIR)/Makefile.common diff --git a/ps2_usb/Makefile.vusb b/ps2_usb/Makefile.vusb new file mode 100644 index 0000000000..7b69dc27b5 --- /dev/null +++ b/ps2_usb/Makefile.vusb @@ -0,0 +1,84 @@ +# Target file name (without extension). +TARGET = ps2_vusb + +# Directory common source filess exist +COMMON_DIR = .. + +# Directory keyboard dependent files exist +TARGET_DIR = . + +# keyboard dependent files +TARGET_SRC = main_vusb.c \ + keymap.c \ + matrix.c \ + led.c \ + ps2_usart.c \ + sendchar_dummy.c +# sendchar_usart.c + +CONFIG_H = config_vusb.h + + +OPT_DEFS = -DDEBUG_LEVEL=0 + + +# MCU name, you MUST set this to match the board you are using +# type "make clean" after changing this, so all files will be rebuilt +#MCU = at90usb162 # Teensy 1.0 +#MCU = atmega32u4 # Teensy 2.0 +#MCU = at90usb646 # Teensy++ 1.0 +#MCU = at90usb1286 # Teensy++ 2.0 +MCU = atmega168 + + +# Processor frequency. +# Normally the first thing your program should do is set the clock prescaler, +# so your program will run at the correct speed. You should also set this +# variable to same clock speed. The _delay_ms() macro uses this, and many +# examples use this variable to calculate timings. Do not add a "UL" here. +F_CPU = 20000000 + + +# Build Options +# comment out to disable the options. +# +MOUSEKEY_ENABLE = yes # Mouse keys +#USB_EXTRA_ENABLE = yes # Enhanced feature for Windows(Audio control and System control) +#USB_NKRO_ENABLE = yes # USB Nkey Rollover + + + +#---------------- Programming Options -------------------------- +AVRDUDE = avrdude +# Type: avrdude -c ? to get a full listing. +AVRDUDE_PROGRAMMER = usbasp +AVRDUDE_PORT = +AVRDUDE_WRITE_FLASH = -U flash:w:$(TARGET).hex +#AVRDUDE_WRITE_EEPROM = -U eeprom:w:$(TARGET).eep + +# Uncomment the following if you want avrdude's erase cycle counter. +# Note that this counter needs to be initialized first using -Yn, +# see avrdude manual. +#AVRDUDE_ERASE_COUNTER = -y + +# Uncomment the following if you do /not/ wish a verification to be +# performed after programming the device. +#AVRDUDE_NO_VERIFY = -V + +# Increase verbosity level. Please use this when submitting bug +# reports about avrdude. See +# to submit bug reports. +#AVRDUDE_VERBOSE = -v -v + +#AVRDUDE_FLAGS = -p $(MCU) -P $(AVRDUDE_PORT) -c $(AVRDUDE_PROGRAMMER) +AVRDUDE_FLAGS = -p $(MCU) -c $(AVRDUDE_PROGRAMMER) +AVRDUDE_FLAGS += $(AVRDUDE_NO_VERIFY) +AVRDUDE_FLAGS += $(AVRDUDE_VERBOSE) +AVRDUDE_FLAGS += $(AVRDUDE_ERASE_COUNTER) + +PROGRAM_CMD = $(AVRDUDE) $(AVRDUDE_FLAGS) $(AVRDUDE_WRITE_FLASH) $(AVRDUDE_WRITE_EEPROM) + + + +include $(COMMON_DIR)/Makefile.vusb +include $(COMMON_DIR)/Makefile.common diff --git a/ps2_usb/README b/ps2_usb/README index 3c9eb14282..ad5c6c4311 100644 --- a/ps2_usb/README +++ b/ps2_usb/README @@ -47,10 +47,10 @@ Keymap customization You can customize keymaps easily by editing source code. -Build ------ +Build for Teensy +---------------- 0. Connect PS/2 keyboard to Teensy by 4 lines(Vcc, GND, Data, Clock). -1. Define following macros for PS/2 connection in config.h: +1. Define following macros for PS/2 connection in config_pjrc.h: PS2_DATA_PORT PS2_DATA_PIN PS2_DATA_DDR @@ -65,6 +65,15 @@ Build http://www.pjrc.com/teensy/loader.html +Build for V-USB +--------------- +0. Build V-USB controller board and connect PS/2 keyboard. +1. Define macros in config_vusb.h if needed. +2. Edit Makefile.vusb for build options and MCU setting. +3. make -f Makefile.vusb +4. program your V-USB controller. + + Keymap ------ You can change a keymap by editing code of keymap.c like following. diff --git a/ps2_usb/config.h b/ps2_usb/config.h deleted file mode 100644 index be96f004a8..0000000000 --- a/ps2_usb/config.h +++ /dev/null @@ -1,38 +0,0 @@ -#ifndef CONFIG_H -#define CONFIG_H - -/* controller configuration */ -#include "controller_teensy.h" - -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x6512 -#define MANUFACTURER t.m.k. -#define PRODUCT PS/2 keyboard converter -#define DESCRIPTION convert PS/2 keyboard to USB - -/* matrix size */ -#define MATRIX_ROWS 32 // keycode bit: 3-0 -#define MATRIX_COLS 8 // keycode bit: 6-4 -/* define if matrix has ghost */ -//#define MATRIX_HAS_GHOST - -/* USB NKey Rollover */ -#ifdef USB_NKRO_ENABLE -#endif - -/* mouse keys */ -#ifdef MOUSEKEY_ENABLE -# define MOUSEKEY_DELAY_TIME 255 -#endif - -/* PS/2 mouse */ -#define PS2_CLOCK_PORT PORTF -#define PS2_CLOCK_PIN PINF -#define PS2_CLOCK_DDR DDRF -#define PS2_CLOCK_BIT 0 -#define PS2_DATA_PORT PORTF -#define PS2_DATA_PIN PINF -#define PS2_DATA_DDR DDRF -#define PS2_DATA_BIT 1 - -#endif diff --git a/ps2_usb/config_pjrc.h b/ps2_usb/config_pjrc.h new file mode 100644 index 0000000000..6205c48015 --- /dev/null +++ b/ps2_usb/config_pjrc.h @@ -0,0 +1,42 @@ +#ifndef CONFIG_H +#define CONFIG_H + +/* controller configuration */ +#include "controller_teensy.h" + +#define VENDOR_ID 0xFEED +#define PRODUCT_ID 0x6512 +#define MANUFACTURER t.m.k. +#define PRODUCT PS/2 keyboard converter +#define DESCRIPTION convert PS/2 keyboard to USB + + +/* matrix size */ +#define MATRIX_ROWS 32 // keycode bit: 3-0 +#define MATRIX_COLS 8 // keycode bit: 6-4 + + +/* key combination for command */ +#define IS_COMMAND() ( \ + keyboard_report->mods == (BIT_LSHIFT | BIT_RSHIFT) || \ + keyboard_report->mods == (BIT_LCTRL | BIT_RSHIFT) \ +) + + +/* mouse keys */ +#ifdef MOUSEKEY_ENABLE +# define MOUSEKEY_DELAY_TIME 255 +#endif + + +/* PS/2 lines */ +#define PS2_CLOCK_PORT PORTF +#define PS2_CLOCK_PIN PINF +#define PS2_CLOCK_DDR DDRF +#define PS2_CLOCK_BIT 0 +#define PS2_DATA_PORT PORTF +#define PS2_DATA_PIN PINF +#define PS2_DATA_DDR DDRF +#define PS2_DATA_BIT 1 + +#endif diff --git a/ps2_usb/config_vusb.h b/ps2_usb/config_vusb.h new file mode 100644 index 0000000000..0463f68ba9 --- /dev/null +++ b/ps2_usb/config_vusb.h @@ -0,0 +1,116 @@ +#ifndef CONFIG_H +#define CONFIG_H + + +#define VENDOR_ID 0xFEED +#define PRODUCT_ID 0x2233 +// TODO: share these strings with usbconfig.h +// Edit usbconfig.h to change these. +#define MANUFACTURER t.m.k. +#define PRODUCT PS/2 keyboard converter +#define DESCRIPTION convert PS/2 keyboard to USB + + +/* matrix size */ +#define MATRIX_ROWS 32 // keycode bit: 3-0 +#define MATRIX_COLS 8 // keycode bit: 6-4 + + +/* key combination for command */ +#define IS_COMMAND() ( \ + keyboard_report->mods == (BIT_LSHIFT | BIT_RSHIFT) || \ + keyboard_report->mods == (BIT_LCTRL | BIT_RSHIFT) \ +) + + +/* mouse keys */ +#ifdef MOUSEKEY_ENABLE +# define MOUSEKEY_DELAY_TIME 255 +#endif + + +/* PS/2 lines */ +#define PS2_CLOCK_PORT PORTD +#define PS2_CLOCK_PIN PIND +#define PS2_CLOCK_DDR DDRD +#define PS2_CLOCK_BIT 4 +#define PS2_DATA_PORT PORTD +#define PS2_DATA_PIN PIND +#define PS2_DATA_DDR DDRD +#define PS2_DATA_BIT 0 + + +// Synchronous USART is used to receive data from keyboard. +// Use RXD pin for PS/2 DATA line and XCK for PS/2 CLOCK. +// NOTE: This is recomended strongly if you use V-USB library. +#define PS2_USE_USART + +// External or Pin Change Interrupt is used to receive data from keyboard. +// Use INT1 or PCINTxx for PS/2 CLOCK line. see below. +//#define PS2_USE_INT + + +#ifdef PS2_USE_USART +// synchronous, odd parity, 1-bit stop, 8-bit data, sample at falling edge +// set DDR of CLOCK as input to be slave +#define PS2_USART_INIT() do { \ + PS2_CLOCK_DDR &= ~(1< #include #include -#include "usb_keyboard.h" #include "usb_keycodes.h" #include "print.h" #include "debug.h" #include "util.h" -#include "keymap_skel.h" +#include "keymap.h" #define KEYCODE(layer, row, col) (pgm_read_byte(&keymaps[(layer)][(row)][(col)])) @@ -181,9 +180,3 @@ uint8_t keymap_fn_keycode(uint8_t fn_bits) { return pgm_read_byte(&fn_keycode[(biton(fn_bits))]); } - -// define a condition to enter special function mode -bool keymap_is_special_mode(uint8_t fn_bits) -{ - return usb_keyboard_mods == (BIT_LSHIFT | BIT_RSHIFT) || usb_keyboard_mods == (BIT_LCTRL | BIT_RSHIFT); -} diff --git a/ps2_usb/led.c b/ps2_usb/led.c new file mode 100644 index 0000000000..d69b1c6759 --- /dev/null +++ b/ps2_usb/led.c @@ -0,0 +1,16 @@ +#include "stdint.h" +#include "ps2.h" +#include "led.h" + + +void led_set(uint8_t usb_led) +{ + uint8_t ps2_led = 0; + if (usb_led & (1< +#include +#include +#include +#include "usbdrv.h" +#include "oddebug.h" +#include "host_vusb.h" +#include "keyboard.h" + + +#if 0 +#define DEBUGP_INIT() do { DDRC = 0xFF; } while (0) +#define DEBUGP(x) do { PORTC = x; } while (0) +#else +#define DEBUGP_INIT() +#define DEBUGP(x) +#endif + + +int main(void) +{ + DEBUGP_INIT(); + wdt_enable(WDTO_1S); + odDebugInit(); + usbInit(); + + /* enforce re-enumeration, do this while interrupts are disabled! */ + usbDeviceDisconnect(); + uint8_t i = 0; + /* fake USB disconnect for > 250 ms */ + while(--i){ + wdt_reset(); + _delay_ms(1); + } + usbDeviceConnect(); + + keyboard_init(); + + sei(); + while (1) { + DEBUGP(0x1); + wdt_reset(); + usbPoll(); + DEBUGP(0x2); + keyboard_proc(); + DEBUGP(0x3); + host_vusb_keyboard_send(); + } +} diff --git a/ps2_usb/matrix.c b/ps2_usb/matrix.c index aaf89719ef..52479d9752 100644 --- a/ps2_usb/matrix.c +++ b/ps2_usb/matrix.c @@ -9,8 +9,7 @@ #include "util.h" #include "debug.h" #include "ps2.h" -#include "usb_keyboard.h" -#include "matrix_skel.h" +#include "matrix.h" #if (MATRIX_COLS > 16) @@ -60,8 +59,6 @@ static bool matrix_has_ghost_in_row(uint8_t row); #endif static void matrix_make(uint8_t code); static void matrix_break(uint8_t code); -static void ps2_reset(void); -static void ps2_set_leds(uint8_t leds); inline @@ -78,20 +75,8 @@ uint8_t matrix_cols(void) void matrix_init(void) { - print_enable = true; ps2_host_init(); - ps2_reset(); - - // flush LEDs - ps2_set_leds(1< + +This software is licensed with a Modified BSD License. +All of this is supposed to be Free Software, Open Source, DFSG-free, +GPL-compatible, and OK to use in both free and proprietary applications. +Additions and corrections to this file are welcome. + + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +* Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + +* Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in + the documentation and/or other materials provided with the + distribution. + +* Neither the name of the copyright holders nor the names of + contributors may be used to endorse or promote products derived + from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE +LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE. +*/ +/* +Primitive PS/2 Library for AVR +============================== +Host side is only supported now. +Synchronous USART is used to receive data by hardware process +rather than interrupt. During V-USB interrupt runs, CLOCK interrupt +cannot interpose. In the result it is prone to lost CLOCK edge. + + +I/O control +----------- +High state is asserted by internal pull-up. +If you have a signaling problem, you may need to have +external pull-up resisters on CLOCK and DATA line. + + +PS/2 References +--------------- +http://www.computer-engineering.org/ps2protocol/ +http://www.mcamafia.de/pdf/ibm_hitrc07.pdf +*/ +#include +#include +#include +#include +#include "ps2.h" +#include "debug.h" + + +#if 0 +#define DEBUGP_INIT() do { DDRC = 0xFF; } while (0) +#define DEBUGP(x) do { PORTC = x; } while (0) +#else +#define DEBUGP_INIT() +#define DEBUGP(x) +#endif + +#define WAIT(stat, us, err) do { \ + if (!wait_##stat(us)) { \ + ps2_error = err; \ + goto ERROR; \ + } \ +} while (0) + + +uint8_t ps2_error = PS2_ERR_NONE; + + +static inline void clock_lo(void); +static inline void clock_hi(void); +static inline bool clock_in(void); +static inline void data_lo(void); +static inline void data_hi(void); +static inline bool data_in(void); +static inline uint16_t wait_clock_lo(uint16_t us); +static inline uint16_t wait_clock_hi(uint16_t us); +static inline uint16_t wait_data_lo(uint16_t us); +static inline uint16_t wait_data_hi(uint16_t us); +static inline void idle(void); +static inline void inhibit(void); +#if defined PS2_USE_INT || defined PS2_USE_USART +static inline uint8_t pbuf_dequeue(void); +static inline void pbuf_enqueue(uint8_t data); +#endif + + +void ps2_host_init(void) +{ + DEBUGP_INIT(); + DEBUGP(0x1); + idle(); + PS2_USART_INIT(); + PS2_USART_RX_INT_ON(); +} + +uint8_t ps2_host_send(uint8_t data) +{ + uint8_t res = 0; + bool parity = true; + ps2_error = PS2_ERR_NONE; + + DEBUGP(0x6); + PS2_USART_OFF(); + + /* terminate a transmission if we have */ + inhibit(); + _delay_us(100); + + /* start bit [1] */ + data_lo(); + clock_hi(); + WAIT(clock_lo, 15000, 1); + /* data [2-9] */ + for (uint8_t i = 0; i < 8; i++) { + _delay_us(15); + if (data&(1<>2); + } else { + pbuf_enqueue(data); + } + DEBUGP(0x8); +} + +/* send LED state to keyboard */ +void ps2_host_set_led(uint8_t led) +{ + // send 0xED then keyboard keeps waiting for next LED data + // and keyboard does not send any scan codes during waiting. + // If fail to send LED data keyboard looks like being freezed. + uint8_t retry = 3; + while (retry-- && ps2_host_send(PS2_SET_LED) != PS2_ACK) + ; + retry = 3; + while (retry-- && ps2_host_send(led) != PS2_ACK) + ; +} + + +/*-------------------------------------------------------------------- + * static functions + *------------------------------------------------------------------*/ +static inline void clock_lo() +{ + PS2_CLOCK_PORT &= ~(1< +#include "sendchar.h" + + +int8_t sendchar(uint8_t c) +{ + return 1; +} diff --git a/ps2_usb/sendchar_usart.c b/ps2_usb/sendchar_usart.c new file mode 100644 index 0000000000..fe18177a3c --- /dev/null +++ b/ps2_usb/sendchar_usart.c @@ -0,0 +1,58 @@ +#include +#include "oddebug.h" +#include "sendchar.h" + + +/* from oddebug.h */ +#if defined UBRR +# define ODDBG_UBRR UBRR +#elif defined UBRRL +# define ODDBG_UBRR UBRRL +#elif defined UBRR0 +# define ODDBG_UBRR UBRR0 +#elif defined UBRR0L +# define ODDBG_UBRR UBRR0L +#endif + +#if defined UCR +# define ODDBG_UCR UCR +#elif defined UCSRB +# define ODDBG_UCR UCSRB +#elif defined UCSR0B +# define ODDBG_UCR UCSR0B +#endif + +#if defined TXEN +# define ODDBG_TXEN TXEN +#else +# define ODDBG_TXEN TXEN0 +#endif + +#if defined USR +# define ODDBG_USR USR +#elif defined UCSRA +# define ODDBG_USR UCSRA +#elif defined UCSR0A +# define ODDBG_USR UCSR0A +#endif + +#if defined UDRE +# define ODDBG_UDRE UDRE +#else +# define ODDBG_UDRE UDRE0 +#endif + +#if defined UDR +# define ODDBG_UDR UDR +#elif defined UDR0 +# define ODDBG_UDR UDR0 +#endif + + +/* from oddebug.c */ +int8_t sendchar(uint8_t c) +{ + while(!(ODDBG_USR & (1 << ODDBG_UDRE))); /* wait for data register empty */ + ODDBG_UDR = c; + return 1; +} diff --git a/ps2_usb/usbconfig.h b/ps2_usb/usbconfig.h new file mode 100644 index 0000000000..9038f1eb8c --- /dev/null +++ b/ps2_usb/usbconfig.h @@ -0,0 +1,378 @@ +/* Name: usbconfig.h + * Project: V-USB, virtual USB port for Atmel's(r) AVR(r) microcontrollers + * Author: Christian Starkjohann + * Creation Date: 2005-04-01 + * Tabsize: 4 + * Copyright: (c) 2005 by OBJECTIVE DEVELOPMENT Software GmbH + * License: GNU GPL v2 (see License.txt), GNU GPL v3 or proprietary (CommercialLicense.txt) + * This Revision: $Id: usbconfig-prototype.h 785 2010-05-30 17:57:07Z cs $ + */ + +#ifndef __usbconfig_h_included__ +#define __usbconfig_h_included__ + +#include "config_vusb.h" + +/* +General Description: +This file is an example configuration (with inline documentation) for the USB +driver. It configures V-USB for USB D+ connected to Port D bit 2 (which is +also hardware interrupt 0 on many devices) and USB D- to Port D bit 4. You may +wire the lines to any other port, as long as D+ is also wired to INT0 (or any +other hardware interrupt, as long as it is the highest level interrupt, see +section at the end of this file). +*/ + +/* ---------------------------- Hardware Config ---------------------------- */ + +#define USB_CFG_IOPORTNAME D +/* This is the port where the USB bus is connected. When you configure it to + * "B", the registers PORTB, PINB and DDRB will be used. + */ +#define USB_CFG_DMINUS_BIT 3 +/* This is the bit number in USB_CFG_IOPORT where the USB D- line is connected. + * This may be any bit in the port. + */ +#define USB_CFG_DPLUS_BIT 2 +/* This is the bit number in USB_CFG_IOPORT where the USB D+ line is connected. + * This may be any bit in the port. Please note that D+ must also be connected + * to interrupt pin INT0! [You can also use other interrupts, see section + * "Optional MCU Description" below, or you can connect D- to the interrupt, as + * it is required if you use the USB_COUNT_SOF feature. If you use D- for the + * interrupt, the USB interrupt will also be triggered at Start-Of-Frame + * markers every millisecond.] + */ +#define USB_CFG_CLOCK_KHZ (F_CPU/1000) +/* Clock rate of the AVR in kHz. Legal values are 12000, 12800, 15000, 16000, + * 16500, 18000 and 20000. The 12.8 MHz and 16.5 MHz versions of the code + * require no crystal, they tolerate +/- 1% deviation from the nominal + * frequency. All other rates require a precision of 2000 ppm and thus a + * crystal! + * Since F_CPU should be defined to your actual clock rate anyway, you should + * not need to modify this setting. + */ +#define USB_CFG_CHECK_CRC 0 +/* Define this to 1 if you want that the driver checks integrity of incoming + * data packets (CRC checks). CRC checks cost quite a bit of code size and are + * currently only available for 18 MHz crystal clock. You must choose + * USB_CFG_CLOCK_KHZ = 18000 if you enable this option. + */ + +/* ----------------------- Optional Hardware Config ------------------------ */ + +/* #define USB_CFG_PULLUP_IOPORTNAME D */ +/* If you connect the 1.5k pullup resistor from D- to a port pin instead of + * V+, you can connect and disconnect the device from firmware by calling + * the macros usbDeviceConnect() and usbDeviceDisconnect() (see usbdrv.h). + * This constant defines the port on which the pullup resistor is connected. + */ +/* #define USB_CFG_PULLUP_BIT 4 */ +/* This constant defines the bit number in USB_CFG_PULLUP_IOPORT (defined + * above) where the 1.5k pullup resistor is connected. See description + * above for details. + */ + +/* --------------------------- Functional Range ---------------------------- */ + +#define USB_CFG_HAVE_INTRIN_ENDPOINT 1 +/* Define this to 1 if you want to compile a version with two endpoints: The + * default control endpoint 0 and an interrupt-in endpoint (any other endpoint + * number). + */ +#define USB_CFG_HAVE_INTRIN_ENDPOINT3 1 +/* Define this to 1 if you want to compile a version with three endpoints: The + * default control endpoint 0, an interrupt-in endpoint 3 (or the number + * configured below) and a catch-all default interrupt-in endpoint as above. + * You must also define USB_CFG_HAVE_INTRIN_ENDPOINT to 1 for this feature. + */ +#define USB_CFG_EP3_NUMBER 3 +/* If the so-called endpoint 3 is used, it can now be configured to any other + * endpoint number (except 0) with this macro. Default if undefined is 3. + */ +/* #define USB_INITIAL_DATATOKEN USBPID_DATA1 */ +/* The above macro defines the startup condition for data toggling on the + * interrupt/bulk endpoints 1 and 3. Defaults to USBPID_DATA1. + * Since the token is toggled BEFORE sending any data, the first packet is + * sent with the oposite value of this configuration! + */ +#define USB_CFG_IMPLEMENT_HALT 0 +/* Define this to 1 if you also want to implement the ENDPOINT_HALT feature + * for endpoint 1 (interrupt endpoint). Although you may not need this feature, + * it is required by the standard. We have made it a config option because it + * bloats the code considerably. + */ +#define USB_CFG_SUPPRESS_INTR_CODE 0 +/* Define this to 1 if you want to declare interrupt-in endpoints, but don't + * want to send any data over them. If this macro is defined to 1, functions + * usbSetInterrupt() and usbSetInterrupt3() are omitted. This is useful if + * you need the interrupt-in endpoints in order to comply to an interface + * (e.g. HID), but never want to send any data. This option saves a couple + * of bytes in flash memory and the transmit buffers in RAM. + */ +#define USB_CFG_INTR_POLL_INTERVAL 10 +/* If you compile a version with endpoint 1 (interrupt-in), this is the poll + * interval. The value is in milliseconds and must not be less than 10 ms for + * low speed devices. + */ +#define USB_CFG_IS_SELF_POWERED 0 +/* Define this to 1 if the device has its own power supply. Set it to 0 if the + * device is powered from the USB bus. + */ +#define USB_CFG_MAX_BUS_POWER 100 +/* Set this variable to the maximum USB bus power consumption of your device. + * The value is in milliamperes. [It will be divided by two since USB + * communicates power requirements in units of 2 mA.] + */ +#define USB_CFG_IMPLEMENT_FN_WRITE 1 +/* Set this to 1 if you want usbFunctionWrite() to be called for control-out + * transfers. Set it to 0 if you don't need it and want to save a couple of + * bytes. + */ +#define USB_CFG_IMPLEMENT_FN_READ 0 +/* Set this to 1 if you need to send control replies which are generated + * "on the fly" when usbFunctionRead() is called. If you only want to send + * data from a static buffer, set it to 0 and return the data from + * usbFunctionSetup(). This saves a couple of bytes. + */ +#define USB_CFG_IMPLEMENT_FN_WRITEOUT 0 +/* Define this to 1 if you want to use interrupt-out (or bulk out) endpoints. + * You must implement the function usbFunctionWriteOut() which receives all + * interrupt/bulk data sent to any endpoint other than 0. The endpoint number + * can be found in 'usbRxToken'. + */ +#define USB_CFG_HAVE_FLOWCONTROL 0 +/* Define this to 1 if you want flowcontrol over USB data. See the definition + * of the macros usbDisableAllRequests() and usbEnableAllRequests() in + * usbdrv.h. + */ +#define USB_CFG_DRIVER_FLASH_PAGE 0 +/* If the device has more than 64 kBytes of flash, define this to the 64 k page + * where the driver's constants (descriptors) are located. Or in other words: + * Define this to 1 for boot loaders on the ATMega128. + */ +#define USB_CFG_LONG_TRANSFERS 0 +/* Define this to 1 if you want to send/receive blocks of more than 254 bytes + * in a single control-in or control-out transfer. Note that the capability + * for long transfers increases the driver size. + */ +/* #define USB_RX_USER_HOOK(data, len) if(usbRxToken == (uchar)USBPID_SETUP) blinkLED(); */ +/* This macro is a hook if you want to do unconventional things. If it is + * defined, it's inserted at the beginning of received message processing. + * If you eat the received message and don't want default processing to + * proceed, do a return after doing your things. One possible application + * (besides debugging) is to flash a status LED on each packet. + */ +/* #define USB_RESET_HOOK(resetStarts) if(!resetStarts){hadUsbReset();} */ +/* This macro is a hook if you need to know when an USB RESET occurs. It has + * one parameter which distinguishes between the start of RESET state and its + * end. + */ +/* #define USB_SET_ADDRESS_HOOK() hadAddressAssigned(); */ +/* This macro (if defined) is executed when a USB SET_ADDRESS request was + * received. + */ +#define USB_COUNT_SOF 0 +/* define this macro to 1 if you need the global variable "usbSofCount" which + * counts SOF packets. This feature requires that the hardware interrupt is + * connected to D- instead of D+. + */ +/* #ifdef __ASSEMBLER__ + * macro myAssemblerMacro + * in YL, TCNT0 + * sts timer0Snapshot, YL + * endm + * #endif + * #define USB_SOF_HOOK myAssemblerMacro + * This macro (if defined)