4bcb2928292b02f41ce989b113bd97d8c0b5d861

convert port sructure declarations to macro AVR_IOPORT_DECLARE.

	modified:   simavr/cores/sim_90usb162.c
	modified:   simavr/cores/sim_mega128.c
	modified:   simavr/cores/sim_mega1280.c
	modified:   simavr/cores/sim_mega1281.c
	modified:   simavr/cores/sim_mega128rfa1.c
	modified:   simavr/cores/sim_mega128rfr2.c
	modified:   simavr/cores/sim_mega169.c
	modified:   simavr/cores/sim_mega2560.c
	modified:   simavr/cores/sim_megax.h
	modified:   simavr/cores/sim_tiny2313.c
	modified:   simavr/sim/avr_ioport.h

diff --git a/simavr/cores/sim_90usb162.c b/simavr/cores/sim_90usb162.c
index 3cdc647d36a4c88a61c54fb2a83ab4fd35d65c9b..4755b025f68fe750b9e96e8a9d5baef9b3b1893f 100644 (file)
--- a/simavr/cores/sim_90usb162.c
+++ b/simavr/cores/sim_90usb162.c
@@ -89,9 +89,7 @@ const struct mcu_t {
                },
                .r_pcint = PCMSK1,
        },
-       .portd = {
-               .name = 'D', .r_port = PORTD, .r_ddr = DDRD, .r_pin = PIND,
-       },
+       AVR_IOPORT_DECLARE(d, 'D', D),
 
        .uart1 = {
                .disabled = AVR_IO_REGBIT(PRR1,PRUSART1),

diff --git a/simavr/cores/sim_mega128.c b/simavr/cores/sim_mega128.c
index 355b94101a4c7d5dac8b3a4fc62f113939726ec4..3dddc8ebff01481738901f60365570109852dfa8 100644 (file)
--- a/simavr/cores/sim_mega128.c
+++ b/simavr/cores/sim_mega128.c
@@ -77,27 +77,13 @@ const struct mcu_t {
                AVR_EXTINT_MEGA_DECLARE(6, 'E', PE6, B),
                AVR_EXTINT_MEGA_DECLARE(7, 'E', PE7, B),
        },
-       .porta = {  // no PCINTs in atmega128
-               .name = 'A', .r_port = PORTA, .r_ddr = DDRA, .r_pin = PINA,
-       },
-       .portb = {
-               .name = 'B', .r_port = PORTB, .r_ddr = DDRB, .r_pin = PINB,
-       },
-       .portc = {
-               .name = 'C', .r_port = PORTC, .r_ddr = DDRC, .r_pin = PINC,
-       },
-       .portd = {
-               .name = 'D', .r_port = PORTD, .r_ddr = DDRD, .r_pin = PIND,
-       },
-       .porte = {
-               .name = 'E', .r_port = PORTE, .r_ddr = DDRE, .r_pin = PINE,
-       },
-       .portf = {
-               .name = 'F', .r_port = PORTF, .r_ddr = DDRF, .r_pin = PINF,
-       },
-       .portg = {
-               .name = 'G', .r_port = PORTG, .r_ddr = DDRG, .r_pin = PING,
-       },
+       AVR_IOPORT_DECLARE(a, 'A', A), // no PCINTs in atmega128
+       AVR_IOPORT_DECLARE(b, 'B', B),
+       AVR_IOPORT_DECLARE(c, 'C', C),
+       AVR_IOPORT_DECLARE(d, 'D', D),
+       AVR_IOPORT_DECLARE(e, 'E', E),
+       AVR_IOPORT_DECLARE(f, 'F', F),
+       AVR_IOPORT_DECLARE(g, 'G', G),
 
        .uart0 = {
           // no PRUSART .disabled = AVR_IO_REGBIT(PRR,PRUSART0),

diff --git a/simavr/cores/sim_mega1280.c b/simavr/cores/sim_mega1280.c
index 9ed040c310608f627dc1055be4da49b628fb0cd5..b1a0ef0542a41f547f519262fc687a4ed4551f7f 100644 (file)
--- a/simavr/cores/sim_mega1280.c
+++ b/simavr/cores/sim_mega1280.c
@@ -81,9 +81,7 @@ 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,
-       },
+       AVR_IOPORT_DECLARE(a, 'A', A),
        .portb = {
                .name = 'B', .r_port = PORTB, .r_ddr = DDRB, .r_pin = PINB,
                .pcint = {
@@ -93,35 +91,15 @@ 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,
-       },
-       .porte = {
-               .name = 'E', .r_port = PORTE, .r_ddr = DDRE, .r_pin = PINE,
-       },
-       .portf = {
-               .name = 'F', .r_port = PORTF, .r_ddr = DDRF, .r_pin = PINF,
-       },
-       .portg = {
-               .name = 'G', .r_port = PORTG, .r_ddr = DDRG, .r_pin = PING,
-       },
-
-       .porth = {
-               .name = 'H', .r_port = PORTH, .r_ddr = DDRH, .r_pin = PINH,
-       },
-       .portj = {
-               .name = 'J', .r_port = PORTJ, .r_ddr = DDRJ, .r_pin = PINJ,
-       },
-       .portk = {
-               .name = 'K', .r_port = PORTK, .r_ddr = DDRK, .r_pin = PINK,
-       },
-       .portl = {
-               .name = 'L', .r_port = PORTL, .r_ddr = DDRL, .r_pin = PINL,
-       },
-
+       AVR_IOPORT_DECLARE(c, 'C', C),
+       AVR_IOPORT_DECLARE(d, 'D', D),
+       AVR_IOPORT_DECLARE(e, 'E', E),
+       AVR_IOPORT_DECLARE(f, 'F', F),
+       AVR_IOPORT_DECLARE(g, 'G', G),
+       AVR_IOPORT_DECLARE(h, 'H', H),
+       AVR_IOPORT_DECLARE(j, 'J', J),
+       AVR_IOPORT_DECLARE(k, 'K', K),
+       AVR_IOPORT_DECLARE(l, 'L', L),
        .uart0 = {
                .disabled = AVR_IO_REGBIT(PRR0,PRUSART0),
                .name = '0',

diff --git a/simavr/cores/sim_mega1281.c b/simavr/cores/sim_mega1281.c
index a8a80bb411f4de34c6f301d6ef45b5dde5908d7b..64505ae97ce5d5bc5f39dea4c4b06f9898ed93f9 100644 (file)
--- a/simavr/cores/sim_mega1281.c
+++ b/simavr/cores/sim_mega1281.c
@@ -77,9 +77,7 @@ 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,
-       },
+       AVR_IOPORT_DECLARE(a, 'A', A),
        .portb = {
                .name = 'B', .r_port = PORTB, .r_ddr = DDRB, .r_pin = PINB,
                .pcint = {
@@ -89,22 +87,11 @@ 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,
-       },
-       .porte = {
-               .name = 'E', .r_port = PORTE, .r_ddr = DDRE, .r_pin = PINE,
-       },
-       .portf = {
-               .name = 'F', .r_port = PORTF, .r_ddr = DDRF, .r_pin = PINF,
-       },
-       .portg = {
-               .name = 'G', .r_port = PORTG, .r_ddr = DDRG, .r_pin = PING,
-       },
-
+       AVR_IOPORT_DECLARE(c, 'C', C),
+       AVR_IOPORT_DECLARE(d, 'D', D),
+       AVR_IOPORT_DECLARE(e, 'E', E),
+       AVR_IOPORT_DECLARE(f, 'F', F),
+       AVR_IOPORT_DECLARE(g, 'G', G),
        .uart0 = {
                .disabled = AVR_IO_REGBIT(PRR0,PRUSART0),
                .name = '0',

diff --git a/simavr/cores/sim_mega128rfa1.c b/simavr/cores/sim_mega128rfa1.c
index 3a14079f5c071fd1155463312afef3e58f0b9039..5619380238939f63128655c9d6124a710593b0e9 100644 (file)
--- a/simavr/cores/sim_mega128rfa1.c
+++ b/simavr/cores/sim_mega128rfa1.c
@@ -88,9 +88,7 @@ const struct mcu_t {
                },
                .r_pcint = PCMSK0,
        },
-       .portd = {
-               .name = 'D', .r_port = PORTD, .r_ddr = DDRD, .r_pin = PIND,
-       },
+       AVR_IOPORT_DECLARE(d, 'D', D),
        .porte = {
                .name = 'E', .r_port = PORTE, .r_ddr = DDRE, .r_pin = PINE,
                .pcint = {
@@ -100,12 +98,8 @@ const struct mcu_t {
                },
                .r_pcint = PCMSK1,
        },
-       .portf = {
-               .name = 'F', .r_port = PORTF, .r_ddr = DDRF, .r_pin = PINF,
-       },
-       .portg = {
-               .name = 'G', .r_port = PORTG, .r_ddr = DDRG, .r_pin = PING,
-       },
+       AVR_IOPORT_DECLARE(f, 'F', F),
+       AVR_IOPORT_DECLARE(g, 'G', G),
 
        .uart0 = {
                .disabled = AVR_IO_REGBIT(PRR0,PRUSART0),

diff --git a/simavr/cores/sim_mega128rfr2.c b/simavr/cores/sim_mega128rfr2.c
index 2b0aab2265ccfdc35b80378b5efdf4fdf5faae18..222832325e3f2f0d8b94487cfdfb02217ee9fbb7 100644 (file)
--- a/simavr/cores/sim_mega128rfr2.c
+++ b/simavr/cores/sim_mega128rfr2.c
@@ -114,9 +114,7 @@ const struct mcu_t {
                },
                .r_pcint = PCMSK0,
        },
-       .portd = {
-               .name = 'D', .r_port = PORTD, .r_ddr = DDRD, .r_pin = PIND,
-       },
+       AVR_IOPORT_DECLARE(d, 'D', D),
        .porte = {
                .name = 'E', .r_port = PORTE, .r_ddr = DDRE, .r_pin = PINE,
                .pcint = {
@@ -126,12 +124,8 @@ const struct mcu_t {
                },
                .r_pcint = PCMSK1,
        },
-       .portf = {
-               .name = 'F', .r_port = PORTF, .r_ddr = DDRF, .r_pin = PINF,
-       },
-       .portg = {
-               .name = 'G', .r_port = PORTG, .r_ddr = DDRG, .r_pin = PING,
-       },
+       AVR_IOPORT_DECLARE(f, 'F', F),
+       AVR_IOPORT_DECLARE(g, 'G', G),
 
        .uart0 = {
                .disabled = AVR_IO_REGBIT(PRR0,PRUSART0),

diff --git a/simavr/cores/sim_mega169.c b/simavr/cores/sim_mega169.c
index 93cb72b08820d6f355194af1bea817a61914e79b..e79e3c7c00b1b4990791537faa67654c22fa85d4 100644 (file)
--- a/simavr/cores/sim_mega169.c
+++ b/simavr/cores/sim_mega169.c
@@ -55,9 +55,7 @@ const struct mcu_t {
        .extint = {
                AVR_EXTINT_DECLARE(0, 'D', PD1),
        },
-       .porta = {
-               .name = 'A', .r_port = PORTA, .r_ddr = DDRA, .r_pin = PINA,
-       },
+       AVR_IOPORT_DECLARE(a, 'A', A),
        .portb = {
                .name = 'B', .r_port = PORTB, .r_ddr = DDRB, .r_pin = PINB,  .r_pcint = PCMSK1,
                .pcint = {
@@ -66,12 +64,8 @@ const struct mcu_t {
                        .vector = PCINT1_vect,
                },
        },
-       .portc = {
-               .name = 'C', .r_port = PORTC, .r_ddr = DDRC, .r_pin = PINC,
-       },
-       .portd = {
-               .name = 'D', .r_port = PORTD, .r_ddr = DDRD, .r_pin = PIND,
-       },
+       AVR_IOPORT_DECLARE(c, 'C', C),
+       AVR_IOPORT_DECLARE(d, 'D', D),
        .porte = {
                .name = 'E', .r_port = PORTE, .r_ddr = DDRE, .r_pin = PINE, .r_pcint = PCMSK0,
                .pcint = {
@@ -80,12 +74,8 @@ const struct mcu_t {
                        .vector = PCINT0_vect,
                },
        },
-       .portf = {
-               .name = 'F', .r_port = PORTF, .r_ddr = DDRF, .r_pin = PINF,
-       },
-       .portg = {
-               .name = 'G', .r_port = PORTG, .r_ddr = DDRG, .r_pin = PING,
-       },
+       AVR_IOPORT_DECLARE(f, 'F', F),
+       AVR_IOPORT_DECLARE(g, 'G', G),
 
        .uart0 = {
                .name = '0',

diff --git a/simavr/cores/sim_mega2560.c b/simavr/cores/sim_mega2560.c
index 4455bfe522ceca2fac4755e4c45544e06cb38aef..7dca72605f19f3cd7e096ad0b60880ab38c2fdea 100644 (file)
--- a/simavr/cores/sim_mega2560.c
+++ b/simavr/cores/sim_mega2560.c
@@ -83,9 +83,7 @@ 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,
-       },
+       AVR_IOPORT_DECLARE(a, 'A', A),
        .portb = {
                .name = 'B', .r_port = PORTB, .r_ddr = DDRB, .r_pin = PINB,
                .pcint = {
@@ -95,35 +93,15 @@ 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,
-       },
-       .porte = {
-               .name = 'E', .r_port = PORTE, .r_ddr = DDRE, .r_pin = PINE,
-       },
-       .portf = {
-               .name = 'F', .r_port = PORTF, .r_ddr = DDRF, .r_pin = PINF,
-       },
-       .portg = {
-               .name = 'G', .r_port = PORTG, .r_ddr = DDRG, .r_pin = PING,
-       },
-
-       .porth = {
-               .name = 'H', .r_port = PORTH, .r_ddr = DDRH, .r_pin = PINH,
-       },
-       .portj = {
-               .name = 'J', .r_port = PORTJ, .r_ddr = DDRJ, .r_pin = PINJ,
-       },
-       .portk = {
-               .name = 'K', .r_port = PORTK, .r_ddr = DDRK, .r_pin = PINK,
-       },
-       .portl = {
-               .name = 'L', .r_port = PORTL, .r_ddr = DDRL, .r_pin = PINL,
-       },
-
+       AVR_IOPORT_DECLARE(c, 'C', C),
+       AVR_IOPORT_DECLARE(d, 'D', D),
+       AVR_IOPORT_DECLARE(e, 'E', E),
+       AVR_IOPORT_DECLARE(f, 'F', F),
+       AVR_IOPORT_DECLARE(g, 'G', G),
+       AVR_IOPORT_DECLARE(h, 'H', H),
+       AVR_IOPORT_DECLARE(j, 'J', J),
+       AVR_IOPORT_DECLARE(k, 'K', K),
+       AVR_IOPORT_DECLARE(l, 'L', L),
        .uart0 = {
                .disabled = AVR_IO_REGBIT(PRR0,PRUSART0),
                .name = '0',

diff --git a/simavr/cores/sim_megax.h b/simavr/cores/sim_megax.h
index 7d4379dd19da034b4160f31988fa2f5588155799..0283c201959f7be87b4e9d0ec7c37f395711aa94 100644 (file)
--- a/simavr/cores/sim_megax.h
+++ b/simavr/cores/sim_megax.h
@@ -90,19 +90,11 @@ const struct mcu_t SIM_CORENAME = {
                AVR_EXTINT_DECLARE(1, 'D', PD3),
        },
 #ifdef PORTA
-       .porta = {
-               .name = 'A', .r_port = PORTA, .r_ddr = DDRA, .r_pin = PINA,
-       },
+       AVR_IOPORT_DECLARE(a, 'A', A),
 #endif
-       .portb = {
-               .name = 'B', .r_port = PORTB, .r_ddr = DDRB, .r_pin = PINB,
-       },
-       .portc = {
-               .name = 'C', .r_port = PORTC, .r_ddr = DDRC, .r_pin = PINC,
-       },
-       .portd = {
-               .name = 'D', .r_port = PORTD, .r_ddr = DDRD, .r_pin = PIND,
-       },
+       AVR_IOPORT_DECLARE(b, 'B', B),
+       AVR_IOPORT_DECLARE(c, 'C', C),
+       AVR_IOPORT_DECLARE(d, 'D', D),
        .uart = {
           // no PRUSART .disabled = AVR_IO_REGBIT(PRR,PRUSART0),
                .name = '0',

diff --git a/simavr/cores/sim_tiny2313.c b/simavr/cores/sim_tiny2313.c
index 54d2a46f2d07d1031a5ffd6491ce5dd1d5591e16..159612e2f6cd1c8755ad0ee43168513279ab6a16 100644 (file)
--- a/simavr/cores/sim_tiny2313.c
+++ b/simavr/cores/sim_tiny2313.c
@@ -59,9 +59,7 @@ static const struct mcu_t {
                AVR_EXTINT_TINY_DECLARE(0, 'D', 2, EIFR),
                AVR_EXTINT_TINY_DECLARE(1, 'D', 3, EIFR),
        },
-       .porta = {      // port A has no PCInts..
-               .name = 'A', .r_port = PORTA, .r_ddr = DDRA, .r_pin = PINA,
-       },
+       AVR_IOPORT_DECLARE(a, 'A', A), // port A has no PCInts..
        .portb = {
                .name = 'B',  .r_port = PORTB, .r_ddr = DDRB, .r_pin = PINB,
                .pcint = {
@@ -71,9 +69,7 @@ static const struct mcu_t {
                },
                .r_pcint = PCMSK,
        },
-       .portd = {      // port D has no PCInts..
-               .name = 'D', .r_port = PORTD, .r_ddr = DDRD, .r_pin = PIND,
-       },
+       AVR_IOPORT_DECLARE(d, 'D', D), // port D has no PCInts..
        .uart = {
                // no PRR register on the 2313
                //.disabled = AVR_IO_REGBIT(PRR,PRUSART0),

diff --git a/simavr/sim/avr_ioport.h b/simavr/sim/avr_ioport.h
index 21b0693069dc1355e1b1e68e6fdb51be4252f866..5734df86f40c06ed6b7000c3f2877862743fc155 100644 (file)
--- a/simavr/sim/avr_ioport.h
+++ b/simavr/sim/avr_ioport.h
@@ -118,6 +118,10 @@ typedef struct avr_ioport_t {
 
 void avr_ioport_init(avr_t * avr, avr_ioport_t * port);
 
+#define AVR_IOPORT_DECLARE(_lname, _cname, _uname) \
+       .port ## _lname = { \
+               .name = _cname, .r_port = PORT ## _uname, .r_ddr = DDR ## _uname, .r_pin = PIN ## _uname, \
+       }
 
 #ifdef __cplusplus
 };