Merge branch 'master' into cmdline_edit

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

diff --git a/avr/main.c b/avr/main.c
index 0470feaba1a967dfae761f03c7f1c0c7a569454e..3852e754a5ba59477cf813421ebfcc36fea0f3c2 100644 (file)
--- a/avr/main.c
+++ b/avr/main.c
@@ -1,16 +1,18 @@
 /*
+ * (C) Copyright 2014 Leo C. <erbl259-lmu@yahoo.de>
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 
 #include "common.h"
-
-#include <util/delay.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,14 +20,15 @@
 #include "timer.h"
 #include "cli.h"
 #include "env.h"
+#include "z180-serv.h"
+#include "gpio.h"
+#include "time.h"
+#include "rtc.h"
+#include "debug.h"
 
-#define udelay(n)  _delay_us(n)
-
-static uint8_t mcusr;
+uint8_t mcusr __attribute__ ((section (".noinit")));
 
-/*--------------------------------------------------------------------------*/
 #if DEBUG
-
 __attribute__ ((naked)) __attribute__ ((section (".init3")))
 void preset_ram (void)
 {
@@ -33,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"),
@@ -61,16 +79,19 @@ void print_reset_reason(void)
 
 #endif
 
-static
-void setup_avr(void)
+ISR(INT5_vect)
 {
-       /* save and clear reset reason(s) */
-       /* TODO: move to init section? */
-       mcusr = MCUSR;
-       MCUSR = 0;
+       Stat |= S_MSG_PENDING;
+}
 
-       /* WD */
+ISR(INT6_vect)
+{
+       Stat |= S_CON_PENDING;
+}
 
+static
+void setup_avr(void)
+{
        /* CPU */
 
        /* Disable JTAG Interface regardless of the JTAGEN fuse setting. */
@@ -99,6 +120,14 @@ void setup_avr(void)
        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 */
+
+       /* INT5, INT6: falling edge */
+       EICRB = (EICRB & ~((0b11 << ISC50) | (0b11 << ISC60))) |
+               (0b10 << ISC50) | (0b10 << ISC60);
+       /* Reset pending ints */
+       EIFR |= _BV(INTF5) | _BV(INTF6);
+       /* Enable INT5, and INT6 */
+       EIMSK |= _BV(INT5) | _BV(INT6);
 }
 
 static
@@ -107,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() */
@@ -134,7 +184,7 @@ static int abortboot(int  bootdelay)
         */
        if (bootdelay >= 0) {
                if (tstc()) {   /* we got a key press   */
-                       (void) my_getchar();  /* consume input  */
+                       (void) my_getchar(1);  /* consume input */
                        my_puts_P(PSTR("\b\b\b 0"));
                        abort = 1;      /* don't auto boot      */
                }
@@ -168,13 +218,13 @@ const char *bootdelay_process(void)
        char *s;
        int bootdelay;
 
-       bootdelay = (int) getenv_ulong(PSTR("bootdelay"), 10, CONFIG_BOOTDELAY);
+       bootdelay = (int) getenv_ulong(PSTR(ENV_BOOTDELAY), 10, CONFIG_BOOTDELAY);
 
 
        debug("### main_loop entered: bootdelay=%d\n\n", bootdelay);
        _delay_ms(20);
 
-       s = getenv(PSTR("bootcmd"));
+       s = getenv(PSTR(ENV_BOOTCMD));
        stored_bootdelay = bootdelay;
        return s;
 }
@@ -203,16 +253,19 @@ 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())
                _delay_ms(CONFIG_PWRON_DELAY);
 
-       serial_setup(getenv_ulong(PSTR("baudrate"), 10, CONFIG_BAUDRATE));
+       serial_setup(getenv_ulong(PSTR(ENV_BAUDRATE), 10, CONFIG_BAUDRATE));
        sei();
 
 #if DEBUG
@@ -220,16 +273,13 @@ 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("\n(ATMEGA1281+HD64180)_stamp Tester\n"));
+       printf_P(PSTR("\nATMEGA1281+Z8S180 Stamp Monitor\n\n"));
 
+       setup_z180_serv();
 
        main_loop();
 }