X-Git-Url: http://cloudbase.mooo.com/gitweb/z180-stamp.git/blobdiff_plain/61b0cfe9df810db4fbca78e5f880d61c5063f324..cdc4625b124f725fbc9462d5592d1d3be2aa613a:/avr/main.c diff --git a/avr/main.c b/avr/main.c index 9103ddc..8bffef9 100644 --- a/avr/main.c +++ b/avr/main.c @@ -1,10 +1,11 @@ /* + * (C) Copyright 2014 Leo C. + * + * SPDX-License-Identifier: GPL-2.0+ */ #include "common.h" - -#include #include #include #include @@ -18,30 +19,69 @@ #include "timer.h" #include "cli.h" #include "env.h" +#include "z180-serv.h" +#include "gpio.h" +#include "time.h" +#include "rtc.h" + +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; } + +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 uint8_t mcusr; +ISR(INT5_vect) +{ + Stat |= S_MSG_PENDING; +} + +ISR(INT6_vect) +{ + Stat |= S_CON_PENDING; +} static void setup_avr(void) { /* save and clear reset reason(s) */ + /* TODO: move to init section? */ mcusr = MCUSR; MCUSR = 0; - + /* WD */ /* CPU */ @@ -50,11 +90,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 */ @@ -64,42 +108,37 @@ 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<>= 1) { - if (r & 1) { - my_puts_P(*p); - if (r & ~1) - printf_P(PSTR(", ")); - } - } - printf_P(PSTR(".\n")); + return (mcusr & _BV(PORF)) != 0; } +static +void setup_system_time(void) +{ + struct tm rtc_time; -/*******************************************************************************/ - -#define udelay(n) _delay_us(n) + rtc_get(&rtc_time); + rtc_time.tm_isdst = 0; + set_system_time(mk_gmtime(&rtc_time) ); +} +/*--------------------------------------------------------------------------*/ /* Stored value of bootdelay, used by autoboot_command() */ static int stored_bootdelay; @@ -107,7 +146,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 */ @@ -126,7 +165,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 */ } @@ -160,14 +199,13 @@ const char *bootdelay_process(void) char *s; int bootdelay; - s = getenv("bootdelay"); - bootdelay = s ? atoi(s) : 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("bootcmd"); + s = getenv(PSTR(ENV_BOOTCMD)); stored_bootdelay = bootdelay; return s; } @@ -196,22 +234,38 @@ void main_loop(void) int main(void) { + extern void setup_mmc(void); + for (int i = 0; i < GPIO_MAX; i++) + gpio_config(i, INPUT_PULLUP); setup_avr(); + setup_mmc(); z80_setup_bus(); - - serial_setup(); + env_init(); + + if (reset_reason_is_power_on()) + _delay_ms(CONFIG_PWRON_DELAY); + + serial_setup(getenv_ulong(PSTR(ENV_BAUDRATE), 10, CONFIG_BAUDRATE)); sei(); #if DEBUG debug("\n=========================< (RE)START DEBUG >=========================\n"); print_reset_reason(); #endif - - env_init(); - i2c_init(34920); - printf_P(PSTR("\n(ATMEGA1281+HD64180)_stamp Tester\n")); - +#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); + i2c_init(i_speed); +#else + i2c_init(CONFIG_SYS_I2C_CLOCK); +#endif + setup_system_time(); + + printf_P(PSTR("\nATMEGA1281+Z8S180 Stamp Monitor\n\n")); + + setup_z180_serv(); + main_loop(); }