getenv_ulong(), TWI int opt

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

diff --git a/avr/main.c b/avr/main.c
index 9103ddc036a0bcb8b8162633291c002e11d72eb6..fb4e35c816a08bcbf5677d1233f572f082c132a0 100644 (file)
--- a/avr/main.c
+++ b/avr/main.c
@@ -19,26 +19,53 @@
 #include "cli.h"
 #include "env.h"
 
+#define udelay(n)  _delay_us(n)
+
+static uint8_t mcusr;
+
 /*--------------------------------------------------------------------------*/
 #if DEBUG
-void preset_ram (void) __attribute__ ((naked)) \
-               __attribute__ ((section (".init3")));
-void
-preset_ram (void)
+
+__attribute__ ((naked)) __attribute__ ((section (".init3"))) 
+void preset_ram (void)
 {
        for (uint8_t *p = RAMSTART; p <= (uint8_t *) RAMEND; p++)
                *p = 0xdd;
 
 }
-#endif
-/*--------------------------------------------------------------------------*/
 
-static uint8_t mcusr;
+static const FLASH char * const FLASH rreasons[] = {
+                       FSTR("Power on"),
+                       FSTR("External"),
+                       FSTR("Brown out"),
+                       FSTR("Watchdog"),
+                       FSTR("JTAG"),
+               };
+
+static
+void print_reset_reason(void)
+{
+       uint8_t r = mcusr & 0x1f;
+       const FLASH char * const FLASH *p = rreasons;
+
+       printf_P(PSTR("### Reset reason(s): %s"), r ? "" : "none");
+       for ( ; r; p++, r >>= 1) {
+               if (r & 1) {
+                       my_puts_P(*p);
+                       if (r & ~1)
+                               printf_P(PSTR(", "));
+               }
+       }
+       printf_P(PSTR(".\n"));
+}
+
+#endif
 
 static
 void setup_avr(void)
 {
        /* save and clear reset reason(s) */
+       /* TODO: move to init section? */
        mcusr = MCUSR;
        MCUSR = 0;
        
@@ -70,36 +97,13 @@ void setup_avr(void)
        TIMSK1 = _BV(OCIE1A); // Enable TC1.oca interrupt
 }
 
-static const FLASH char * const FLASH rreasons[] = {
-                       FSTR("Power on"),
-                       FSTR("External"),
-                       FSTR("Brown out"),
-                       FSTR("Watchdog"),
-                       FSTR("JTAG"),
-               };
-
 static
-void print_reset_reason(void)
+int reset_reason_is_power_on(void)
 {
-       uint8_t r = mcusr & 0x1f;
-       const FLASH char * const FLASH *p = rreasons;
-
-       printf_P(PSTR("Reset reason(s): %s"), r ? "" : "none");
-       for ( ; r; p++, r >>= 1) {
-               if (r & 1) {
-                       my_puts_P(*p);
-                       if (r & ~1)
-                               printf_P(PSTR(", "));
-               }
-       }
-       printf_P(PSTR(".\n"));
+       return (mcusr & _BV(PORF)) != 0;
 }
 
-
-/*******************************************************************************/
-
-#define udelay(n)  _delay_us(n)
-
+/*--------------------------------------------------------------------------*/
 
 /* Stored value of bootdelay, used by autoboot_command() */
 static int  stored_bootdelay;
@@ -160,8 +164,7 @@ const char *bootdelay_process(void)
        char *s;
        int bootdelay;
 
-       s = getenv("bootdelay");
-       bootdelay = s ? atoi(s) : CONFIG_BOOTDELAY;
+       bootdelay = (int) getenv_ulong("bootdelay", 10, CONFIG_BOOTDELAY);
 
 
        debug("### main_loop entered: bootdelay=%d\n\n", bootdelay);
@@ -199,6 +202,9 @@ int main(void)
 
        setup_avr();
        z80_setup_bus();
+
+       if (reset_reason_is_power_on())
+               _delay_ms(CONFIG_POWRON_DELAY);
        
        serial_setup();
        sei();
@@ -209,7 +215,14 @@ int main(void)
 #endif
                
        env_init();
-       i2c_init(34920);
+
+#if DEBUG
+       unsigned long i_speed = getenv_ulong("i2c_clock", 10, CONFIG_SYS_I2C_CLOCK);
+       debug("### Setting I2C clock Frequency to %lu Hz.\n", i_speed);
+       i2c_init(i_speed);
+#else
+       i2c_init(CONFIG_SYS_I2C_CLOCK);
+#endif
 
        printf_P(PSTR("\n(ATMEGA1281+HD64180)_stamp Tester\n"));