X-Git-Url: http://cloudbase.mooo.com/gitweb/z180-stamp.git/blobdiff_plain/f14850dbf6369dc42df913c407bda51efb1c620c..fecee2418b6aea15008ed6d3a856d202d59a5cdb:/avr/main.c

diff --git a/avr/main.c b/avr/main.c
index dc7a6ef..8bffef9 100644
--- a/avr/main.c
+++ b/avr/main.c
@@ -1,10 +1,11 @@
 /*
+ * (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 <stdlib.h>
 #include <stdio.h>
@@ -18,15 +19,17 @@
 #include "timer.h"
 #include "cli.h"
 #include "env.h"
-
-#define udelay(n)  _delay_us(n)
+#include "z180-serv.h"
+#include "gpio.h"
+#include "time.h"
+#include "rtc.h"
 
 static uint8_t mcusr;
 
 /*--------------------------------------------------------------------------*/
 #if DEBUG
 
-__attribute__ ((naked)) __attribute__ ((section (".init3"))) 
+__attribute__ ((naked)) __attribute__ ((section (".init3")))
 void preset_ram (void)
 {
 	for (uint8_t *p = RAMSTART; p <= (uint8_t *) RAMEND; p++)
@@ -61,6 +64,16 @@ void print_reset_reason(void)
 
 #endif
 
+ISR(INT5_vect)
+{
+	Stat |= S_MSG_PENDING;
+}
+
+ISR(INT6_vect)
+{
+	Stat |= S_CON_PENDING;
+}
+
 static
 void setup_avr(void)
 {
@@ -68,7 +81,7 @@ void setup_avr(void)
 	/* TODO: move to init section? */
 	mcusr = MCUSR;
 	MCUSR = 0;
-	
+
 	/* WD */
 
 	/* CPU */
@@ -77,11 +90,15 @@ void setup_avr(void)
 	MCUCR = _BV(JTD);
 	MCUCR = _BV(JTD);
 
-	/* disable unused periphels */
-	PRR0 = _BV(PRTIM2) | _BV(PRTIM0) | _BV(PRADC);
-	PRR1 = _BV(PRTIM5) | _BV(PRTIM4) | _BV(PRTIM3) | 
+	/* 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 */
@@ -91,10 +108,18 @@ void setup_avr(void)
 	CLKPR = 0;
 
 	/* Timer */
-
-	OCR1A = F_CPU / 8 / 1000 - 1; // Timer1: 1000Hz interval (OC1A)
-	TCCR1B = 0b00001010;
-	TIMSK1 = _BV(OCIE1A); // Enable TC1.oca interrupt
+	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 */
+
+	/* 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
@@ -103,6 +128,16 @@ 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() */
@@ -111,7 +146,7 @@ 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
  */
 
@@ -130,7 +165,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	*/
 		}
@@ -164,13 +199,13 @@ const char *bootdelay_process(void)
 	char *s;
 	int bootdelay;
 
-	bootdelay = (int) getenv_ulong("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("bootcmd");
+	s = getenv(PSTR(ENV_BOOTCMD));
 	stored_bootdelay = bootdelay;
 	return s;
 }
@@ -199,32 +234,38 @@ 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("baudrate", 10, CONFIG_BAUDRATE));
+
+	serial_setup(getenv_ulong(PSTR(ENV_BAUDRATE), 10, CONFIG_BAUDRATE));
 	sei();
 
 #if DEBUG
 	debug("\n=========================<  (RE)START DEBUG  >=========================\n");
 	print_reset_reason();
 #endif
-		
+
 #if DEBUG
-	unsigned long i_speed = getenv_ulong("i2c_clock", 10, CONFIG_SYS_I2C_CLOCK);
+	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();
+
+	printf_P(PSTR("\nATMEGA1281+Z8S180 Stamp Monitor\n\n"));
+
+	setup_z180_serv();
 
-	printf_P(PSTR("\n(ATMEGA1281+HD64180)_stamp Tester\n"));
-	
 	main_loop();
 }