0c791f0926afb12bdbfd7623b5058f8dd3e07167

The ATmega128RFA1 and ATmega128RFR2 don't actually have Port A and Port
C as IO pins.

diff --git a/simavr/cores/sim_mega128rfa1.c b/simavr/cores/sim_mega128rfa1.c
index b25795a4cd6de688da591f89b3fe0ffc123678d8..69046892ff4ea5545e15568705fc01b13383b8b4 100644 (file)
--- a/simavr/cores/sim_mega128rfa1.c
+++ b/simavr/cores/sim_mega128rfa1.c
@@ -50,7 +50,7 @@ const struct mcu_t {
        avr_flash_t     selfprog;
        avr_watchdog_t  watchdog;
        avr_extint_t    extint;
-       avr_ioport_t    porta, portb, portc, portd, porte, portf, portg;
+       avr_ioport_t    portb, portd, porte, portf, portg;
        avr_uart_t              uart0,uart1;
        avr_adc_t               adc;
        avr_timer_t             timer0,timer1,timer2,timer3;
@@ -79,9 +79,6 @@ const struct mcu_t {
                AVR_EXTINT_MEGA_DECLARE(6, 'E', PE6, B),
                AVR_EXTINT_MEGA_DECLARE(7, 'E', PE7, B),
        },
-       .porta = {
-               .name = 'A', .r_port = PORTA, .r_ddr = DDRA, .r_pin = PINA,
-       },
        .portb = {
                .name = 'B', .r_port = PORTB, .r_ddr = DDRB, .r_pin = PINB,
                .pcint = {
@@ -91,9 +88,6 @@ const struct mcu_t {
                },
                .r_pcint = PCMSK0,
        },
-       .portc = {
-               .name = 'C', .r_port = PORTC, .r_ddr = DDRC, .r_pin = PINC,
-       },
        .portd = {
                .name = 'D', .r_port = PORTD, .r_ddr = DDRD, .r_pin = PIND,
        },
@@ -532,9 +526,7 @@ void m128rfa1_init(struct avr_t * avr)
        avr_flash_init(avr, &mcu->selfprog);
        avr_extint_init(avr, &mcu->extint);
        avr_watchdog_init(avr, &mcu->watchdog);
-       avr_ioport_init(avr, &mcu->porta);
        avr_ioport_init(avr, &mcu->portb);
-       avr_ioport_init(avr, &mcu->portc);
        avr_ioport_init(avr, &mcu->portd);
        avr_ioport_init(avr, &mcu->porte);
        avr_ioport_init(avr, &mcu->portf);

diff --git a/simavr/cores/sim_mega128rfr2.c b/simavr/cores/sim_mega128rfr2.c
index 0fbfe42e2c7eb337722cfb0fdcccad686b2a6498..63d5832cfa4b915fbee89d260fdaa744d2f09d7d 100644 (file)
--- a/simavr/cores/sim_mega128rfr2.c
+++ b/simavr/cores/sim_mega128rfr2.c
@@ -50,7 +50,7 @@ const struct mcu_t {
        avr_flash_t     selfprog;
        avr_watchdog_t  watchdog;
        avr_extint_t    extint;
-       avr_ioport_t    porta, portb, portc, portd, porte, portf, portg;
+       avr_ioport_t    portb, portd, porte, portf, portg;
        avr_uart_t              uart0,uart1;
        avr_adc_t               adc;
        avr_timer_t             timer0,timer1,timer2,timer3;
@@ -79,9 +79,6 @@ const struct mcu_t {
                AVR_EXTINT_MEGA_DECLARE(6, 'E', PE6, B),
                AVR_EXTINT_MEGA_DECLARE(7, 'E', PE7, B),
        },
-       .porta = {
-               .name = 'A', .r_port = PORTA, .r_ddr = DDRA, .r_pin = PINA,
-       },
        .portb = {
                .name = 'B', .r_port = PORTB, .r_ddr = DDRB, .r_pin = PINB,
                .pcint = {
@@ -91,9 +88,6 @@ const struct mcu_t {
                },
                .r_pcint = PCMSK0,
        },
-       .portc = {
-               .name = 'C', .r_port = PORTC, .r_ddr = DDRC, .r_pin = PINC,
-       },
        .portd = {
                .name = 'D', .r_port = PORTD, .r_ddr = DDRD, .r_pin = PIND,
        },
@@ -532,9 +526,7 @@ void m128rfr2_init(struct avr_t * avr)
        avr_flash_init(avr, &mcu->selfprog);
        avr_extint_init(avr, &mcu->extint);
        avr_watchdog_init(avr, &mcu->watchdog);
-       avr_ioport_init(avr, &mcu->porta);
        avr_ioport_init(avr, &mcu->portb);
-       avr_ioport_init(avr, &mcu->portc);
        avr_ioport_init(avr, &mcu->portd);
        avr_ioport_init(avr, &mcu->porte);
        avr_ioport_init(avr, &mcu->portf);