X-Git-Url: http://cloudbase.mooo.com/gitweb/z180-stamp.git/blobdiff_plain/f338df2abc35f85961aa6266458f94ea2a102b81..910e72069ea19a79e06e7146a5e42d0bb05a9c2f:/avr/main.c

diff --git a/avr/main.c b/avr/main.c
index 5c4cd0c..423b48a 100644
--- a/avr/main.c
+++ b/avr/main.c
@@ -1,71 +1,56 @@
 /*
+ * (C) Copyright 2014 Leo C. <erbl259-lmu@yahoo.de>
+ *
+ * SPDX-License-Identifier:	GPL-2.0
  */
 
 
 #include "common.h"
-
-#include <util/delay.h>
-//#include <avr/power.h>
-//#include <avr/pgmspace.h>
 #include <avr/interrupt.h>
-//#include <util/atomic.h>
-//#include <avr/sleep.h>
-//#include <string.h>
-
-#include <util/delay.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"
 #include "serial.h"
 #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"
 
-/*--------------------------------------------------------------------------*/
+uint8_t mcusr __attribute__ ((section (".noinit")));
 
-static uint8_t mcusr;
+#if DEBUG
+__attribute__ ((naked)) __attribute__ ((section (".init3")))
+void preset_ram (void)
+{
+	for (uint8_t *p = (uint8_t *) RAMSTART; p <= (uint8_t *) RAMEND; p++)
+		*p = 0xdd;
 
-static
-void setup_avr(void)
+}
+#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;
-	
-	/* WD */
-
-	/* CPU */
 
-	/* Disable JTAG Interface regardless of the JTAGEN fuse setting. */
-	MCUCR = _BV(JTD);
-	MCUCR = _BV(JTD);
-
-	/* disable unused periphels */
-	PRR0 = _BV(PRTIM2) | _BV(PRTIM0) | _BV(PRADC);
-	PRR1 = _BV(PRTIM5) | _BV(PRTIM4) | _BV(PRTIM3) | 
-		_BV(PRUSART3) | _BV(PRUSART2) | _BV(PRUSART1);
-
-	/* disable analog comparator */
-	ACSR = _BV(ACD);
-	/* Ports */
-
-	/* Clock */
-	CLKPR = _BV(CLKPCE);
-	CLKPR = 0;
-
-	/* Timer */
-
-	OCR1A = F_CPU / 8 / 1000 - 1; // Timer1: 1000Hz interval (OC1A)
-	TCCR1B = 0b00001010;
-	TIMSK1 = _BV(OCIE1A); // Enable TC1.oca interrupt
+	wdt_disable();
 }
 
+/*--------------------------------------------------------------------------*/
+#if DEBUG
+
 static const FLASH char * const FLASH rreasons[] = {
 			FSTR("Power on"),
 			FSTR("External"),
@@ -80,7 +65,7 @@ void print_reset_reason(void)
 	uint8_t r = mcusr & 0x1f;
 	const FLASH char * const FLASH *p = rreasons;
 
-	printf_P(PSTR("Reset reason(s): "));
+	printf_P(PSTR("### Reset reason(s): %s"), r ? "" : "none");
 	for ( ; r; p++, r >>= 1) {
 		if (r & 1) {
 			my_puts_P(*p);
@@ -91,20 +76,95 @@ void print_reset_reason(void)
 	printf_P(PSTR(".\n"));
 }
 
+#endif
+
+ISR(INT5_vect)
+{
+	Stat |= S_MSG_PENDING;
+}
+
+ISR(INT6_vect)
+{
+	Stat |= S_CON_PENDING;
+}
+
+static
+void setup_avr(void)
+{
+	/* CPU */
+
+	/* Disable JTAG Interface regardless of the JTAGEN fuse setting. */
+	MCUCR = _BV(JTD);
+	MCUCR = _BV(JTD);
+
+	/* Disable peripherals. Enable individually in respective init function. */
+	PRR0 = _BV(PRTWI) |
+		_BV(PRTIM2) | _BV(PRTIM0) | _BV(PRTIM1) |
+		_BV(PRSPI) | _BV(PRUSART0) | _BV(PRADC);
+
+	PRR1 = _BV(PRTIM5) | _BV(PRTIM4) | _BV(PRTIM3) |
+		_BV(PRUSART3) | _BV(PRUSART2) | _BV(PRUSART1);
+
+
+	/* disable analog comparator */
+	ACSR = _BV(ACD);
+	/* Ports */
+
+	/* Clock */
+	CLKPR = _BV(CLKPCE);
+	CLKPR = 0;
+
+	/* Timer */
+	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))) |
+		(0b10 << ISC50) | (0b10 << ISC60);
+	/* Reset pending ints */
+	EIFR |= _BV(INTF5) | _BV(INTF6);
+	/* Enable INT5, and INT6 */
+	EIMSK |= _BV(INT5) | _BV(INT6);
+}
+
+static
+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) );
+}
 
-#define udelay(n)  _delay_us(n)
 
 
+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() */
 static int  stored_bootdelay;
 
 
 /***************************************************************************
  * Watch for 'delay' seconds for autoboot stop.
- * returns: 0 - no key, allow autoboot 
+ * returns: 0 - no key, allow autoboot
  *          1 - got key, abort
  */
 
@@ -123,7 +183,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	*/
 		}
@@ -157,14 +217,13 @@ const char *bootdelay_process(void)
 	char *s;
 	int bootdelay;
 
-	s = getenv("bootdelay");
-	bootdelay = s ? atoi(s) : 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("bootcmd");
+	s = getenv_char(PSTR(ENV_BOOTCMD));
 	stored_bootdelay = bootdelay;
 	return s;
 }
@@ -172,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)) {
@@ -193,20 +252,33 @@ void main_loop(void)
 
 int main(void)
 {
+	extern void setup_mmc(void);
+
 	setup_avr();
+	for (int i = 0; i < GPIO_MAX; i++)
+		gpio_config(i, INPUT_PULLUP);
+	setup_mmc();
+	env_init();
 	z80_setup_bus();
-	
-	serial_setup();
+
+	if (reset_reason_is_power_on())
+		_delay_ms(CONFIG_PWRON_DELAY);
+
+	serial_setup(getenv_ulong(PSTR(ENV_BAUDRATE), 10, CONFIG_BAUDRATE));
 	sei();
 
-	debug("\n=========================<  (RE)START DEBUG  >=========================\n");
 #if DEBUG
+	debug("\n=========================<  (RE)START DEBUG  >=========================\n");
 	print_reset_reason();
 #endif
-		
-	env_init();
 
-	printf_P(PSTR("\n(ATMEGA1281+HD64180)_stamp Tester\n"));
-	
+	i2c_init(CONFIG_SYS_I2C_CLOCK);
+	setup_system_time();
+	setup_fatfs();
+
+	printf_P(PSTR("\n" MCU_STRING "+Z8S180 Stamp Monitor - Version: " VERSION  " \n\n"));
+
+	setup_z180_serv();
+
 	main_loop();
 }