X-Git-Url: http://cloudbase.mooo.com/gitweb/z180-stamp.git/blobdiff_plain/fc30b18e2023806ace24dd857ed851c491f81e50..41d36f28612cb6c49cf0260236f3b834549883be:/avr/main.c

diff --git a/avr/main.c b/avr/main.c
index a09f05c..0470fea 100644
--- a/avr/main.c
+++ b/avr/main.c
@@ -26,7 +26,7 @@ static uint8_t mcusr;
 /*--------------------------------------------------------------------------*/
 #if DEBUG
 
-__attribute__ ((naked)) __attribute__ ((section (".init3"))) 
+__attribute__ ((naked)) __attribute__ ((section (".init3")))
 void preset_ram (void)
 {
 	for (uint8_t *p = RAMSTART; p <= (uint8_t *) RAMEND; p++)
@@ -68,7 +68,7 @@ void setup_avr(void)
 	/* TODO: move to init section? */
 	mcusr = MCUSR;
 	MCUSR = 0;
-	
+
 	/* WD */
 
 	/* CPU */
@@ -77,11 +77,15 @@ void setup_avr(void)
 	MCUCR = _BV(JTD);
 	MCUCR = _BV(JTD);
 
-	/* disable unused periphels */
-	PRR0 = _BV(PRTIM2) | _BV(PRTIM0) | _BV(PRADC);
-	PRR1 = _BV(PRTIM5) | _BV(PRTIM4) | _BV(PRTIM3) | 
+	/* 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 +95,10 @@ 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 */
 }
 
 static
@@ -111,7 +115,7 @@ static int  stored_bootdelay;
 
 /***************************************************************************
  * Watch for 'delay' seconds for autoboot stop.
- * returns: 0 - no key, allow autoboot 
+ * returns: 0 - no key, allow autoboot
  *          1 - got key, abort
  */
 
@@ -207,7 +211,7 @@ int main(void)
 
 	if (reset_reason_is_power_on())
 		_delay_ms(CONFIG_PWRON_DELAY);
-	
+
 	serial_setup(getenv_ulong(PSTR("baudrate"), 10, CONFIG_BAUDRATE));
 	sei();
 
@@ -215,7 +219,7 @@ int main(void)
 	debug("\n=========================<  (RE)START DEBUG  >=========================\n");
 	print_reset_reason();
 #endif
-		
+
 #if DEBUG
 	unsigned long i_speed = getenv_ulong(PSTR("i2c_clock"), 10, CONFIG_SYS_I2C_CLOCK);
 	debug("### Setting I2C clock Frequency to %lu Hz.\n", i_speed);
@@ -225,6 +229,7 @@ int main(void)
 #endif
 
 	printf_P(PSTR("\n(ATMEGA1281+HD64180)_stamp Tester\n"));
-	
+
+
 	main_loop();
 }