summaryrefslogtreecommitdiff
path: root/digital/avr/modules/twi
diff options
context:
space:
mode:
authorNicolas Schodet2011-05-08 16:15:06 +0200
committerNicolas Schodet2011-05-08 16:15:06 +0200
commit0feb542a8cf7630a5d442387727414f5251aad83 (patch)
tree02092fbede27ef619ee63466f671513a889fb2ea /digital/avr/modules/twi
parent4cd9c4458eaa49c269171145f4bc2a184948eae1 (diff)
parentd385a9eacb2e8580239f101f96356f7ed216dd97 (diff)
Merge branch 'master' into efrei-robotique
Conflicts: digital/mimot/src/dirty/counter_ext.avr.c digital/mimot/tools/mimot/init.py
Diffstat (limited to 'digital/avr/modules/twi')
-rw-r--r--digital/avr/modules/twi/twi_hard.avr.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/digital/avr/modules/twi/twi_hard.avr.c b/digital/avr/modules/twi/twi_hard.avr.c
index ff65d31e..8bd18d34 100644
--- a/digital/avr/modules/twi/twi_hard.avr.c
+++ b/digital/avr/modules/twi/twi_hard.avr.c
@@ -56,6 +56,10 @@
# if defined (__AVR_ATmega32__)
# elif defined (__AVR_ATmega64__)
# elif defined (__AVR_ATmega128__)
+# elif defined (__AVR_AT90USB646__)
+# elif defined (__AVR_AT90USB647__)
+# elif defined (__AVR_AT90USB1286__)
+# elif defined (__AVR_AT90USB1287__)
# else
# error "twi: not tested on this chip"
# endif
@@ -201,7 +205,7 @@ twi_master_wait (void)
# endif /* AC_TWI_MASTER_ENABLE */
-SIGNAL (SIG_2WIRE_SERIAL)
+SIGNAL (TWI_vect)
{
# if AC_TWI_SLAVE_ENABLE
/** Slave work buffer. */