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

diff --git a/avr/main.c b/avr/main.c
index e4c98b8..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;
 
@@ -61,6 +60,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)
 {
@@ -77,11 +86,15 @@ void setup_avr(void)
 	MCUCR = _BV(JTD);
 	MCUCR = _BV(JTD);
 
-	/* disable unused periphels */
-	PRR0 = _BV(PRTIM2) | _BV(PRTIM0) | _BV(PRADC);
+	/* Disable peripherals. Enable individually in respective init function. */
+	PRR0 = _BV(PRTWI) |
+		_BV(PRTIM2) | _BV(PRTIM0) | _BV(PRTIM1) |
+		_BV(PRSPI) | _BV(PRUSART0) | _BV(PRADC);
+
 	PRR1 = _BV(PRTIM5) | _BV(PRTIM4) | _BV(PRTIM3) |
 		_BV(PRUSART3) | _BV(PRUSART2) | _BV(PRUSART1);
 
+
 	/* disable analog comparator */
 	ACSR = _BV(ACD);
 	/* Ports */
@@ -91,10 +104,25 @@ void setup_avr(void)
 	CLKPR = 0;
 
 	/* Timer */
-
-	OCR1A = F_CPU / 8 / 1000 - 1; // Timer1: 1000Hz interval (OC1A)
-	TCCR1B = 0b00001010;
-	TIMSK1 = _BV(OCIE1A); // Enable TC1.oca interrupt
+	PRR1 &= ~_BV(PRTIM3);
+	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
@@ -130,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	*/
 		}
@@ -164,13 +192,13 @@ const char *bootdelay_process(void)
 	char *s;
 	int bootdelay;
 
-	bootdelay = (int) getenv_ulong(PSTR("bootdelay"), 10, CONFIG_BOOTDELAY);
+	bootdelay = (int) getenv_ulong(PSTR(ENV_BOOTDELAY), 10, CONFIG_BOOTDELAY);
 
 
 	debug("### main_loop entered: bootdelay=%d\n\n", bootdelay);
 	_delay_ms(20);
 
-	s = getenv(PSTR("bootcmd"));
+	s = getenv(PSTR(ENV_BOOTCMD));
 	stored_bootdelay = bootdelay;
 	return s;
 }
@@ -199,7 +227,6 @@ void main_loop(void)
 
 int main(void)
 {
-
 	setup_avr();
 	z80_setup_bus();
 
@@ -208,7 +235,7 @@ int main(void)
 	if (reset_reason_is_power_on())
 		_delay_ms(CONFIG_PWRON_DELAY);
 
-	serial_setup(getenv_ulong(PSTR("baudrate"), 10, CONFIG_BAUDRATE));
+	serial_setup(getenv_ulong(PSTR(ENV_BAUDRATE), 10, CONFIG_BAUDRATE));
 	sei();
 
 #if DEBUG
@@ -224,8 +251,9 @@ int main(void)
 	i2c_init(CONFIG_SYS_I2C_CLOCK);
 #endif
 
-	printf_P(PSTR("\n(ATMEGA1281+HD64180)_stamp Tester\n"));
+	printf_P(PSTR("\nATMEGA1281+Z8S180 Stamp Monitor\n\n"));
 
+	setup_z180_serv();
 
 	main_loop();
 }