5183ee71b76d81d2833a1febb4ed897e117e9a28

Followup on previous checkin, the board examples now use
"names" when possible.

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

diff --git a/examples/board_hd77480/Makefile b/examples/board_hd77480/Makefile
index 04a18d5fc794d7f11c34feedc3fa0bdf408bc8f5..a3ca9799cccae2f2da090f5b6738dda21c55739b 100644 (file)
--- a/examples/board_hd77480/Makefile
+++ b/examples/board_hd77480/Makefile
@@ -44,12 +44,13 @@ atmega48_charlcd.axf: atmega48_charlcd.c
 
 include ${simavr}/Makefile.common
 
+${board} : ${simavr}/simavr/libsimavr.a
 ${board} : ${OBJ}/ac_input.o
 ${board} : ${OBJ}/hd44780.o
 ${board} : ${OBJ}/hd44780_glut.o
 ${board} : ${OBJ}/${board}.o
        @echo LD $@
-       @gcc -MD ${CFLAGS}  ${LFLAGS} -o $@ $^ $(LDFLAGS) ${simavr}/simavr/libsimavr.a
+       @gcc -MD ${CFLAGS}  ${LFLAGS} -o $@ $^ $(LDFLAGS)
 
 clean:
        rm -rf obj *.hex *.a *.axf ${board} *.vcd .*.swo .*.swp .*.swm .*.swn

diff --git a/examples/board_ledramp/Makefile b/examples/board_ledramp/Makefile
index 0ee7d259f1509d70d161cdcf5a829fdddde30c8b..2274a2697b3687e7dfd4a12bebc1ee1ab5ba9ba2 100644 (file)
--- a/examples/board_ledramp/Makefile
+++ b/examples/board_ledramp/Makefile
@@ -42,10 +42,11 @@ all: obj ${firmware} ${board}
 
 include ${simavr}/Makefile.common
 
+${board} : ${simavr}/simavr/libsimavr.a
 ${board} : ${OBJ}/button.o
 ${board} : ${OBJ}/${board}.o
        @echo LD $@
-       @gcc -MD ${CFLAGS}  ${LFLAGS} -o $@ $^ $(LDFLAGS) ${simavr}/simavr/libsimavr.a
+       @gcc -MD ${CFLAGS}  ${LFLAGS} -o $@ $^ $(LDFLAGS)
 
 clean:
        rm -rf obj *.hex *.a *.axf ${board} *.vcd

diff --git a/examples/board_ledramp/ledramp.c b/examples/board_ledramp/ledramp.c
index 5167c66faa950eb545f91f088035b84b113cea89..e3d0b139930e6137f068b43f86729f0af90b660f 100644 (file)
--- a/examples/board_ledramp/ledramp.c
+++ b/examples/board_ledramp/ledramp.c
@@ -159,7 +159,7 @@ int main(int argc, char *argv[])
        avr_load_firmware(avr, &f);
 
        // initialize our 'peripheral'
-       button_init(avr, &button);
+       button_init(avr, &button, "button");
        // "connect" the output irw of the button to the port pin of the AVR
        avr_connect_irq(
                button.irq + IRQ_BUTTON_OUT,

diff --git a/examples/board_simduino/Makefile b/examples/board_simduino/Makefile
index a58576fdb3d5d00338c82ad7f1a754a4cd1446a6..3d5843b7ff8608a2e4930e4a2075207224fec4d6 100644 (file)
--- a/examples/board_simduino/Makefile
+++ b/examples/board_simduino/Makefile
@@ -42,11 +42,12 @@ all: obj ${firmware} ${board}
 
 include ${simavr}/Makefile.common
 
+${board} : ${simavr}/simavr/libsimavr.a
 ${board} : ${OBJ}/button.o
 ${board} : ${OBJ}/uart_udp.o
 ${board} : ${OBJ}/${board}.o
        @echo LD $@
-       @gcc -MD ${CFLAGS}  ${LFLAGS} -o $@ $^ $(LDFLAGS) ${simavr}/simavr/libsimavr.a
+       @gcc -MD ${CFLAGS}  ${LFLAGS} -o $@ $^ $(LDFLAGS)
 
 clean:
        rm -rf obj *.a *.axf ${board} *.vcd

diff --git a/examples/board_timer_64led/Makefile b/examples/board_timer_64led/Makefile
index 8acd495a590e2055965c8d456557e89414262182..cde8e4c10c2fe7bac6bcc96b9d656a58dcdc38fd 100644 (file)
--- a/examples/board_timer_64led/Makefile
+++ b/examples/board_timer_64led/Makefile
@@ -42,11 +42,12 @@ all: obj ${firmware} ${board}
 
 include ${simavr}/Makefile.common
 
+${board} : ${simavr}/simavr/libsimavr.a
 ${board} : ${OBJ}/button.o
 ${board} : ${OBJ}/hc595.o
 ${board} : ${OBJ}/${board}.o
        @echo LD $@
-       @gcc -MD ${CFLAGS}  ${LFLAGS} -o $@ $^ $(LDFLAGS) ${simavr}/simavr/libsimavr.a
+       @gcc -MD ${CFLAGS}  ${LFLAGS} -o $@ $^ $(LDFLAGS)
 
 clean:
        rm -rf obj *.hex *.a *.axf ${board} *.vcd

diff --git a/examples/board_timer_64led/timer_64led.c b/examples/board_timer_64led/timer_64led.c
index 567303ca6af6d0a8fdda8d02202ef0ad1b49f825..fe838f936da85def3a1ae893e34f4d143821adbe 100644 (file)
--- a/examples/board_timer_64led/timer_64led.c
+++ b/examples/board_timer_64led/timer_64led.c
@@ -229,17 +229,17 @@ int main(int argc, char *argv[])
        //
        // initialize our 'peripherals'
        //
-       hc595_init(&shifter);
+       hc595_init(avr, &shifter);
        
-       button_init(avr, &button[B_START]);
+       button_init(avr, &button[B_START], "button.start");
        avr_connect_irq(
                button[B_START].irq + IRQ_BUTTON_OUT,
                avr_io_getirq(avr, AVR_IOCTL_IOPORT_GETIRQ('C'), 0));
-       button_init(avr, &button[B_STOP]);
+       button_init(avr, &button[B_STOP], "button.stop");
        avr_connect_irq(
                button[B_STOP].irq + IRQ_BUTTON_OUT,
                avr_io_getirq(avr, AVR_IOCTL_IOPORT_GETIRQ('B'), 1));
-       button_init(avr, &button[B_RESET]);
+       button_init(avr, &button[B_RESET], "button.reset");
        avr_connect_irq(
                button[B_RESET].irq + IRQ_BUTTON_OUT,
                avr_io_getirq(avr, AVR_IOCTL_IOPORT_GETIRQ('B'), 0));