85b82a19d9cd53f7eea9b8b58852f550e53b16fb

... and use them on the Mega128 core

Signed-off-by: Michel Pollet <buserror@gmail.com>

diff --git a/simavr/cores/sim_mega128.c b/simavr/cores/sim_mega128.c
index 7c53d3666793e014cfa4d679d2cbdfa408e2ade2..90765f0ec6eeee3561354eaf10e02cf200c086af 100644 (file)
--- a/simavr/cores/sim_mega128.c
+++ b/simavr/cores/sim_mega128.c
@@ -69,9 +69,14 @@ struct mcu_t {
        AVR_SELFPROG_DECLARE(SPMCSR, SPMEN, SPM_READY_vect),
        AVR_WATCHDOG_DECLARE_128(WDTCR, _VECTOR(0)),
        .extint = {
-               AVR_EXTINT_DECLARE(0, 'D', PD2),
-               AVR_EXTINT_DECLARE(1, 'D', PD3),
-               AVR_EXTINT_DECLARE(2, 'B', PB3),
+               AVR_EXTINT_DECLARE(0, 'D', PD0),
+               AVR_EXTINT_DECLARE(1, 'D', PD1),
+               AVR_EXTINT_DECLARE(2, 'D', PD2),
+               AVR_EXTINT_DECLARE(3, 'D', PD3),
+               AVR_EXTINT_DECLARE(4, 'E', PE4),
+               AVR_EXTINT_DECLARE(5, 'E', PE5),
+               AVR_EXTINT_DECLARE(6, 'E', PE6),
+               AVR_EXTINT_DECLARE(7, 'E', PE7),
        },
        .porta = {  // no PCINTs in atmega128
                .name = 'A', .r_port = PORTA, .r_ddr = DDRA, .r_pin = PINA,
@@ -403,7 +408,7 @@ static avr_t * make()
 }
 
 avr_kind_t mega128 = {
-        .names = { "mega128", "mega128L" },
+        .names = { "atmega128", "atmega128L" },
         .make = make
 };
 

diff --git a/simavr/sim/avr_extint.h b/simavr/sim/avr_extint.h
index 8b0f1bafcb1d62110c302bcf1918cae01689d64d..c44e1e72c7eea2a3de10a8584c2e47152f587ad6 100644 (file)
--- a/simavr/sim/avr_extint.h
+++ b/simavr/sim/avr_extint.h
@@ -30,6 +30,8 @@
 enum {
        EXTINT_IRQ_OUT_INT0 = 0,
        EXTINT_IRQ_OUT_INT1, EXTINT_IRQ_OUT_INT2, EXTINT_IRQ_OUT_INT3,
+       EXTINT_IRQ_OUT_INT4, EXTINT_IRQ_OUT_INT5, EXTINT_IRQ_OUT_INT6,
+       EXTINT_IRQ_OUT_INT7,
        EXTINT_COUNT
 };