pin command, add user configurable i/o pins

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

diff --git a/avr/main.c b/avr/main.c
index fb4e35c816a08bcbf5677d1233f572f082c132a0..0470feaba1a967dfae761f03c7f1c0c7a569454e 100644 (file)
--- 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
  */
 
@@ -164,13 +168,13 @@ const char *bootdelay_process(void)
        char *s;
        int bootdelay;
 
-       bootdelay = (int) getenv_ulong("bootdelay", 10, CONFIG_BOOTDELAY);
+       bootdelay = (int) getenv_ulong(PSTR("bootdelay"), 10, CONFIG_BOOTDELAY);
 
 
        debug("### main_loop entered: bootdelay=%d\n\n", bootdelay);
        _delay_ms(20);
 
-       s = getenv("bootcmd");
+       s = getenv(PSTR("bootcmd"));
        stored_bootdelay = bootdelay;
        return s;
 }
@@ -203,21 +207,21 @@ int main(void)
        setup_avr();
        z80_setup_bus();
 
+       env_init();
+
        if (reset_reason_is_power_on())
-               _delay_ms(CONFIG_POWRON_DELAY);
-       
-       serial_setup();
+               _delay_ms(CONFIG_PWRON_DELAY);
+
+       serial_setup(getenv_ulong(PSTR("baudrate"), 10, CONFIG_BAUDRATE));
        sei();
 
 #if DEBUG
        debug("\n=========================<  (RE)START DEBUG  >=========================\n");
        print_reset_reason();
 #endif
-               
-       env_init();
 
 #if DEBUG
-       unsigned long i_speed = getenv_ulong("i2c_clock", 10, CONFIG_SYS_I2C_CLOCK);
+       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);
        i2c_init(i_speed);
 #else
@@ -225,6 +229,7 @@ int main(void)
 #endif
 
        printf_P(PSTR("\n(ATMEGA1281+HD64180)_stamp Tester\n"));
-       
+
+
        main_loop();
 }