X-Git-Url: http://cloudbase.mooo.com/gitweb/z180-stamp.git/blobdiff_plain/424b184a9bab3b1b8fe93fbc9e8a6e9d566904c8..35edb766593d019b89a3f40b6d6cdd2b50f18032:/avr/main.c

diff --git a/avr/main.c b/avr/main.c
index 2a1ecd3..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,8 +19,10 @@
 #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;
 
@@ -66,6 +69,11 @@ ISR(INT5_vect)
 	Stat |= S_MSG_PENDING;
 }
 
+ISR(INT6_vect)
+{
+	Stat |= S_CON_PENDING;
+}
+
 static
 void setup_avr(void)
 {
@@ -105,10 +113,13 @@ void setup_avr(void)
 	TCCR3B = (0b01<<WGM32)|(0b001<<CS30); /* CTC Mode, Prescaler 1 */
 	TIMSK3 = _BV(OCIE3A);		/* Enable TC2.oca interrupt */
 
-	/* 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 +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() */
@@ -213,10 +234,13 @@ 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())
@@ -237,9 +261,11 @@ int main(void)
 #else
 	i2c_init(CONFIG_SYS_I2C_CLOCK);
 #endif
+	setup_system_time();
 
 	printf_P(PSTR("\nATMEGA1281+Z8S180 Stamp Monitor\n\n"));
 
+	setup_z180_serv();
 
 	main_loop();
 }