X-Git-Url: http://cloudbase.mooo.com/gitweb/z180-stamp.git/blobdiff_plain/d66348b4fb147eb01c30aa9b3a8904ce6c59a4c1..f6154a3944b775a6d6846f132b184d94b44bc204:/avr/cmd_cpu.c?ds=sidebyside diff --git a/avr/cmd_cpu.c b/avr/cmd_cpu.c index 1627d9f..61e3ec3 100644 --- a/avr/cmd_cpu.c +++ b/avr/cmd_cpu.c @@ -6,7 +6,7 @@ #include "cmd_cpu.h" //#include -//#include +#include #include "z80-if.h" #include "con-utils.h" @@ -22,6 +22,136 @@ #undef const +/* + * delay for ms... + */ +static void test_delay(uint32_t count) +{ + uint32_t ts = get_timer(0); + + while (get_timer(ts) <= count); +} + +static int32_t z80_measure_phi(uint8_t cycles, uint16_t wait_ms) +{ + uint16_t ref_stop; + uint16_t ref_ovfl; + uint32_t x_freq; + uint8_t eimsk_save,eicrb_save; + + + ATOMIC_BLOCK(ATOMIC_FORCEON) { + /* Save state and disable INT6 */ + eimsk_save = EIMSK; + EIMSK &= ~_BV(INT6); + /* Save state and set INT6 for falling edge */ + eicrb_save = EICRB; + EICRB = (eicrb_save & ~(0b11 << ISC60)) | (0b10 << ISC60); + } + + PRR1 &= ~_BV(PRTIM3); + TCCR3A = 0; + TCCR3B = 0b000<= 100000UL) { + x_freq = (x_freq + 5)/10; + ++sc; + } + while (sc--) + x_freq *= 10; + } + + /* Stop Timer */ + TCCR3B = 0; + PRR1 |= _BV(PRTIM3); + + ATOMIC_BLOCK(ATOMIC_FORCEON) { + /* Restore INT6 */ +#if 0 /* wtf? */ + eicrb_save = EICRB; + EICRB = (EICRB & ~(0b11 << ISC60)) | (eicrb_save & (0b11 << ISC60)); +#endif + EICRB = eicrb_save; + if ((eimsk_save & _BV(INT6)) != 0) + EIMSK |= _BV(INT6); + /* Reset pending int */ + EIFR = _BV(INTF6); + } + + return (int32_t) x_freq; +} + + static const FLASH char * const FLASH cpu_strings[] = { FSTR("Unknown CPU"), FSTR("8080"), @@ -90,16 +220,6 @@ donot: return CMD_RET_SUCCESS; } -/* - * delay for ms... - */ -static void test_delay(uint32_t count) -{ - uint32_t ts = get_timer(0); - - while (get_timer(ts) <= count); -} - command_ret_t do_cpu_test(cmd_tbl_t *cmdtp UNUSED, uint_fast8_t flag UNUSED, int argc, char * const argv[]) { @@ -133,6 +253,63 @@ command_ret_t do_cpu_test(cmd_tbl_t *cmdtp UNUSED, uint_fast8_t flag UNUSED, int return CMD_RET_SUCCESS; } +command_ret_t do_bus_test(cmd_tbl_t *cmdtp UNUSED, uint_fast8_t flag UNUSED, int argc UNUSED, char * const argv[] UNUSED) +{ + char ch; + +#if 0 + /* reset getopt() */ + optind = 0; + int opt; + while ((opt = getopt(argc, argv, PSTR("t:"))) != -1) { + switch (opt) { + case 't': + pulsewidth = eval_arg(optarg, NULL); + break; + default: /* '?' */ + return CMD_RET_USAGE; + } + } +#endif + + my_puts_P(PSTR( + " 1: RESET 4: RUN r: Toggle /RESET\n" + " 2: REQUEST 5: RESTART b: Toggle /BUSREQ\n" + " 3: RELEASE 6: M_CYCLE\n" + "\n" + //"Bus state: " + )); + + do { + ch = my_getchar(1); + if (ch >= 0) { + switch (ch) { + case '1': /* bus_cmd RESET */ + case '2': /* bus_cmd REQUEST */ + case '3': /* bus_cmd RELEASE */ + case '4': /* bus_cmd RUN */ + case '5': /* bus_cmd RESTART */ + case '6': /* bus_cmd M_CYCLE */ + z80_bus_cmd(ch - '1' + Reset); + break; + case 'r': /* Toggle RESET */ + z80_toggle_reset(); + break; + case 'b': /* Toggle BUSREQ */ + z80_toggle_busreq(); + break; + } + test_delay(10); + uint32_t cycles = z80_get_busreq_cycles(); + printf_P(PSTR("\rState: %.2x, cycles: %lu, time: %luus "), + z80_bus_state(), cycles, (uint32_t) (cycles * 1000000LL / F_CPU)); + } + } while (ch != 0x03); + + putchar('\n'); + return CMD_RET_SUCCESS; +} + command_ret_t do_busack_test(cmd_tbl_t *cmdtp UNUSED, uint_fast8_t flag UNUSED, int argc UNUSED, char * const argv[] UNUSED) { @@ -150,6 +327,7 @@ command_ret_t do_busack_test(cmd_tbl_t *cmdtp UNUSED, uint_fast8_t flag UNUSED, pinconf = gpio_config_get(pin); if (pinconf == OUTPUT_TIMER) { div = gpio_clockdiv_get(pin); + } #endif @@ -158,107 +336,123 @@ command_ret_t do_busack_test(cmd_tbl_t *cmdtp UNUSED, uint_fast8_t flag UNUSED, return CMD_RET_SUCCESS; } -#if 0 -command_ret_t do_cpu_freq(cmd_tbl_t *cmdtp UNUSED, int flag UNUSED, int argc, char * const argv[]) +static const FLASH uint8_t loop_code[] = { + /* 0000 */ 0x01,0x36,0x00, /* ld bc,00*256+RCR */ + /* 0003 */ 0xAF, /* xor a */ + /* 0004 */ 0xED,0x79, /* out (c),a */ + /* 0006 */ 0xD3,0x40, /* out (040H),a */ + /* */ /* ;Z80 Z180(0W) Z180(MaxW) */ + /* 0008 */ /* loop: ;-------------------------- */ + /* 0008 */ 0xDB,0x50 /* in a,(050h) ;11 10 +3*3 19 */ + /* 000A */ 0xC3,0x08,0x00 /* jp loop ;10 9 +3*3 18 */ + /* ;-------------------------- */ + /* ;21 19 37 */ +} + +command_ret_t do_cpu_freq(cmd_tbl_t *cmdtp UNUSED, uint_fast8_t flag UNUSED, int argc, char * const argv[]) { - bool silent = false; - bool write_env = false; - bool load_loop = true; + +#define O_SILENT (1<<0) +#define O_WENV (1<<1) +#define O_LOAD_LOOP (1<<2) +#define O_UNLOAD_LOOP (1<<3) + + uint_fast8_t options = O_LOAD_LOOP | O_UNLOAD_LOOP; uint8_t lcycles = 18; uint16_t timeout = 1000; - uint8_t eicrb_save; - uint8_t eimsk_save; - uint8_t mem_save[cpuinfo_length]; + uint8_t mem_save[ARRAY_SIZE(loop_code)]; /* reset getopt() */ optind = 0; int opt; - while ((opt = getopt(argc, argv, PSTR("swnc:t:"))) != -1) { + while ((opt = getopt(argc, argv, PSTR("swnuc:t:"))) != -1) { switch (opt) { case 's': - silent = true; + options |= O_SILENT; break; case 'w': - write_env = true; + options |= O_WENV; break; case 'n': - load_loop = false; + options &= ~O_LOAD_LOOP; + break; + case 'u': + options &= ~O_UNLOAD_LOOP; break; case 'c': lcycles = eval_arg(optarg, NULL); break; case 't': - lcycles = eval_arg(optarg, NULL); + timeout = eval_arg(optarg, NULL); break; default: /* '?' */ return CMD_RET_USAGE; } } + if (argc - optind != 0) + return CMD_RET_USAGE; if (z80_bus_state() & ZST_RUNNING) { - if (!silent) + if (!(options & O_SILENT)) printf_P(PSTR("Frequency measuring failed. CPU allready running!\n")); return CMD_RET_FAILURE; } - ATOMIC_BLOCK(ATOMIC_FORCEON) { - /* Save state and disable INT6 */ - eimsk_save = EIMSK; - EIMSK &= ~_BV(INT6); - /* Save state and set INT6 for falling edge */ - eicrb_save = EICRB; - EICRB = (eicrb_save & ~(0b11 << ISC60)) | (0b10 << ISC60); - } z80_bus_cmd(Request); - if (load_loop) { - z80_read_block(mem_save, 0, cpuinfo_length); - z80_load_mem(0, cpuinfo, - &cpuinfo_sections, - cpuinfo_address, - cpuinfo_length_of_sections); + if (options & O_LOAD_LOOP) { + z80_read_block(mem_save, 0, ARRAY_SIZE(loop_code)); + z80_write_block_P(loop_code, 0, ARRAY_SIZE(loop_code)); } - z80_bus_cmd(Run); + Stat &= ~S_IO_0X40; /* Reset pending int */ z80_bus_cmd(Release); + z80_bus_cmd(Run); - uint32_t cpu_freq = z80_measure_phi(lcycles, true, timeout); + clear_ctrlc(); /* forget any previous Control C */ + ERRNUM err = 0; - z80_bus_cmd(Reset); - z80_bus_cmd(Request); - if (load_loop) - z80_write_block(mem_save, 0, cpuinfo_length); - z80_bus_cmd(Release); + /* Wait for falling edge */ + do { + /* check for ctrl-c to abort... */ + if (had_ctrlc() || ctrlc()) { + err = EINTR; + break; + } + } while ((Stat & S_IO_0X40) == 0); - ATOMIC_BLOCK(ATOMIC_FORCEON) { - /* Restore INT6 */ - eicrb_save = EICRB; - EICRB = (EICRB & ~(0b11 << ISC60)) | (eicrb_save & (0b11 << ISC60)); - if ((eimsk_save & _BV(INT6)) != 0) - EIMSK |= _BV(INT6); - /* Reset pending int */ - EIFR = _BV(INTF6); - } + int32_t cpu_freq; + if (!err) + cpu_freq = z80_measure_phi(lcycles, false, timeout); - if (!silent) { - if (cpu_freq != 0) - printf_P(PSTR("%luHz\n"), cpu_freq); - else - printf_P(PSTR("No CPU clock or input frequency to low!\n")); + z80_bus_cmd(Reset); + if (options & O_UNLOAD_LOOP) { + z80_bus_cmd(Request); + z80_write_block(mem_save, 0, ARRAY_SIZE(loop_code)); + z80_bus_cmd(Release); } + if (err) + cmd_error(CMD_RET_FAILURE, err, NULL); - if (write_env) { + if (!(options & O_SILENT)) { + printf_P(PSTR("%ld%S\n"), cpu_freq, cpu_freq < 0 ? PSTR("") : PSTR("Hz")); +// if (cpu_freq != 0) +// else +// printf_P(PSTR("No CPU clock or input frequency to low!\n")); + } +#if 0 + if (options & O_WENV) { if (setenv_ulong(PSTR(ENV_CPU_FREQ), cpu_freq)) { - if (!silent) + if (!(options & O_SILENT)) printf_P(PSTR("'SETENV (%S, %lu)' failed!\n"), PSTR(ENV_CPU_FREQ), cpu_freq); return CMD_RET_FAILURE; } } - +#endif return CMD_RET_SUCCESS; } -#endif + /* * command table for fat subcommands @@ -270,6 +464,11 @@ CMD_TBL_ITEM( "Check CPU", "" ), +CMD_TBL_ITEM( + buscmd, CONFIG_SYS_MAXARGS, CTBL_RPT, do_bus_test, + "Bus commands", + "" +), CMD_TBL_ITEM( test, CONFIG_SYS_MAXARGS, 1, do_cpu_test, "Do bus request/release cycles", @@ -280,15 +479,14 @@ CMD_TBL_ITEM( "Get time from /Reset high to /BUSACK low", "" ), -#if 0 CMD_TBL_ITEM( freq, CONFIG_SYS_MAXARGS, 1, do_cpu_freq, "Measure cpu frequency", - "[-swn] [-c loopcycles]\n" - " -s Supress output (silent)\n" - " -w Write result to environment variable '"ENV_CPU_FREQ"'" + "[-qwn] [-c loopcycles] [-t timeout]\n" + " -q Be quiet\n" +// " -w Write result to environment variable '"ENV_CPU_FREQ"'" ), -#endif + CMD_TBL_ITEM( help, CONFIG_SYS_MAXARGS, CTBL_RPT, do_help, "Print sub command description/usage", @@ -322,7 +520,7 @@ command_ret_t do_cpu(cmd_tbl_t *cmdtp UNUSED, uint_fast8_t flag UNUSED, int argc } -#if 0 +#if 0 /* Z180 Single Step Functions */ /* * Z180 Single Step Functions *