X-Git-Url: http://cloudbase.mooo.com/gitweb/z180-stamp.git/blobdiff_plain/bad2d92d98f9990ee5ccf509c0eafe5b3af9f4dc..76c082ca2a2c560e660daca0a8294b73881423d8:/avr/main.c

diff --git a/avr/main.c b/avr/main.c
index 2955630..6fd29a8 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"
@@ -18,21 +19,39 @@
 #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"
+#include "cmd_fat.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"),
@@ -48,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
@@ -64,18 +85,17 @@ void print_reset_reason(void)
 ISR(INT5_vect)
 {
 	Stat |= S_MSG_PENDING;
+	Stat |= S_IO_0X40;
+}
+
+ISR(INT6_vect)
+{
+	Stat |= S_CON_PENDING;
 }
 
 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. */
@@ -91,7 +111,7 @@ void setup_avr(void)
 		_BV(PRUSART3) | _BV(PRUSART2) | _BV(PRUSART1);
 
 
-	/* disable analog comparator */
+	/* Disable analog comparator */
 	ACSR = _BV(ACD);
 	/* Ports */
 
@@ -99,16 +119,16 @@ 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 falling edge */
-	EICRB = (EICRB & ~(0b11 << ISC50)) | 0b10 << ISC50;
-	/* Enable INT5 */
-	EIMSK |= _BV(INT5);
+	/* 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
@@ -117,6 +137,17 @@ 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) );
+}
+
+
 /*--------------------------------------------------------------------------*/
 
 /* Stored value of bootdelay, used by autoboot_command() */
@@ -144,7 +175,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	*/
 		}
@@ -184,7 +215,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;
 }
@@ -192,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)) {
@@ -213,11 +244,15 @@ void main_loop(void)
 
 int main(void)
 {
+	extern void setup_mmc(void);
 
+	__malloc_margin = CONFIG_SYS_MALLOC_MARGIN;
 	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);
@@ -230,16 +265,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("\nATMEGA1281+Z8S180 Stamp Monitor\n\n"));
+	printf_P(PSTR("\n" stringify(DEVICE_NAME) "+Z8S180 Stamp Monitor - Version: " VERSION  " \n\n"));
 
+	setup_z180_serv();
 
 	main_loop();
 }