Refactor makefiles

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

diff --git a/avr/main.c b/avr/main.c
index 113b4f24310f2cea292503f9e274d7b6fbdba42a..6fd29a87d3d0b0acb2714edee598d99fbafaebd3 100644 (file)
--- a/avr/main.c
+++ b/avr/main.c
@@ -1,7 +1,7 @@
 /*
  * (C) Copyright 2014 Leo C. <erbl259-lmu@yahoo.de>
  *
- * SPDX-License-Identifier:    GPL-2.0+
+ * SPDX-License-Identifier:    GPL-2.0
  */
 
 
@@ -9,7 +9,6 @@
 #include <avr/interrupt.h>
 #include <avr/wdt.h>
 #include <stdlib.h>
-#include <stdio.h>
 
 #include "config.h"
 #include "ff.h"
@@ -25,6 +24,8 @@
 #include "time.h"
 #include "rtc.h"
 #include "debug.h"
+#include "cmd_fat.h"
+
 
 uint8_t mcusr __attribute__ ((section (".noinit")));
 
@@ -32,7 +33,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;
 
 }
@@ -66,15 +67,17 @@ void print_reset_reason(void)
        uint8_t r = mcusr & 0x1f;
        const FLASH char * const FLASH *p = rreasons;
 
-       printf_P(PSTR("### Reset reason(s): %s"), r ? "" : "none");
+       my_puts_P(PSTR("### Reset reason(s): "));
+       if (r == 0)
+               my_puts_P(PSTR("none"));
        for ( ; r; p++, r >>= 1) {
                if (r & 1) {
                        my_puts_P(*p);
                        if (r & ~1)
-                               printf_P(PSTR(", "));
+                               my_puts_P(PSTR(", "));
                }
        }
-       printf_P(PSTR(".\n"));
+       my_puts_P(PSTR(".\n"));
 }
 
 #endif
@@ -82,6 +85,7 @@ void print_reset_reason(void)
 ISR(INT5_vect)
 {
        Stat |= S_MSG_PENDING;
+       Stat |= S_IO_0X40;
 }
 
 ISR(INT6_vect)
@@ -107,7 +111,7 @@ void setup_avr(void)
                _BV(PRUSART3) | _BV(PRUSART2) | _BV(PRUSART1);
 
 
-       /* disable analog comparator */
+       /* Disable analog comparator */
        ACSR = _BV(ACD);
        /* Ports */
 
@@ -115,11 +119,8 @@ void setup_avr(void)
        CLKPR = _BV(CLKPCE);
        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 */
+       /* System timer */
+       setup_timer();
 
        /* INT5, INT6: falling edge */
        EICRB = (EICRB & ~((0b11 << ISC50) | (0b11 << ISC60))) |
@@ -147,16 +148,6 @@ void setup_system_time(void)
 }
 
 
-
-static void setup_fatfs(void)
-{
-       static FATFS FatFs0;
-       static FATFS FatFs1;
-
-       f_mount(&FatFs0, "0:", 0);
-       f_mount(&FatFs1, "1:", 0);
-}
-
 /*--------------------------------------------------------------------------*/
 
 /* Stored value of bootdelay, used by autoboot_command() */
@@ -224,7 +215,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;
 }
@@ -232,7 +223,7 @@ const char *bootdelay_process(void)
 static
 void autoboot_command(const char *s)
 {
-       debug("### main_loop: bootcmd=\"%s\"\n", s ? s : PSTR("<UNDEFINED>"));
+       debug("### main_loop: bootcmd=\"%s\"\n", s ? s : "");
        _delay_ms(20);
 
        if (stored_bootdelay != -1 && s && !abortboot(stored_bootdelay)) {
@@ -255,12 +246,13 @@ int main(void)
 {
        extern void setup_mmc(void);
 
+       __malloc_margin = CONFIG_SYS_MALLOC_MARGIN;
+       setup_avr();
        for (int i = 0; i < GPIO_MAX; i++)
                gpio_config(i, INPUT_PULLUP);
-       setup_avr();
        setup_mmc();
-       z80_setup_bus();
        env_init();
+       z80_setup_bus();
 
        if (reset_reason_is_power_on())
                _delay_ms(CONFIG_PWRON_DELAY);
@@ -277,7 +269,7 @@ int main(void)
        setup_system_time();
        setup_fatfs();
 
-       printf_P(PSTR("\n" MCU_STRING "+Z8S180 Stamp Monitor\n\n"));
+       printf_P(PSTR("\n" stringify(DEVICE_NAME) "+Z8S180 Stamp Monitor - Version: " VERSION  " \n\n"));
 
        setup_z180_serv();