Merge branch 'rn42' into merge_rn42

Conflicts: .gitignore common.mk common/debug_config.h common/print.h
2014-11-24 13:50:33 +09:00
parent eb90ed6238 60096e11c7
commit 363950982a
92 changed files with 4461 additions and 401 deletions
--- a/protocol.mk
+++ b/protocol.mk
@@ -9,6 +9,7 @@ endif

 ifdef PS2_USE_BUSYWAIT
    SRC += protocol/ps2_busywait.c
+    SRC += protocol/ps2_io_avr.c
    OPT_DEFS += -DPS2_USE_BUSYWAIT
 endif