Merge branch 'master' into cmdline_edit

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

diff --git a/avr/main.c b/avr/main.c
index 2f9a62f284094ac87e76d74db8dda13c0891f508..3852e754a5ba59477cf813421ebfcc36fea0f3c2 100644 (file)
--- a/avr/main.c
+++ b/avr/main.c
@@ -1,15 +1,18 @@
 /*
+ * (C) Copyright 2014 Leo C. <erbl259-lmu@yahoo.de>
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 
 #include "common.h"
-
 #include <avr/interrupt.h>
+#include <avr/wdt.h>
 #include <stdlib.h>
 #include <stdio.h>
 
 #include "config.h"
-#include "debug.h"
+#include "ff.h"
 #include "z80-if.h"
 #include "i2c.h"
 #include "con-utils.h"
@@ -18,12 +21,14 @@
 #include "cli.h"
 #include "env.h"
 #include "z180-serv.h"
+#include "gpio.h"
+#include "time.h"
+#include "rtc.h"
+#include "debug.h"
 
-static uint8_t mcusr;
+uint8_t mcusr __attribute__ ((section (".noinit")));
 
-/*--------------------------------------------------------------------------*/
 #if DEBUG
-
 __attribute__ ((naked)) __attribute__ ((section (".init3")))
 void preset_ram (void)
 {
@@ -31,6 +36,21 @@ void preset_ram (void)
                *p = 0xdd;
 
 }
+#endif
+
+__attribute__ ((naked)) __attribute__ ((section (".init3")))
+void get_mcusr (void)
+{
+       /* save and clear reset reason(s) */
+       /* TODO: move to init section? */
+       mcusr = MCUSR;
+       MCUSR = 0;
+
+       wdt_disable();
+}
+
+/*--------------------------------------------------------------------------*/
+#if DEBUG
 
 static const FLASH char * const FLASH rreasons[] = {
                        FSTR("Power on"),
@@ -72,13 +92,6 @@ ISR(INT6_vect)
 static
 void setup_avr(void)
 {
-       /* save and clear reset reason(s) */
-       /* TODO: move to init section? */
-       mcusr = MCUSR;
-       MCUSR = 0;
-
-       /* WD */
-
        /* CPU */
 
        /* Disable JTAG Interface regardless of the JTAGEN fuse setting. */
@@ -109,7 +122,7 @@ void setup_avr(void)
        TIMSK3 = _BV(OCIE3A);           /* Enable TC2.oca interrupt */
 
        /* INT5, INT6: falling edge */
-       EICRB = (EICRB & ~((0b11 << ISC50) | (0b11 << ISC60))) | 
+       EICRB = (EICRB & ~((0b11 << ISC50) | (0b11 << ISC60))) |
                (0b10 << ISC50) | (0b10 << ISC60);
        /* Reset pending ints */
        EIFR |= _BV(INTF5) | _BV(INTF6);
@@ -123,6 +136,27 @@ int reset_reason_is_power_on(void)
        return (mcusr & _BV(PORF)) != 0;
 }
 
+static
+void setup_system_time(void)
+{
+       struct tm rtc_time;
+
+       rtc_get(&rtc_time);
+       rtc_time.tm_isdst = 0;
+       set_system_time(mk_gmtime(&rtc_time) );
+}
+
+
+
+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() */
@@ -219,10 +253,13 @@ void main_loop(void)
 
 int main(void)
 {
+       extern void setup_mmc(void);
 
+       for (int i = 0; i < GPIO_MAX; i++)
+               gpio_config(i, INPUT_PULLUP);
        setup_avr();
+       setup_mmc();
        z80_setup_bus();
-
        env_init();
 
        if (reset_reason_is_power_on())
@@ -236,13 +273,9 @@ int main(void)
        print_reset_reason();
 #endif
 
-#if DEBUG
-       unsigned long i_speed = getenv_ulong(PSTR("i2c_clock"), 10, CONFIG_SYS_I2C_CLOCK);
-       debug("### Setting I2C clock Frequency to %lu Hz.\n", i_speed);
-       i2c_init(i_speed);
-#else
        i2c_init(CONFIG_SYS_I2C_CLOCK);
-#endif
+       setup_system_time();
+       setup_fatfs();
 
        printf_P(PSTR("\nATMEGA1281+Z8S180 Stamp Monitor\n\n"));