X-Git-Url: http://cloudbase.mooo.com/gitweb/z180-stamp.git/blobdiff_plain/bad2d92d98f9990ee5ccf509c0eafe5b3af9f4dc..1222f338a23212010c7e2d0d7c3a2861e42fa8df:/avr/main.c

diff --git a/avr/main.c b/avr/main.c
index 2955630..af082a3 100644
--- 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,8 @@
 #include "timer.h"
 #include "cli.h"
 #include "env.h"
-
-#define udelay(n)  _delay_us(n)
+#include "z180-serv.h"
+#include "spi.h"
 
 static uint8_t mcusr;
 
@@ -66,6 +65,11 @@ ISR(INT5_vect)
 	Stat |= S_MSG_PENDING;
 }
 
+ISR(INT6_vect)
+{
+	Stat |= S_CON_PENDING;
+}
+
 static
 void setup_avr(void)
 {
@@ -105,10 +109,20 @@ 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);
+	/* 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
@@ -144,7 +158,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	*/
 		}
@@ -213,7 +227,6 @@ void main_loop(void)
 
 int main(void)
 {
-
 	setup_avr();
 	z80_setup_bus();
 
@@ -240,6 +253,7 @@ int main(void)
 
 	printf_P(PSTR("\nATMEGA1281+Z8S180 Stamp Monitor\n\n"));
 
+	setup_z180_serv();
 
 	main_loop();
 }