folkert/simh-testsetgenerator
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Standardized scp command formatting in help output

Browse source
This commit is contained in:
Mark Pizzolato 2013-01-15 06:21:32 -08:00
parent 3ce1ef2b33
commit 6eb3804620
4 changed files with 32 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
sim_disk.c
View file

@ -1167,13 +1167,13 @@ if (0 == (uptr-dptr->units)) {
for (i=0; i < dptr->numunits; ++i) for (i=0; i < dptr->numunits; ++i)
if (dptr->units[i].flags & UNIT_ATTABLE) if (dptr->units[i].flags & UNIT_ATTABLE)
fprintf (st, " sim> attach {switches} %s%d diskfile\n", dptr->name, i); fprintf (st, " sim> ATTACH {switches} %s%d diskfile\n", dptr->name, i);
} }
else else
fprintf (st, " sim> attach {switches} %s diskfile\n", dptr->name); fprintf (st, " sim> ATTACH {switches} %s diskfile\n", dptr->name);
} }
else else
fprintf (st, " sim> attach {switches} %s diskfile\n\n", dptr->name); fprintf (st, " sim> ATTACH {switches} %s diskfile\n\n", dptr->name);
fprintf (st, "\n%s attach command switches\n", dptr->name); fprintf (st, "\n%s attach command switches\n", dptr->name);
fprintf (st, " -R Attach Read Only.\n"); fprintf (st, " -R Attach Read Only.\n");
fprintf (st, " -E Must Exist (if not specified an attempt to create the indicated\n"); fprintf (st, " -E Must Exist (if not specified an attempt to create the indicated\n");

6
sim_ether.c
View file

@ -1972,14 +1972,14 @@ return SCPE_OK;
t_stat eth_attach_help(FILE *st, DEVICE *dptr, UNIT *uptr, int32 flag, char *cptr) t_stat eth_attach_help(FILE *st, DEVICE *dptr, UNIT *uptr, int32 flag, char *cptr)
{ {
fprintf (st, "%s attach help\n\n", dptr->name); fprintf (st, "%s attach help\n\n", dptr->name);
fprintf (st, " sim> show ethernet\n"); fprintf (st, " sim> SHOW ETHERNET\n");
fprintf (st, " libpcap version 1.0.0\n"); fprintf (st, " libpcap version 1.0.0\n");
fprintf (st, " ETH devices:\n"); fprintf (st, " ETH devices:\n");
fprintf (st, " eth0 en0 (No description available)\n"); fprintf (st, " eth0 en0 (No description available)\n");
fprintf (st, " eth1 tap:tapN (Integrated Tun/Tap support)\n"); fprintf (st, " eth1 tap:tapN (Integrated Tun/Tap support)\n");
fprintf (st, " sim> attach %s eth0\n\n", dptr->name); fprintf (st, " sim> ATTACH %s eth0\n\n", dptr->name);
fprintf (st, "or equivalently:\n\n"); fprintf (st, "or equivalently:\n\n");
fprintf (st, " sim> attach %s en0\n\n", dptr->name); fprintf (st, " sim> ATTACH %s en0\n\n", dptr->name);
return SCPE_OK; return SCPE_OK;
} }

6
sim_tape.c
View file

@ -525,13 +525,13 @@ if (0 == (uptr-dptr->units)) {
for (i=0; i < dptr->numunits; ++i) for (i=0; i < dptr->numunits; ++i)
if (dptr->units[i].flags & UNIT_ATTABLE) if (dptr->units[i].flags & UNIT_ATTABLE)
fprintf (st, " sim> attach {switches} %s%d tapefile\n\n", dptr->name, i); fprintf (st, " sim> ATTACH {switches} %s%d tapefile\n\n", dptr->name, i);
} }
else else
fprintf (st, " sim> attach {switches} %s tapefile\n\n", dptr->name); fprintf (st, " sim> ATTACH {switches} %s tapefile\n\n", dptr->name);
} }
else else
fprintf (st, " sim> attach {switches} %s tapefile\n\n", dptr->name); fprintf (st, " sim> ATTACH {switches} %s tapefile\n\n", dptr->name);
fprintf (st, "Attach command switches\n"); fprintf (st, "Attach command switches\n");
fprintf (st, " -R Attach Read Only.\n"); fprintf (st, " -R Attach Read Only.\n");
fprintf (st, " -E Must Exist (if not specified an attempt to create the indicated\n"); fprintf (st, " -E Must Exist (if not specified an attempt to create the indicated\n");

46
sim_tmxr.c
View file

@ -2137,16 +2137,16 @@ if (single_line) { /* Single Line Multiplexer */
fprintf (st, "Telnet protocol via sockets, or to hardware terminals via host serial\n"); fprintf (st, "Telnet protocol via sockets, or to hardware terminals via host serial\n");
fprintf (st, "ports.\n\n"); fprintf (st, "ports.\n\n");
fprintf (st, "A Telnet listening port can be configured with:\n\n"); fprintf (st, "A Telnet listening port can be configured with:\n\n");
fprintf (st, " sim> attach %s {interface:}port\n\n", dptr->name); fprintf (st, " sim> ATTACH %s {interface:}port\n\n", dptr->name);
fprintf (st, "Line buffering can be enabled for the %s device with:\n\n", dptr->name); fprintf (st, "Line buffering can be enabled for the %s device with:\n\n", dptr->name);
fprintf (st, " sim> attach %s Buffer{=bufsize}\n\n", dptr->name); fprintf (st, " sim> ATTACH %s Buffer{=bufsize}\n\n", dptr->name);
fprintf (st, "Line buffering can be disabled for the %s device with:\n\n", dptr->name); fprintf (st, "Line buffering can be disabled for the %s device with:\n\n", dptr->name);
fprintf (st, " sim> attach %s NoBuffer\n\n", dptr->name); fprintf (st, " sim> ATTACH %s NoBuffer\n\n", dptr->name);
fprintf (st, "The default buffer size is 32k bytes, the max buffer size is 1024k bytes\n\n"); fprintf (st, "The default buffer size is 32k bytes, the max buffer size is 1024k bytes\n\n");
fprintf (st, "The outbound traffic the %s device can be logged to a file with:\n", dptr->name); fprintf (st, "The outbound traffic the %s device can be logged to a file with:\n", dptr->name);
fprintf (st, " sim> attach %s Log=LogFileName\n\n", dptr->name); fprintf (st, " sim> ATTACH %s Log=LogFileName\n\n", dptr->name);
fprintf (st, "File logging can be disabled for the %s device with:\n\n", dptr->name); fprintf (st, "File logging can be disabled for the %s device with:\n\n", dptr->name);
fprintf (st, " sim> attach %s NoLog\n\n", dptr->name); fprintf (st, " sim> ATTACH %s NoLog\n\n", dptr->name);
fprintf (st, "The %s device may be connected to a serial port on the host system.\n", dptr->name); fprintf (st, "The %s device may be connected to a serial port on the host system.\n", dptr->name);
} }
else { else {
@ -2155,21 +2155,21 @@ else {
fprintf (st, "ports. Concurrent Telnet and serial connections may be mixed on a given\n"); fprintf (st, "ports. Concurrent Telnet and serial connections may be mixed on a given\n");
fprintf (st, "multiplexer.\n\n"); fprintf (st, "multiplexer.\n\n");
fprintf (st, "A Telnet listening port can be configured with:\n\n"); fprintf (st, "A Telnet listening port can be configured with:\n\n");
fprintf (st, " sim> attach %s {interface:}port\n\n", dptr->name); fprintf (st, " sim> ATTACH %s {interface:}port\n\n", dptr->name);
if (mux) if (mux)
fprintf (st, "Line buffering for all %d lines on the %s device can be configured with:\n\n", mux->lines, dptr->name); fprintf (st, "Line buffering for all %d lines on the %s device can be configured with:\n\n", mux->lines, dptr->name);
else else
fprintf (st, "Line buffering for all lines on the %s device can be configured with:\n\n", dptr->name); fprintf (st, "Line buffering for all lines on the %s device can be configured with:\n\n", dptr->name);
fprintf (st, " sim> attach %s Buffer{=bufsize}\n\n", dptr->name); fprintf (st, " sim> ATTACH %s Buffer{=bufsize}\n\n", dptr->name);
if (mux) if (mux)
fprintf (st, "Line buffering for all %d lines on the %s device can be disabled with:\n\n", mux->lines, dptr->name); fprintf (st, "Line buffering for all %d lines on the %s device can be disabled with:\n\n", mux->lines, dptr->name);
else else
fprintf (st, "Line buffering for all lines on the %s device can be disabled with:\n\n", dptr->name); fprintf (st, "Line buffering for all lines on the %s device can be disabled with:\n\n", dptr->name);
fprintf (st, " sim> attach %s NoBuffer\n\n", dptr->name); fprintf (st, " sim> ATTACH %s NoBuffer\n\n", dptr->name);
fprintf (st, "The default buffer size is 32k bytes, the max buffer size is 1024k bytes\n\n"); fprintf (st, "The default buffer size is 32k bytes, the max buffer size is 1024k bytes\n\n");
fprintf (st, "The outbound traffic for the lines of the %s device can be logged to files\n", dptr->name); fprintf (st, "The outbound traffic for the lines of the %s device can be logged to files\n", dptr->name);
fprintf (st, "with:\n\n"); fprintf (st, "with:\n\n");
fprintf (st, " sim> attach %s Log=LogFileName\n\n", dptr->name); fprintf (st, " sim> ATTACH %s Log=LogFileName\n\n", dptr->name);
fprintf (st, "The log file name for each line uses the above LogFileName as a template\n"); fprintf (st, "The log file name for each line uses the above LogFileName as a template\n");
fprintf (st, "for the actual file name which will be LogFileName_n where n is the line\n"); fprintf (st, "for the actual file name which will be LogFileName_n where n is the line\n");
fprintf (st, "number.\n\n"); fprintf (st, "number.\n\n");
@ -2180,19 +2180,19 @@ fprintf (st, "or using simh generic serial names. simh generic names are of the
fprintf (st, "serN, where N is from 0 thru one less than the maximum number of serial\n"); fprintf (st, "serN, where N is from 0 thru one less than the maximum number of serial\n");
fprintf (st, "ports on the local system. The mapping of simh generic port names to OS \n"); fprintf (st, "ports on the local system. The mapping of simh generic port names to OS \n");
fprintf (st, "specific names can be displayed using the following command:\n\n"); fprintf (st, "specific names can be displayed using the following command:\n\n");
fprintf (st, " sim> show serial\n"); fprintf (st, " sim> SHOW SERIAL\n");
fprintf (st, " Serial devices:\n"); fprintf (st, " Serial devices:\n");
fprintf (st, " ser0 COM1 (\\Device\\Serial0)\n"); fprintf (st, " ser0 COM1 (\\Device\\Serial0)\n");
fprintf (st, " ser1 COM3 (Winachcf0)\n\n"); fprintf (st, " ser1 COM3 (Winachcf0)\n\n");
if (single_line) { /* Single Line Multiplexer */ if (single_line) { /* Single Line Multiplexer */
fprintf (st, " sim> attach %s Connect=ser0\n\n", dptr->name); fprintf (st, " sim> ATTACH %s Connect=ser0\n\n", dptr->name);
fprintf (st, "or equivalently:\n\n"); fprintf (st, "or equivalently:\n\n");
fprintf (st, " sim> attach %s Connect=COM1\n\n", dptr->name); fprintf (st, " sim> ATTACH %s Connect=COM1\n\n", dptr->name);
} }
else { else {
fprintf (st, " sim> attach %s Line=n,Connect=ser0\n\n", dptr->name); fprintf (st, " sim> ATTACH %s Line=n,Connect=ser0\n\n", dptr->name);
fprintf (st, "or equivalently:\n\n"); fprintf (st, "or equivalently:\n\n");
fprintf (st, " sim> attach %s Line=n,Connect=COM1\n\n", dptr->name); fprintf (st, " sim> ATTACH %s Line=n,Connect=COM1\n\n", dptr->name);
if (mux) if (mux)
fprintf (st, "Valid line numbers are from 0 thru %d\n\n", mux->lines-1); fprintf (st, "Valid line numbers are from 0 thru %d\n\n", mux->lines-1);
} }
@ -2216,25 +2216,25 @@ fprintf (st, "This will help to confirm the correct port has been connected and\
fprintf (st, "that the port settings are reasonable for the connected device.\n"); fprintf (st, "that the port settings are reasonable for the connected device.\n");
fprintf (st, "This would be done as:\n\n"); fprintf (st, "This would be done as:\n\n");
if (single_line) /* Single Line Multiplexer */ if (single_line) /* Single Line Multiplexer */
fprintf (st, " sim> attach -V %s Connect=SerN\n", dptr->name); fprintf (st, " sim> ATTACH -V %s Connect=SerN\n", dptr->name);
else { else {
fprintf (st, " sim> attach -V %s Line=n,Connect=SerN\n\n", dptr->name); fprintf (st, " sim> ATTACH -V %s Line=n,Connect=SerN\n\n", dptr->name);
fprintf (st, "Line specific tcp listening ports are supported. These are configured\n"); fprintf (st, "Line specific tcp listening ports are supported. These are configured\n");
fprintf (st, "using commands of the form:\n\n"); fprintf (st, "using commands of the form:\n\n");
fprintf (st, " sim> attach %s Line=n,{interface:}port{;notelnet}\n\n", dptr->name); fprintf (st, " sim> ATTACH %s Line=n,{interface:}port{;notelnet}\n\n", dptr->name);
} }
fprintf (st, "Direct computer to computer connections (Virutal Null Modem cables) may\n"); fprintf (st, "Direct computer to computer connections (Virutal Null Modem cables) may\n");
fprintf (st, "be established using the telnet protocol or via raw tcp sockets.\n\n"); fprintf (st, "be established using the telnet protocol or via raw tcp sockets.\n\n");
fprintf (st, " sim> attach %s Line=n,Connect=host:port{;notelnet}\n\n", dptr->name); fprintf (st, " sim> ATTACH %s Line=n,Connect=host:port{;notelnet}\n\n", dptr->name);
fprintf (st, "Computer to computer virtual connections can be one way (as illustrated\n"); fprintf (st, "Computer to computer virtual connections can be one way (as illustrated\n");
fprintf (st, "above) or symmetric. A symmetric connection is configured by combining\n"); fprintf (st, "above) or symmetric. A symmetric connection is configured by combining\n");
if (single_line) { /* Single Line Multiplexer */ if (single_line) { /* Single Line Multiplexer */
fprintf (st, "a one way connection with a tcp listening port on the same line:\n\n"); fprintf (st, "a one way connection with a tcp listening port on the same line:\n\n");
fprintf (st, " sim> attach %s listenport,Connect=host:port\n\n", dptr->name); fprintf (st, " sim> ATTACH %s listenport,Connect=host:port\n\n", dptr->name);
} }
else { else {
fprintf (st, "a one way connection with a tcp listening port on the same line:\n\n"); fprintf (st, "a one way connection with a tcp listening port on the same line:\n\n");
fprintf (st, " sim> attach %s Line=n,listenport,Connect=host:port\n\n", dptr->name); fprintf (st, " sim> ATTACH %s Line=n,listenport,Connect=host:port\n\n", dptr->name);
} }
fprintf (st, "When symmetric virtual connections are configured, incoming connections\n"); fprintf (st, "When symmetric virtual connections are configured, incoming connections\n");
fprintf (st, "on the specified listening port are checked to assure that they actually\n"); fprintf (st, "on the specified listening port are checked to assure that they actually\n");
@ -2243,20 +2243,20 @@ if (single_line) /* Single Line Multiplexer */
fprintf (st, "The connection configured for the %s device is unconfigured by:\n\n", dptr->name); fprintf (st, "The connection configured for the %s device is unconfigured by:\n\n", dptr->name);
else else
fprintf (st, "All connections configured for the %s device are unconfigured by:\n\n", dptr->name); fprintf (st, "All connections configured for the %s device are unconfigured by:\n\n", dptr->name);
fprintf (st, " sim> detach %s\n\n", dptr->name); fprintf (st, " sim> DETACH %s\n\n", dptr->name);
if (dptr->modifiers) { if (dptr->modifiers) {
MTAB *mptr; MTAB *mptr;
for (mptr = dptr->modifiers; mptr->mask != 0; mptr++) for (mptr = dptr->modifiers; mptr->mask != 0; mptr++)
if (mptr->valid == &tmxr_dscln) { if (mptr->valid == &tmxr_dscln) {
fprintf (st, "A specific line on the %s device can be disconnected with:\n\n", dptr->name); fprintf (st, "A specific line on the %s device can be disconnected with:\n\n", dptr->name);
fprintf (st, " sim> set %s %s=n\n\n", dptr->name, mptr->mstring); fprintf (st, " sim> SET %s %s=n\n\n", dptr->name, mptr->mstring);
fprintf (st, "This will cause a telnet connection to be closed, but a serial port will\n"); fprintf (st, "This will cause a telnet connection to be closed, but a serial port will\n");
fprintf (st, "normally have DTR dropped for 500ms and raised again (thus hanging up a\n"); fprintf (st, "normally have DTR dropped for 500ms and raised again (thus hanging up a\n");
fprintf (st, "modem on that serial port).\n\n"); fprintf (st, "modem on that serial port).\n\n");
fprintf (st, "A line which is connected to a serial port can be manually closed by\n"); fprintf (st, "A line which is connected to a serial port can be manually closed by\n");
fprintf (st, "adding the -C switch to a %s command.\n\n", mptr->mstring); fprintf (st, "adding the -C switch to a %s command.\n\n", mptr->mstring);
fprintf (st, " sim> set -C %s %s=n\n\n", dptr->name, mptr->mstring); fprintf (st, " sim> SET -C %s %s=n\n\n", dptr->name, mptr->mstring);
} }
} }
return SCPE_OK; return SCPE_OK;