DDTZ: remove some unused labels

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

diff --git a/avr/main.c b/avr/main.c
index 2199454fa0bd9654ea83804c2ebf051594a59d4b..86dcc50caa6c506476e333ed06434c5bb1509552 100644 (file)
--- a/avr/main.c
+++ b/avr/main.c
@@ -31,7 +31,7 @@ uint8_t mcusr __attribute__ ((section (".noinit")));
 __attribute__ ((naked)) __attribute__ ((section (".init3")))
 void preset_ram (void)
 {
-       for (uint8_t *p = RAMSTART; p <= (uint8_t *) RAMEND; p++)
+       for (uint8_t *p = (uint8_t *) RAMSTART; p <= (uint8_t *) RAMEND; p++)
                *p = 0xdd;
 
 }
@@ -115,10 +115,10 @@ void setup_avr(void)
        CLKPR = 0;
 
        /* Timer */
-       PRR1 &= ~_BV(PRTIM3);
-       OCR3A = F_CPU / 1000 - 1;       /* Timer3: 1000Hz interval (OC3A) */
-       TCCR3B = (0b01<<WGM32)|(0b001<<CS30); /* CTC Mode, Prescaler 1 */
-       TIMSK3 = _BV(OCIE3A);           /* Enable TC2.oca interrupt */
+       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 */
 
        /* INT5, INT6: falling edge */
        EICRB = (EICRB & ~((0b11 << ISC50) | (0b11 << ISC60))) |
@@ -223,7 +223,7 @@ const char *bootdelay_process(void)
        debug("### main_loop entered: bootdelay=%d\n\n", bootdelay);
        _delay_ms(20);
 
-       s = getenv_char(PSTR(ENV_BOOTCMD));
+       s = getenv_str(PSTR(ENV_BOOTCMD));
        stored_bootdelay = bootdelay;
        return s;
 }
@@ -276,7 +276,7 @@ int main(void)
        setup_system_time();
        setup_fatfs();
 
-       printf_P(PSTR("\n" MCU_STRING "+Z8S180 Stamp Monitor\n\n"));
+       printf_P(PSTR("\n" MCU_STRING "+Z8S180 Stamp Monitor - Version: " VERSION  " \n\n"));
 
        setup_z180_serv();