Refactor makefiles

[z180-stamp.git] / avr / main.c

diff --git a/avr/main.c b/avr/main.c
index 1fba3cbfcea8031a6b16e034f800aa6f5b44eec4..6fd29a87d3d0b0acb2714edee598d99fbafaebd3 100644 (file)
--- a/avr/main.c
+++ b/avr/main.c
@@ -85,6 +85,7 @@ void print_reset_reason(void)
 ISR(INT5_vect)
 {
        Stat |= S_MSG_PENDING;
+       Stat |= S_IO_0X40;
 }
 
 ISR(INT6_vect)
@@ -110,7 +111,7 @@ void setup_avr(void)
                _BV(PRUSART3) | _BV(PRUSART2) | _BV(PRUSART1);
 
 
-       /* disable analog comparator */
+       /* Disable analog comparator */
        ACSR = _BV(ACD);
        /* Ports */
 
@@ -118,11 +119,8 @@ void setup_avr(void)
        CLKPR = _BV(CLKPCE);
        CLKPR = 0;
 
-       /* Timer */
-       PRR1 &= ~_BV(PRTIM4);
-       OCR4A = F_CPU / 1000 - 1;       /* Timer4: 1000Hz interval */
-       TCCR4B = (0b00<<WGM42)|(0b001<<CS40); /* Normal Mode, Prescaler 1 */
-       TIMSK4 = _BV(OCIE4A);           /* Enable Output Compare A interrupt */
+       /* System timer */
+       setup_timer();
 
        /* INT5, INT6: falling edge */
        EICRB = (EICRB & ~((0b11 << ISC50) | (0b11 << ISC60))) |
@@ -271,7 +269,7 @@ int main(void)
        setup_system_time();
        setup_fatfs();
 
-       printf_P(PSTR("\n" MCU_STRING "+Z8S180 Stamp Monitor - Version: " VERSION  " \n\n"));
+       printf_P(PSTR("\n" stringify(DEVICE_NAME) "+Z8S180 Stamp Monitor - Version: " VERSION  " \n\n"));
 
        setup_z180_serv();