Merge branch 'master' into timelib

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

diff --git a/avr/main.c b/avr/main.c
index ba8a6729c2612d01951c178aec27cde74d6721c3..8acf265b5b430f319780724655899aacb9ba2b64 100644 (file)
--- a/avr/main.c
+++ b/avr/main.c
@@ -4,7 +4,6 @@
 
 #include "common.h"
 
-#include <util/delay.h>
 #include <avr/interrupt.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -18,8 +17,11 @@
 #include "timer.h"
 #include "cli.h"
 #include "env.h"
-
-#define udelay(n)  _delay_us(n)
+#include "z180-serv.h"
+#include "spi.h"
+#include "gpio.h"
+#include "time.h"
+#include "rtc.h"
 
 static uint8_t mcusr;
 
@@ -61,6 +63,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)
 {
@@ -99,6 +111,21 @@ void setup_avr(void)
        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 */
+
+       /* 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);
+       /* Reset pending ints */
+       EIFR |= _BV(INTF5) | _BV(INTF6);
+       /* Enable INT5, and INT6 */
+       EIMSK |= _BV(INT5) | _BV(INT6);
 }
 
 static
@@ -107,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() */
@@ -134,7 +171,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      */
                }
@@ -203,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())
@@ -227,9 +264,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();
 }