X-Git-Url: http://cloudbase.mooo.com/gitweb/z180-stamp.git/blobdiff_plain/89adce76dd02f2076ec6de1c6b434bc1f29512f4..7af9364ebd7ad6c143f31e9abe745c6d75f8322b:/avr/main.c

diff --git a/avr/main.c b/avr/main.c
index 34db6ef..86dcc50 100644
--- a/avr/main.c
+++ b/avr/main.c
@@ -1,16 +1,17 @@
 /*
+ * (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"
@@ -19,21 +20,36 @@
 #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)
 {
-	for (uint8_t *p = RAMSTART; p <= (uint8_t *) RAMEND; p++)
+	for (uint8_t *p = (uint8_t *) RAMSTART; p <= (uint8_t *) RAMEND; p++)
 		*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"),
@@ -75,13 +91,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. */
@@ -106,13 +115,13 @@ 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))) | 
+	EICRB = (EICRB & ~((0b11 << ISC50) | (0b11 << ISC60))) |
 		(0b10 << ISC50) | (0b10 << ISC60);
 	/* Reset pending ints */
 	EIFR |= _BV(INTF5) | _BV(INTF6);
@@ -126,6 +135,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() */
@@ -193,7 +223,7 @@ const char *bootdelay_process(void)
 	debug("### main_loop entered: bootdelay=%d\n\n", bootdelay);
 	_delay_ms(20);
 
-	s = getenv(PSTR(ENV_BOOTCMD));
+	s = getenv_str(PSTR(ENV_BOOTCMD));
 	stored_bootdelay = bootdelay;
 	return s;
 }
@@ -201,7 +231,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 : "<UNDEFINED>");
 	_delay_ms(20);
 
 	if (stored_bootdelay != -1 && s && !abortboot(stored_bootdelay)) {
@@ -222,11 +252,14 @@ void main_loop(void)
 
 int main(void)
 {
+	extern void setup_mmc(void);
 
 	setup_avr();
-	z80_setup_bus();
-
+	for (int i = 0; i < GPIO_MAX; i++)
+		gpio_config(i, INPUT_PULLUP);
+	setup_mmc();
 	env_init();
+	z80_setup_bus();
 
 	if (reset_reason_is_power_on())
 		_delay_ms(CONFIG_PWRON_DELAY);
@@ -239,15 +272,11 @@ 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"));
+	printf_P(PSTR("\n" MCU_STRING "+Z8S180 Stamp Monitor - Version: " VERSION  " \n\n"));
 
 	setup_z180_serv();