interesting
/
riscv-openocd
mirror of https://github.com/riscv/riscv-openocd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Replace "daemon" with "server" in user-visible strings 

Since OpenOCD doesn't fit most common definitions of the word "daemon",
using it in the documentation is confusing.

Reported by IRC user ohsix.

Change-Id: I688d722771b084b17c2a7af8e83fd64bab6141b8
Signed-off-by: Paul Fertser <fercerpav@gmail.com>
Reviewed-on: http://openocd.zylin.com/3634
Reviewed-by: Andreas Fritiofson <andreas.fritiofson@gmail.com>
Tested-by: jenkins
This commit is contained in:
Paul Fertser 2016-08-10 09:40:34 +03:00 committed by Andreas Fritiofson
parent 7d2ad65c64
commit 21832327ee
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
doc/openocd.texi
View File

@ -66,7 +66,7 @@ Free Documentation License''.
* Running:: Running OpenOCD * Running:: Running OpenOCD
* OpenOCD Project Setup:: OpenOCD Project Setup * OpenOCD Project Setup:: OpenOCD Project Setup
* Config File Guidelines:: Config File Guidelines * Config File Guidelines:: Config File Guidelines
* Daemon Configuration:: Daemon Configuration * Server Configuration:: Server Configuration
* Debug Adapter Configuration:: Debug Adapter Configuration * Debug Adapter Configuration:: Debug Adapter Configuration
* Reset Configuration:: Reset Configuration * Reset Configuration:: Reset Configuration
* TAP Declaration:: TAP Declaration * TAP Declaration:: TAP Declaration
@ -752,13 +752,13 @@ on the command line or, if there were no @option{-c command} or
At the end of the configuration stage it verifies the JTAG scan At the end of the configuration stage it verifies the JTAG scan
chain defined using those commands; your configuration should chain defined using those commands; your configuration should
ensure that this always succeeds. ensure that this always succeeds.
Normally, OpenOCD then starts running as a daemon. Normally, OpenOCD then starts running as a server.
Alternatively, commands may be used to terminate the configuration Alternatively, commands may be used to terminate the configuration
stage early, perform work (such as updating some flash memory), stage early, perform work (such as updating some flash memory),
and then shut down without acting as a daemon. and then shut down without acting as a server.
Once OpenOCD starts running as a daemon, it waits for connections from Once OpenOCD starts running as a server, it waits for connections from
clients (Telnet, GDB, Other) and processes the commands issued through clients (Telnet, GDB, RPC) and processes the commands issued through
those channels. those channels.
If you are having problems, you can enable internal debug messages via If you are having problems, you can enable internal debug messages via
@ -775,7 +775,7 @@ informational messages, warnings and errors. You can also change this
setting from within a telnet or gdb session using @command{debug_level<n>} setting from within a telnet or gdb session using @command{debug_level<n>}
(@pxref{debuglevel,,debug_level}). (@pxref{debuglevel,,debug_level}).
You can redirect all output from the daemon to a file using the You can redirect all output from the server to a file using the
@option{-l <logfile>} switch. @option{-l <logfile>} switch.
Note! OpenOCD will launch the GDB & telnet server even if it can not Note! OpenOCD will launch the GDB & telnet server even if it can not
@ -1994,8 +1994,8 @@ proc setc15 @{regs value@} @{
@node Daemon Configuration @node Server Configuration
@chapter Daemon Configuration @chapter Server Configuration
@cindex initialization @cindex initialization
The commands here are commonly found in the openocd.cfg file and are The commands here are commonly found in the openocd.cfg file and are
used to specify what TCP/IP ports are used, and how GDB should be used to specify what TCP/IP ports are used, and how GDB should be
@ -6715,7 +6715,7 @@ port is 5555.
@end itemize @end itemize
@section Daemon Commands @section Server Commands
@deffn {Command} exit @deffn {Command} exit
Exits the current telnet session. Exits the current telnet session.
@ -6741,7 +6741,7 @@ Useful in connection with script files
@end deffn @end deffn
@deffn Command shutdown [@option{error}] @deffn Command shutdown [@option{error}]
Close the OpenOCD daemon, disconnecting all clients (GDB, telnet, Close the OpenOCD server, disconnecting all clients (GDB, telnet,
other). If option @option{error} is used, OpenOCD will return a other). If option @option{error} is used, OpenOCD will return a
non-zero exit code to the parent process. non-zero exit code to the parent process.
@end deffn @end deffn

4
src/target/image.c
View File

@ -729,7 +729,7 @@ int image_open(struct image *image, const char *url, const char *type_string)
retval = image_ihex_buffer_complete(image); retval = image_ihex_buffer_complete(image);
if (retval != ERROR_OK) { if (retval != ERROR_OK) {
LOG_ERROR( LOG_ERROR(
"failed buffering IHEX image, check daemon output for additional information"); "failed buffering IHEX image, check server output for additional information");
fileio_close(image_ihex->fileio); fileio_close(image_ihex->fileio);
return retval; return retval;
} }
@ -780,7 +780,7 @@ int image_open(struct image *image, const char *url, const char *type_string)
retval = image_mot_buffer_complete(image); retval = image_mot_buffer_complete(image);
if (retval != ERROR_OK) { if (retval != ERROR_OK) {
LOG_ERROR( LOG_ERROR(
"failed buffering S19 image, check daemon output for additional information"); "failed buffering S19 image, check server output for additional information");
fileio_close(image_mot->fileio); fileio_close(image_mot->fileio);
return retval; return retval;
} }