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

diff --git a/avr/main.c b/avr/main.c
index af082a3..8bffef9 100644
--- a/avr/main.c
+++ b/avr/main.c
@@ -1,9 +1,11 @@
 /*
+ * (C) Copyright 2014 Leo C. <erbl259-lmu@yahoo.de>
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
  */
 
 
 #include "common.h"
-
 #include <avr/interrupt.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -18,7 +20,9 @@
 #include "cli.h"
 #include "env.h"
 #include "z180-serv.h"
-#include "spi.h"
+#include "gpio.h"
+#include "time.h"
+#include "rtc.h"
 
 static uint8_t mcusr;
 
@@ -109,13 +113,6 @@ void setup_avr(void)
 	TCCR3B = (0b01<<WGM32)|(0b001<<CS30); /* CTC Mode, Prescaler 1 */
 	TIMSK3 = _BV(OCIE3A);		/* Enable TC2.oca interrupt */
 
-	/* SPI as master */
-	PRR0 &= ~_BV(PRSPI);
-	SPI_DDR = (SPI_DDR & ~_BV(SPI_MISO))
-			| _BV(SPI_MOSI) | _BV(SPI_SCK) | _BV(SPI_SS);
-	SPI_PORT = (SPI_PORT & ~(_BV(SPI_MOSI) | _BV(SPI_SCK)))
-			| _BV(SPI_SS);
-
 	/* INT5, INT6: falling edge */
 	EICRB = (EICRB & ~((0b11 << ISC50) | (0b11 << ISC60))) |
 		(0b10 << ISC50) | (0b10 << ISC60);
@@ -131,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() */
@@ -227,9 +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())
@@ -250,6 +261,7 @@ int main(void)
 #else
 	i2c_init(CONFIG_SYS_I2C_CLOCK);
 #endif
+	setup_system_time();
 
 	printf_P(PSTR("\nATMEGA1281+Z8S180 Stamp Monitor\n\n"));