6502/AtomBusMon
1
0
Fork 0
mirror of https://github.com/hoglet67/AtomBusMon.git synced 2024-06-18 02:29:28 +00:00
Code Issues Projects Releases Wiki Activity

Added timeout command to change the memory timeout

Browse Source 
Change-Id: I1e5401356200f20be814ad58f9e7ae7b34fc0a68
This commit is contained in:
David Banks 2021-04-10 16:13:12 +01:00
parent 8f0536c2e9
commit 944f951b18
2 changed files with 35 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
firmware/AtomBusMon.c
View File

@ -88,7 +88,8 @@ char *cmdStrings[] = {
#endif #endif
"clear", "clear",
"trigger", "trigger",
"timermode" "timermode",
"timeout"
}; };
// Must be kept in step with cmdStrings (just above) // Must be kept in step with cmdStrings (just above)
@ -142,7 +143,8 @@ void (*cmdFuncs[])(char *params) = {
#endif #endif
doCmdClear, doCmdClear,
doCmdTrigger, doCmdTrigger,
doCmdTimerMode doCmdTimerMode,
doCmdTimeout
}; };
#if defined(EXTENDED_HELP) #if defined(EXTENDED_HELP)
@ -205,7 +207,7 @@ static const uint8_t helpMeta[] PROGMEM = {
8, 13, // compare 8, 13, // compare
22, 1, // mem 22, 1, // mem
26, 2, // rd 26, 2, // rd
42, 3, // wr 43, 3, // wr
#if defined(CPU_Z80) #if defined(CPU_Z80)
20, 1, // io 20, 1, // io
19, 2, // in 19, 2, // in
@ -222,23 +224,24 @@ static const uint8_t helpMeta[] PROGMEM = {
31, 7, // srec 31, 7, // srec
30, 14, // special 30, 14, // special
28, 7, // reset 28, 7, // reset
35, 6, // trace 36, 6, // trace
1, 7, // blist 1, 7, // blist
6, 4, // breakx 6, 4, // breakx
41, 4, // watchx 42, 4, // watchx
4, 4, // breakr 4, 4, // breakr
39, 4, // watchr 40, 4, // watchr
5, 4, // breakw 5, 4, // breakw
40, 4, // watchw 41, 4, // watchw
#if defined(CPU_Z80) #if defined(CPU_Z80)
2, 4, // breaki 2, 4, // breaki
37, 4, // watchi 38, 4, // watchi
3, 4, // breako 3, 4, // breako
38, 4, // watcho 39, 4, // watcho
#endif #endif
7, 0, // clear 7, 0, // clear
36, 5, // trigger 37, 5, // trigger
34, 17, // timermode 35, 17, // timermode
34, 14, // timeout
0, 0 0, 0
}; };
@ -613,6 +616,9 @@ static const char * triggerStrings[NUM_TRIGGERS] = {
// The current memory address (e.g. used when disassembling) // The current memory address (e.g. used when disassembling)
addr_t memAddr = 0; addr_t memAddr = 0;
// The current memory timeout value, in microseconds.
uint16_t memTimeout = 0x1000;
// The address of the next instruction // The address of the next instruction
addr_t nextAddr = 0; addr_t nextAddr = 0;
@ -781,9 +787,13 @@ uint8_t checkargs(char *params) {
********************************************************/ ********************************************************/
// Send a single hardware command // Send a single hardware command
//
void hwCmd(cmd_t cmd, cmd_t param) { void hwCmd(cmd_t cmd, cmd_t param) {
uint8_t status = STATUS_DIN; uint8_t status = STATUS_DIN;
uint16_t timeout = 10000; // An interation of the inner loop with a 32-bit loop variable
// is 9 instructions. So use F_CPU to scale to the timeout
// value is approx microseconds.
uint32_t timeout = ((uint32_t) memTimeout) * (F_CPU / 1000000) / 9;
cmd |= param; cmd |= param;
CTRL_PORT &= ~CMD_MASK; CTRL_PORT &= ~CMD_MASK;
CTRL_PORT ^= cmd | CMD_EDGE; CTRL_PORT ^= cmd | CMD_EDGE;
@ -2076,6 +2086,18 @@ void doCmdTimerMode(char *params) {
logstr("\n"); logstr("\n");
} }
void doCmdTimeout(char *params) {
parsehex4(params, &memTimeout);
// Small timeouts values cause bogus timeout errors, so enforce a minimum
// of 16us, which is less much than one character time at 115,200 (86us)
if (memTimeout < 0x10) {
memTimeout = 0x10;
}
logstr("timeout=");
loghex4(memTimeout);
logstr(" microseconds (hex)\n");
}
void doCmdTrace(char *params) { void doCmdTrace(char *params) {
long i = trace; long i = trace;
parselong(params, &i); parselong(params, &i);

1
firmware/AtomBusMon.h
View File

@ -78,6 +78,7 @@ void doCmdSave(char *params);
void doCmdSRec(char *params); void doCmdSRec(char *params);
void doCmdSpecial(char *params); void doCmdSpecial(char *params);
void doCmdTimerMode(char *params); void doCmdTimerMode(char *params);
void doCmdTimeout(char *params);
void doCmdTrace(char *params); void doCmdTrace(char *params);
void doCmdTrigger(char *params); void doCmdTrigger(char *params);
void doCmdWatchI(char *params); void doCmdWatchI(char *params);