diff --git a/doc/simh_doc.doc b/doc/simh_doc.doc index 324442a2..62eafc22 100644 Binary files a/doc/simh_doc.doc and b/doc/simh_doc.doc differ diff --git a/scp.c b/scp.c index 8b8881f1..2364519f 100644 --- a/scp.c +++ b/scp.c @@ -1623,15 +1623,20 @@ ASSERT failure have several different actions: " The SEND command provides a way to insert input into the console device of\n" " a simulated system as if it was entered by a user.\n\n" "++SEND {-t} {after=nn,}{delay=nn,}\"\"\n\n" + "++NOSEND\n\n" + "++SHOW SEND\n\n" " The string argument must be delimited by quote characters. Quotes may\n" " be either single or double but the opening and closing quote characters\n" " must match. Data in the string may contain escaped character strings.\n\n" " The SEND command can also insert input into any serial device on a\n" " simulated system as if it was entered by a user.\n\n" - "++SEND {-t} {:line} {after=nn,}{delay=nn,}\"\"\n" + "++SEND {-t} {:line} {after=nn,}{delay=nn,}\"\"\n\n" "++NOSEND {:line}\n\n" + "++SHOW SEND {:line}\n\n" " The NOSEND command removes any undelivered input data which may be\n" - " pending on a line.\n" + " pending on the CONSOLE or a specific multiplexer line.\n\n" + " The SHOW SEND command displays any pending SEND activity for the\n" + " CONSOLE or a specific multiplexer line.\n" "4Delay\n" " Specifies an integer (>=0) representing a minimal instruction delay\n" " between characters being sent. The delay parameter can be set by\n" @@ -1681,6 +1686,7 @@ ASSERT failure have several different actions: " when specific output has been generated by the simulated system.\n\n" "++EXPECT {dev:line} {[count]} {HALTAFTER=n,}\"\" {actioncommand {; actioncommand}...}\n\n" "++NOEXPECT {dev:line} \"\"\n\n" + "++SHOW EXPECT {dev:line}\n\n" " The string argument must be delimited by quote characters. Quotes may\n" " be either single or double but the opening and closing quote characters\n" " must match. Data in the string may contain escaped character strings.\n" @@ -1698,7 +1704,10 @@ ASSERT failure have several different actions: " to match other expect rules which may already be defined.\n" " Data which is output prior to the definition of an expect rule is not\n" " eligible to be matched against.\n\n" - " The NOEXPECT command removes a previously defined EXPECT command.\n" + " The NOEXPECT command removes a previously defined EXPECT command for the\n" + " console or a specific multiplexer line.\n\n" + " The SHOW EXPECT command displays all of the pending EXPECT state for\n" + " the console or a specific multiplexer line.\n" /***************** 80 character line width template *************************/ "4Switches\n" " Switches can be used to influence the behavior of EXPECT rules\n\n" @@ -3924,7 +3933,7 @@ tptr = get_glyph (cptr, gbuf, ','); if (sim_isalpha(gbuf[0]) && (strchr (gbuf, ':'))) { r = tmxr_locate_line_expect (gbuf, &exp); if (r != SCPE_OK) - return r; + return sim_messagef (r, "No such active line: %s\n", gbuf); cptr = tptr; } else