X-Git-Url: http://cloudbase.mooo.com/gitweb/z180-stamp.git/blobdiff_plain/68e463ad5c3b0225dbf293ac609b3b7784fe0a0b..dbc1de70e1824cf1a649d892db5746b86b34b4e7:/avr/main.c diff --git a/avr/main.c b/avr/main.c index 65622cc..486e15c 100644 --- a/avr/main.c +++ b/avr/main.c @@ -1,16 +1,17 @@ /* + * (C) Copyright 2014 Leo C. + * + * SPDX-License-Identifier: GPL-2.0 */ #include "common.h" - -#include #include +#include #include -#include #include "config.h" -#include "debug.h" +#include "ff.h" #include "z80-if.h" #include "i2c.h" #include "con-utils.h" @@ -18,21 +19,39 @@ #include "timer.h" #include "cli.h" #include "env.h" +#include "z180-serv.h" +#include "gpio.h" +#include "time.h" +#include "rtc.h" +#include "debug.h" +#include "cmd_fat.h" -#define udelay(n) _delay_us(n) -static uint8_t mcusr; +uint8_t mcusr __attribute__ ((section (".noinit"))); -/*--------------------------------------------------------------------------*/ #if DEBUG - __attribute__ ((naked)) __attribute__ ((section (".init3"))) void preset_ram (void) { - for (uint8_t *p = RAMSTART; p <= (uint8_t *) RAMEND; p++) + for (uint8_t *p = (uint8_t *) RAMSTART; p <= (uint8_t *) RAMEND; p++) *p = 0xdd; } +#endif + +__attribute__ ((naked)) __attribute__ ((section (".init3"))) +void get_mcusr (void) +{ + /* save and clear reset reason(s) */ + /* TODO: move to init section? */ + mcusr = MCUSR; + MCUSR = 0; + + wdt_disable(); +} + +/*--------------------------------------------------------------------------*/ +#if DEBUG static const FLASH char * const FLASH rreasons[] = { FSTR("Power on"), @@ -48,41 +67,50 @@ 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"); + my_puts_P(PSTR("### Reset reason(s): ")); + if (r == 0) + my_puts_P(PSTR("none")); for ( ; r; p++, r >>= 1) { if (r & 1) { my_puts_P(*p); if (r & ~1) - printf_P(PSTR(", ")); + my_puts_P(PSTR(", ")); } } - printf_P(PSTR(".\n")); + my_puts_P(PSTR(".\n")); } #endif -static -void setup_avr(void) +ISR(INT5_vect) { - /* save and clear reset reason(s) */ - /* TODO: move to init section? */ - mcusr = MCUSR; - MCUSR = 0; + Stat |= S_MSG_PENDING + S_IO_0X40; +} - /* WD */ +ISR(INT6_vect) +{ + Stat |= S_CON_PENDING; +} +static +void setup_avr(void) +{ /* CPU */ /* Disable JTAG Interface regardless of the JTAGEN fuse setting. */ MCUCR = _BV(JTD); MCUCR = _BV(JTD); - /* disable unused peripherals */ - PRR0 = _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 */ + + /* Disable analog comparator */ ACSR = _BV(ACD); /* Ports */ @@ -90,12 +118,16 @@ void setup_avr(void) CLKPR = _BV(CLKPCE); CLKPR = 0; - /* Timer */ + /* System timer */ + setup_timer(); - OCR2A = F_CPU / 256 / 1000 - 1; /* Timer2: 1000Hz interval (OC2A) */ - TCCR2A = (0b10 << WGM20); /* CTC Mode */ - TCCR2B = (0b110 << CS20); /* Prescaler 256 */ - TIMSK2 = _BV(OCIE2A); /* Enable TC2.oca interrupt */ + /* 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 @@ -104,6 +136,17 @@ int reset_reason_is_power_on(void) return (mcusr & _BV(PORF)) != 0; } +static +void setup_system_time(void) +{ + struct tm rtc_time; + + rtc_get(&rtc_time); + rtc_time.tm_isdst = 0; + set_system_time(mk_gmtime(&rtc_time) ); +} + + /*--------------------------------------------------------------------------*/ /* Stored value of bootdelay, used by autoboot_command() */ @@ -131,7 +174,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 */ } @@ -165,13 +208,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_str(PSTR(ENV_BOOTCMD)); stored_bootdelay = bootdelay; return s; } @@ -179,7 +222,7 @@ const char *bootdelay_process(void) static void autoboot_command(const char *s) { - debug("### main_loop: bootcmd=\"%s\"\n", s ? s : PSTR("")); + debug("### main_loop: bootcmd=\"%s\"\n", s ? s : ""); _delay_ms(20); if (stored_bootdelay != -1 && s && !abortboot(stored_bootdelay)) { @@ -200,16 +243,20 @@ void main_loop(void) int main(void) { + extern void setup_mmc(void); + __malloc_margin = CONFIG_SYS_MALLOC_MARGIN; setup_avr(); - z80_setup_bus(); - + for (int i = 0; i < GPIO_MAX; i++) + gpio_config(i, INPUT_PULLUP); + setup_mmc(); env_init(); + z80_setup_bus(); 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 @@ -217,16 +264,13 @@ int main(void) 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); - i2c_init(i_speed); -#else i2c_init(CONFIG_SYS_I2C_CLOCK); -#endif + setup_system_time(); + setup_fatfs(); - printf_P(PSTR("\n(ATMEGA1281+HD64180)_stamp Tester\n")); + printf_P(PSTR("\n" MCU_STRING "+Z8S180 Stamp Monitor - Version: " VERSION " \n\n")); + setup_z180_serv(); main_loop(); }