Merge branch 'master' into timelib

[z180-stamp.git] / avr / main.c

diff --git a/avr/main.c b/avr/main.c
index 2f9a62f284094ac87e76d74db8dda13c0891f508..8acf265b5b430f319780724655899aacb9ba2b64 100644 (file)
--- a/avr/main.c
+++ b/avr/main.c
@@ -18,6 +18,10 @@
 #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;
 
@@ -108,8 +112,15 @@ 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))) | 
+       EICRB = (EICRB & ~((0b11 << ISC50) | (0b11 << ISC60))) |
                (0b10 << ISC50) | (0b10 << ISC60);
        /* Reset pending ints */
        EIFR |= _BV(INTF5) | _BV(INTF6);
@@ -123,6 +134,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() */
@@ -219,10 +240,10 @@ void main_loop(void)
 
 int main(void)
 {
-
        setup_avr();
        z80_setup_bus();
-
+       for (int i = 0; i < GPIO_MAX; i++)
+               gpio_config(i, INPUT_PULLUP);
        env_init();
 
        if (reset_reason_is_power_on())
@@ -243,6 +264,7 @@ int main(void)
 #else
        i2c_init(CONFIG_SYS_I2C_CLOCK);
 #endif
+       setup_system_time();
 
        printf_P(PSTR("\nATMEGA1281+Z8S180 Stamp Monitor\n\n"));