From 7c5acf8660ddfce4746152e03749b699532f513f Mon Sep 17 00:00:00 2001 From: Antonio Borneo Date: Wed, 30 Dec 2009 07:48:49 +0800 Subject: [PATCH] whitespace cleanup, mostly for docs Remove useless space/tab at end of lines. Remove spaces in indentation and replace with tab. Signed-off-by: Antonio Borneo Signed-off-by: David Brownell --- BUGS | 4 +- NEWS-0.2.0 | 4 +- NEWTAPS | 12 +- PATCHES | 2 +- README.Win32 | 8 +- TODO | 14 +- bootstrap | 2 +- configure.in | 2 +- doc/manual/primer/commands.txt | 2 +- doc/manual/release.txt | 2 +- doc/manual/server.txt | 2 +- doc/openocd.texi | 24 +- ecosflash/notes.txt | 2 +- src/server/httpd/menu.xml | 458 +++++++++++++++--------------- src/server/httpd/menu.xsl | 240 ++++++++-------- src/server/httpd/menuweb.css | 6 +- src/server/httpd/readme.txt | 2 +- testing/examples/PIC32/readme.txt | 5 +- testing/index.html | 6 +- testing/profile_stm32.txt | 2 +- testing/smoketests.html | 2 +- testing/testcases.html | 2 +- 22 files changed, 401 insertions(+), 402 deletions(-) diff --git a/BUGS b/BUGS index 69675256c..961b33940 100644 --- a/BUGS +++ b/BUGS @@ -22,7 +22,7 @@ that may be important. - If the report is for a regression: - Include logs for both working and broken versions. - Find the precise version that caused the regression by binary search. - You can use "git bisect" to expedite this binary search: + You can use "git bisect" to expedite this binary search: http://www.kernel.org/pub/software/scm/git/docs/git-bisect.html If possible, please develop and attach a patch that helps to expose or @@ -36,7 +36,7 @@ in total. @section bugscrashdump Obtaining Crash Backtraces If OpenOCD is crashing, there are two very effective things you can do to -improve your chances of getting help on the development mailing list. +improve your chances of getting help on the development mailing list. Try to reproduce the problem using the dummy JTAG interface to allow other developers to replicate your problem robustly and use GDB to get a trace:@par diff --git a/NEWS-0.2.0 b/NEWS-0.2.0 index f56c7a4f3..742692684 100644 --- a/NEWS-0.2.0 +++ b/NEWS-0.2.0 @@ -9,7 +9,7 @@ must past stricter value checks, and many more error conditions have been handled correctly. These efforts helped to make the 0.2.0 release more stable and robust, though some changes may expose latent bugs in your existing configuration scripts. - + This release does not maintain backward compatibility in all respects, so some target or configuration scripts may need to be updated. In some cases, you may also see warnings; resolve those, because they indicate @@ -20,7 +20,7 @@ The following areas of OpenOCD functionality changed in this release: JTAG Layer: - Improves modularity: core, TCL, driver commands, and interface have been separated, encapsulated, and documented for developers. Mostly. -- Improves JTAG TAP transition tables: +- Improves JTAG TAP transition tables: * Makes TAP paths variable length, rather than being fixed at 7 steps. * Fixes problems with some targets that did not like longer paths. - Improves JTAG driver/minidriver modularity and encapsulation. diff --git a/NEWTAPS b/NEWTAPS index 2fc6f12b6..e78905445 100644 --- a/NEWTAPS +++ b/NEWTAPS @@ -30,7 +30,7 @@ Version Number Changes: not a big deal. Please do report this information. We'd like to know about it. - For example + For example Error: ERROR: Tap: s3c4510.cpu - Expected id: 0x3f0f0f0f, Got: 0x1f0f0f0f Error: ERROR: expected: mfg: 0x787, part: 0xf0f0, ver: 0x3 @@ -39,7 +39,7 @@ Error: ERROR: got: mfg: 0x787, part: 0xf0f0, ver: 0x1 ======================================== Updating the Tap ID number your self - + Why do this? You just want the warning to go away. And don't want to update your version/instance of OpenOCD. @@ -79,11 +79,11 @@ Examples: 0x3f0f0f0f - is a newer ARM7TDMI 0x3ba00477 - is an ARM cortex M3 -Some chips have multiple JTAG taps - be sure to list +Some chips have multiple JTAG taps - be sure to list each one individually - ORDER is important! ======================================== -B) The maker of the part +B) The maker of the part Examples: Xilinx, Atmel, ST Micro Systems, Freescale @@ -94,7 +94,7 @@ C) The family of parts it belongs to Examples: "NXP LPC Series" "Atmel SAM7 Series" - + ======================================== D) The actual part number on the package @@ -121,7 +121,7 @@ For example: A consumer GPS unit or a cellphone ie: Olimex, LogicPD, Freescale(eval board) ======================================== - + (G) Identifying information on the board. Not good: "iar red ST eval board" diff --git a/PATCHES b/PATCHES index 74a76fdb4..856b09477 100644 --- a/PATCHES +++ b/PATCHES @@ -32,7 +32,7 @@ in response to feedback. Add yourself to the GPL copyright for non-trivial changes. To create a patch from the command line: -@code +@code git diff >mypatch.txt @endcode diff --git a/README.Win32 b/README.Win32 index bec4567a2..6c690c9cd 100644 --- a/README.Win32 +++ b/README.Win32 @@ -27,8 +27,8 @@ based JTAG debuggers. http://sourceforge.net/projects/libusb-win32/ -You need to download the libusb-win32-device-bin-0.1.12.2.tar.gz -package. Extract this file into a temp directory. +You need to download the libusb-win32-device-bin-0.1.12.2.tar.gz +package. Extract this file into a temp directory. Copy the file libusb-win32-device-bin-0.1.12.2\include\usb.h to your MinGW include directory. @@ -59,10 +59,10 @@ released source tarball or the git tree. If you are using the git tree, the following are the instructions from README.mingw. You will need to have the cmake utility installed. -- Edit Toolchain-mingw32.cmake to point to the correct MinGW +- Edit Toolchain-mingw32.cmake to point to the correct MinGW installation. - Create a build directory like "mkdir build-win32", e.g in ../libftdi/ -- cd into that directory and run +- cd into that directory and run "cmake -DCMAKE_TOOLCHAIN_FILE=../Toolchain-mingw32.cmake .." - Copy src/ftdi.h to your MinGW include directory. - Copy build-win32/src/*.a to your MinGW lib directory. diff --git a/TODO b/TODO index a9e95f6ee..8fed264bc 100644 --- a/TODO +++ b/TODO @@ -27,8 +27,8 @@ This section provides possible things to improve with OpenOCD's TCL support. parameters. Currently variables assigned through one such parameter command/script are unset before the next one is invoked. -- Isolate all TCL command support: - - Pure C CLI implementations using --disable-builtin-tcl. +- Isolate all TCL command support: + - Pure C CLI implementations using --disable-builtin-tcl. - Allow developers to build new dongles using OpenOCD's JTAG core. - At first, provide only low-level JTAG support; target layer and above rely heavily on scripting event mechanisms. @@ -112,7 +112,7 @@ TCP/IP packets handled by the server. @section thelistswd Serial Wire Debug -- implement Serial Wire Debug interface +- implement Serial Wire Debug interface @section thelistbs Boundary Scan Support @@ -163,7 +163,7 @@ https://lists.berlios.de/pipermail/openocd-development/2009-October/011506.html use hardware stepping if available. - mdb can return garbage data if read byte operation fails for a memory region(16 & 32 byte access modes may be supported). Is this - a bug in the .MX31 PDK init script? Try on i.MX31 PDK: + a bug in the .MX31 PDK init script? Try on i.MX31 PDK: mdw 0xb80005f0 0x8, mdh 0xb80005f0 0x10, mdb 0xb80005f0 0x20. mdb returns garabage. - implement missing functionality (grep FNC_INFO_NOTIMPLEMENTED ...) @@ -197,8 +197,8 @@ https://lists.berlios.de/pipermail/openocd-development/2009-October/011506.html @section thelistsvf SVF/XSVF -- develop SVF unit tests -- develop XSVF unit tests +- develop SVF unit tests +- develop XSVF unit tests @section thelistflash Flash Support @@ -328,7 +328,7 @@ at the bottom of the list below. Example, on amd64: from unaligned memory addresses - libopenocd support: @par https://lists.berlios.de/pipermail/openocd-development/2009-May/006405.html -- review and clean up interface/target/flash APIs +- review and clean up interface/target/flash APIs The following strategic tasks will require ambition, knowledge, and time to complete: diff --git a/bootstrap b/bootstrap index 268d07c16..9094a27cc 100755 --- a/bootstrap +++ b/bootstrap @@ -1,7 +1,7 @@ #!/bin/sh -e # Run the autotools bootstrap sequence to create the configure script -# Stop execution as soon as we have an unknown command +# Stop execution as soon as we have an unknown command set -e if libtoolize --version >/dev/null 2>&1; then diff --git a/configure.in b/configure.in index 21edba920..ecc9c6d6a 100644 --- a/configure.in +++ b/configure.in @@ -559,7 +559,7 @@ case $host in AC_MSG_WARN([--disable-parport-giveio is not supported by MinGW32 hosts]) fi parport_use_giveio=yes - + CFLAGS="$CFLAGS -D__USE_MINGW_ANSI_STDIO" AC_DEFINE(IS_MINGW, 1, [1 if building for MinGW.]) diff --git a/doc/manual/primer/commands.txt b/doc/manual/primer/commands.txt index c9db7ccb0..616973498 100644 --- a/doc/manual/primer/commands.txt +++ b/doc/manual/primer/commands.txt @@ -55,7 +55,7 @@ static COMMAND_HELPER(handle_hello_args, const char **sep, const char **name) @endcode Of course, you may also call other macros or functions, but that extends -beyond the scope of this tutorial on writing commands. +beyond the scope of this tutorial on writing commands. @section primercmdreg Command Registration diff --git a/doc/manual/release.txt b/doc/manual/release.txt index 737cf1396..70a22ffdc 100644 --- a/doc/manual/release.txt +++ b/doc/manual/release.txt @@ -399,7 +399,7 @@ affect its behavior: @section releasetutorial Release Tutorials -This section should contain a brief tutorial for using the Release +This section should contain a brief tutorial for using the Release Script to perform release tasks, but the new script needs to be used for 0.3.0. diff --git a/doc/manual/server.txt b/doc/manual/server.txt index 57bac4a37..5250f7f11 100644 --- a/doc/manual/server.txt +++ b/doc/manual/server.txt @@ -320,6 +320,6 @@ openocd -s /usr/local/share/openocd -f httpd/httpd.tcl -f interface/dummy.cfg -f Navigate to: http://localhost:8888/ - + */ diff --git a/doc/openocd.texi b/doc/openocd.texi index 02caf5b12..7281d717b 100644 --- a/doc/openocd.texi +++ b/doc/openocd.texi @@ -3757,14 +3757,14 @@ Use it in board specific configuration files, not interactively. @comment the REAL name for this command is "ocd_flash_banks" @comment less confusing would be: "flash list" (like "nand list") @deffn Command {flash banks} -Prints a one-line summary of each device that was +Prints a one-line summary of each device that was declared using @command{flash bank}, numbered from zero. Note that this is the @emph{plural} form; the @emph{singular} form is a very different command. @end deffn @deffn Command {flash list} -Retrieves a list of associative arrays for each device that was +Retrieves a list of associative arrays for each device that was declared using @command{flash bank}, numbered from zero. This returned list can be manipulated easily from within scripts. @end deffn @@ -4914,28 +4914,28 @@ nand device $NANDFLASH at91sam9 $CHIPNAME 0x40000000 0xfffffe800 @end example AT91SAM9 chips support single-bit ECC hardware. The @code{write_page} and @code{read_page} methods are used to utilize the ECC hardware unless they are -disabled by using the @command{nand raw_access} command. There are four +disabled by using the @command{nand raw_access} command. There are four additional commands that are needed to fully configure the AT91SAM9 NAND controller. Two are optional; most boards use the same wiring for ALE/CLE: @deffn Command {at91sam9 cle} num addr_line -Configure the address line used for latching commands. The @var{num} +Configure the address line used for latching commands. The @var{num} parameter is the value shown by @command{nand list}. @end deffn @deffn Command {at91sam9 ale} num addr_line -Configure the address line used for latching addresses. The @var{num} +Configure the address line used for latching addresses. The @var{num} parameter is the value shown by @command{nand list}. @end deffn -For the next two commands, it is assumed that the pins have already been +For the next two commands, it is assumed that the pins have already been properly configured for input or output. @deffn Command {at91sam9 rdy_busy} num pio_base_addr pin -Configure the RDY/nBUSY input from the NAND device. The @var{num} -parameter is the value shown by @command{nand list}. @var{pio_base_addr} +Configure the RDY/nBUSY input from the NAND device. The @var{num} +parameter is the value shown by @command{nand list}. @var{pio_base_addr} is the base address of the PIO controller and @var{pin} is the pin number. @end deffn @deffn Command {at91sam9 ce} num pio_base_addr pin -Configure the chip enable input to the NAND device. The @var{num} -parameter is the value shown by @command{nand list}. @var{pio_base_addr} +Configure the chip enable input to the NAND device. The @var{num} +parameter is the value shown by @command{nand list}. @var{pio_base_addr} is the base address of the PIO controller and @var{pin} is the pin number. @end deffn @end deffn @@ -5824,7 +5824,7 @@ and using the MCR instruction. an ARM register.) @end deffn -@deffn Command {arm mrc} pX coproc op1 CRn CRm op2 +@deffn Command {arm mrc} pX coproc op1 CRn CRm op2 Read a coprocessor @var{pX} register passing parameters @var{CRn}, @var{CRm}, opcodes @var{opc1} and @var{opc2}, and the MRC instruction. @@ -5843,7 +5843,7 @@ core mode if necessary. @cindex ARMv5 The ARMv4 and ARMv5 architectures are widely used in embedded systems, -and introduced core parts of the instruction set in use today. +and introduced core parts of the instruction set in use today. That includes the Thumb instruction set, introduced in the ARMv4T variant. diff --git a/ecosflash/notes.txt b/ecosflash/notes.txt index 773db9f27..bf456bbce 100644 --- a/ecosflash/notes.txt +++ b/ecosflash/notes.txt @@ -1,4 +1,4 @@ -Some of these binaries are build & linked using eCos. +Some of these binaries are build & linked using eCos. For source for the flash drivers, see: diff --git a/src/server/httpd/menu.xml b/src/server/httpd/menu.xml index ef1d4ec8a..be1446416 100644 --- a/src/server/httpd/menu.xml +++ b/src/server/httpd/menu.xml @@ -1,26 +1,26 @@ - + index.tcl - Config Target - index.tcl + Config Target + index.tcl OpenOCD debugger index.tcl - - +   @@ -35,18 +35,18 @@ set form_address [formfetch form_address] set form_action [formfetch form_action] - + if {[string compare $form_action "Halt"]==0} { append console [encode [capture_catch "halt"]] } if {[string compare $form_action "Resume"]==0} { append console [encode [capture_catch "resume"]] } - + if {[string compare $form_action "Reset and run"]==0} { append console [encode [capture_catch "reset run"]] } - + if {[string compare $form_action "Power on"]==0} { append console [encode [capture_catch "power on"]] } @@ -54,13 +54,13 @@ append console [encode [capture_catch "power off"]] } - + append console [encode [capture_catch poll]] -
+ @@ -69,32 +69,32 @@
-
-
- +
+
+

]]> Target status shows that status of the connected target.

+

Target status shows that status of the connected target.

Current target - selected target configuration.

Startup - whether or not the target script ran to completion. Note that even if the target is disconnected, powered down or unresponsive, the startup script will still run to completion. Startup - OK does not mean that the target is fully operational, simply that the configuration script - did not contain syntax errors for instance. + did not contain syntax errors for instance. See log for details.

Target power - Detects power on target.
If the JTAG cable is not connected, or the target has no power, then no target power will be detected.

Type "help power" in telnet for command to control power relay.

]]> - + - - + + @@ -103,12 +103,12 @@ Target config quick start guide +

The reset init script is crucial. It will set up e.g. MMU, chip select registers, etc. after a reset. The init.cfg (reset init script) is embedded into the openocd.cfg file in the sampls OpenOCD provides. @@ -116,25 +116,25 @@ Writing an openocd.cfg from scratch is a non-trivial exercise, but fortunally it only has to be done once for a target and afterwards it rarely if ever needs to be changed. - - + + ]]> - - Quick start guide on how to configure a target. + + Quick start guide on how to configure a target. - - + + - + flashinfo.tcl - Flash - flashinfo.tcl + Flash + flashinfo.tcl Flash Information flashinfo.tcl @@ -150,13 +150,13 @@ Configured flash banks: -

+

set flash_return [ocd_flash_banks] if {[llength $flash_return]!=0} { append buffer [encode [flash banks]] - + set form_action [formfetch form_action] if {[string compare $form_action "Reset CPU and probe flash"]==0} { append console [encode [capture_catch "reset init"]] @@ -168,17 +168,17 @@ }

-

+ foreach a [ocd_flash_banks] { append buffer "Flash bank at [format "0x%08x size 0x%08x" $a(base) $a(size)]: " -
+ "> "> - +
@@ -186,7 +186,7 @@ }
- + ]]> @@ -198,7 +198,7 @@ the different sectors in the flash, and the flash driver used.

]]> - + @@ -208,82 +208,82 @@ Program / Verify Flash - + set form_offset [formfetch form_offset] set form_action [formfetch form_action] set form_type [formfetch form_type] - - + + set post "" catch {set post $post_data} err - + if {[string compare $form_offset ""]==0} { set form_offset 0 } if {[string compare $form_type ""]==0} { set form_type "" } - + - + set data "" append buffer {
} - - set action_reset [expr {[string length $form_action]!=0}] - set action_flash [expr {[string compare $form_action "Flash"]==0 || [string compare $form_action "Flash and verify"]==0}] + + set action_reset [expr {[string length $form_action]!=0}] + set action_flash [expr {[string compare $form_action "Flash"]==0 || [string compare $form_action "Flash and verify"]==0}] set action_verify [expr {[string compare $form_action "Verify"]==0 || [string compare $form_action "Flash and verify"]==0}] - + if {$action_reset} { append console [encode [capture_catch "reset init"]] } - + append buffer {} append buffer {} append buffer "" - + - + - - + +
File
Offset
Type
- +
 
 
- +
- +

- + if {$action_flash||$action_verify} { catch {writeform form_filecontent $upload_filename} result append console [encode $result] @@ -313,27 +313,27 @@ } append buffer "" } - - + +

- + ]]>
 - + Program and/or verify the flash on your target.

Flash - Halt CPU, automatically erase flash if required and program flash with image.

Flash and verify - Programs the flash and verifies the programmed flash content is correct.

Verify - Halt CPU and verify image in flash or RAM.

-

Offset - This value is added to the address of the image.
- Binary images start at address 0 by default, whereas elf and ihex have addresses encoded into the image.
+

Offset - This value is added to the address of the image.
+ Binary images start at address 0 by default, whereas elf and ihex have addresses encoded into the image.
Typically 0 for elf/ihex and the address to write the image to for binary files.

- ]]> + ]]> - - + + - + @@ -350,23 +350,23 @@ set form_serialnumber [formfetch form_serialnumber] append buffer [production_info] - +
- + if {[string compare $form_action "Upload firmware"]==0} { - set wrotedata [catch {writeform form_filecontent $upload_filename} result] + set wrotedata [catch {writeform form_filecontent $upload_filename} result] append buffer [encode $result] if {$wrotedata==0} { append buffer "
Running production procedure

" append buffer "
Reset and init:
" - + append console [encode [capture_catch {catch "production $upload_filename $form_serialnumber"}]] } } if {[string compare $form_action "Test"]==0} { append buffer "
Running production test. Output from first 10 seconds printed below.

" - + append console [encode [capture_catch {catch production_test}]] } if {[string compare $form_action "Power on"]==0} { @@ -381,13 +381,13 @@ append buffer {

Firmware file(raw binary)

} append buffer {

Serial number

} - +
 
 
- + @@ -395,55 +395,55 @@
  

- + ]]> - + Upload firmware - Power cycle target, reset target and program raw binary file to flash bank 0, offset 0 and verify flash programming. Leave target powered on.

-

Test - Power up target, run 10 second target test. Output is provided via the DCC output channel.

+

Test - Power up target, run 10 second target test. Output is provided via the DCC output channel.

Power on - Power on target.

Power off - Power off target.

Serial number - A target script can use this string in the production procedure. Type "help production" for more info.

- ]]> + ]]> - - + + - + erase.tcl - erase.tcl + erase.tcl Erase Flash flashinfo.tcl - + set form_address [formfetch form_address] set form_length [formfetch form_length] set form_action [formfetch form_action] - + if {[string compare $form_length ""]==0} { set form_length 0x10000 - } + } if {[string compare $form_address ""]==0} { if {[catch {[first_flash_base]} result]==0} { set form_address "0x[tohex $result]" - } - } - - + } + } + + if {[string compare $form_address ""]!=0} { if {[string compare $form_action "Erase"]==0} { append buffer "" @@ -451,13 +451,13 @@ reset init flash erase_address $form_address $form_length}]] append buffer - } + } } - - + + - -
+ + @@ -468,14 +468,14 @@
Address
Length
 
- -
- - -
- - +
+ + + + + + ]]> The length field is specified in number of bytes.

]]> - + run.tcl - run.tcl + run.tcl Run program flashinfo.tcl set form_address [formfetch form_address] @@ -508,26 +508,26 @@ if {[string compare $form_action "Run from address"]==0} { append console [encode [capture_catch "halt"]] append console [encode [capture_catch "wait_halt"]] append console [encode [capture_catch "resume $form_address"]] -} +} if {[string compare $form_action "Halt"]==0} { append console [encode [capture_catch "halt"]] append console [encode [capture_catch "wait_halt"]] } - + if {[string compare $form_action "Reset and run"]==0} { append console [encode [capture_catch "reset run"]] } - + if {[string compare $form_action "Reset and init"]==0} { append console [encode [capture_catch "reset init"]] -} +} append console [encode [capture_catch poll]] -
+ @@ -537,12 +537,12 @@ append console [encode [capture_catch poll]]
Address
 
- +
- - + + ]]> Reset and init - reset CPU and run init script.

]]> - + browsemem.tcl - Memory - browsemem.tcl + Memory + browsemem.tcl Browse / Edit Memory browsemem.tcl @@ -570,53 +570,53 @@ append console [encode [capture_catch poll]] - + - + set form_address [formfetch form_address] set form_length [formfetch form_length] set form_type [formfetch form_type] set form_action [formfetch form_action] set form_value [formfetch form_value] - + if {[string compare $form_length ""]==0} { set form_length 0 - } + } if {$form_length<=0} { set form_length 0x80 - } + } if {$form_length>0x1000} { set form_length 0x1000 - } - + } + if {[string compare $form_type ""]==0} { set form_type mdw } - + if {[string compare $form_type "mdw"]==0} { set wordsize 4 - set modify_cmd mww + set modify_cmd mww } if {[string compare $form_type "mdh"]==0} { set wordsize 2 - set modify_cmd mwh + set modify_cmd mwh } if {[string compare $form_type "mdb"]==0} { set wordsize 1 - set modify_cmd mwb + set modify_cmd mwb } - - - - + + + + if {[string compare $form_address ""]!=0} { if {[string compare $form_action "Previous"]==0} { # Kludge! Work around problems parsing hex in Jim Tcl expressions @@ -626,24 +626,24 @@ append console [encode [capture_catch poll]] } else { set form_address "0x0" } - } + } if {[string compare $form_action "Next"]==0} { # Kludge! Work around problems parsing hex in Jim Tcl expressions incr form_address ; set form_address [expr $form_address-1] set form_address "0x[tohex [expr $form_address+$form_length]]" - } + } if {[string compare $form_action "Modify"]==0} { append console [capture_catch "$modify_cmd $form_address $form_value"] - } + } if {[string compare $form_action "Fill"]==0} { append console [capture_catch "$modify_cmd $form_address $form_value $form_length"] - } + } } - - + + - -
+ + @@ -652,17 +652,17 @@ append console [encode [capture_catch poll]]
Address
Length">
 
Type - +
@@ -670,14 +670,14 @@ append console [encode [capture_catch poll]]
 
- +
   

- +

Memory:

@@ -686,19 +686,19 @@ append console [encode [capture_catch poll]] if {[string compare $form_address ""]!=0} { append console [encode [capture_catch halt]] append buffer [encode [capture_catch "$form_type $form_address [expr $form_length]"]] - } + } - - + + ]]> Browse and edit target memory.
- Length is in bytes, maximum 4096 bytes.

+ Length is in bytes, maximum 4096 bytes.

An error message is shown when trying to browse or edit memory which cases a CPU fault.

CPU will be halted if required.

Modify - Will modify only one byte, half-word or word starting at Address.

@@ -706,11 +706,11 @@ append console [encode [capture_catch poll]]

Refresh - Display the content of the specified memory area.

]]> - + - + @@ -723,8 +723,8 @@ append console [encode [capture_catch poll]] set form_address [formfetch form_address] set form_length [formfetch form_length] set form_action [formfetch form_action] - -
+ + @@ -736,29 +736,29 @@ append console [encode [capture_catch poll]]
Address
Length
 
- + - - + +
if {[string compare $form_action "Download"]==0} { append console [encode [capture_catch "reset init"]] append console [encode [capture_catch "dump_image /tmp/dump.bin $form_address $form_length"]] -
+
- + } - + - + ]]> - Note that download memory can take a long time(potentially minutes for megabytes at low JTAG clk speeds). @@ -768,25 +768,25 @@ append console [encode [capture_catch poll]] ]]> - + openocd.tcl - OpenOCD - openocd.tcl + OpenOCD + openocd.tcl Run Command openocd.tcl - + 0} { set form_edittext [capture_catch {eval $form_command}] } - + append buffer {
} "\n" append buffer {Command
} - append buffer {
} append buffer {
} - append buffer {
} - + append buffer {
} "\n" - + ]]> - + Run tcl statement(s). Add "ocd_" prefix to OpenOCD commands otherwise @@ -828,28 +828,28 @@ append console [encode [capture_catch poll]] curl --form form_command=ocd_version append buffer [ip]runtcl.tcl - + ]]> - - + + guiupload.tcl openocd.tcl Upload File set form_filename [formfetch form_filename]; set form_action [formfetch form_action]; #set form_filecontent [formfetch form_filecontent]; - + append buffer {
} - append buffer
+ append buffer
if {[string compare $form_action "Upload"]==0} { if {[catch {writeform form_filecontent $form_filename} result]==0} { append buffer [encode $result] @@ -857,20 +857,20 @@ append console [encode [capture_catch poll]] append buffer Wrote $form_filename } } - + append buffer {} append buffer {
Filename on OpenOCD machine
File to upload
} append buffer {
 
 
} append buffer {
} append buffer {
} - + - + ]]> - + - + @@ -879,12 +879,12 @@ append console [encode [capture_catch poll]] Target config quick start guide +

The reset init script is crucial. It will set up e.g. MMU, chip select registers, etc. after a reset. The init.cfg (reset init script) is embedded into the openocd.cfg file in the sampls OpenOCD provides. @@ -892,24 +892,24 @@ append console [encode [capture_catch poll]] Writing an openocd.cfg from scratch is a non-trivial exercise, but fortunally it only has to be done once for a target and afterwards it rarely if ever needs to be changed. - - + + ]]> - - Quick start guide on how to configure a target. + + Quick start guide on how to configure a target. - - + + - + - index.tcl + index.tcl index.tcl terminal.tcl UART forwarding @@ -924,27 +924,27 @@ append console [encode [capture_catch poll]] set form_action [formfetch form_action]

- Target baudrate: + Target baudrate: -

+

-

+ if {[string compare $form_action "Set baudrate"]==0} { append console [encode [ocd_uart $form_baudrate]] } - +

Simple UART

This terminal window is purely for illustrative purposes. Use telnet or a terminal program to talk to the target over TCP/IP for anything but trivial case of reading/writing a few @@ -963,11 +963,11 @@ append console [encode [capture_catch poll]] ]]> - + - + - - \ No newline at end of file + + diff --git a/src/server/httpd/menu.xsl b/src/server/httpd/menu.xsl index 7b47d9e07..b54f16c78 100644 --- a/src/server/httpd/menu.xsl +++ b/src/server/httpd/menu.xsl @@ -2,7 +2,7 @@ ]> @@ -16,17 +16,17 @@ OpenOCD debugger - - - + + + - - + + set console "" set upload_filename /ram/upload - +
@@ -92,17 +92,17 @@ - + - + - + @@ -142,96 +142,96 @@ - - - - -
-   -
- - - - -

- - - - + + + + +
+   +
+ + + + +

+ + + + - - - - - set toggle_details [formfetch toggle_details] - if {[string length $toggle_details]==0} { - set toggle_details 0 - } - set show_details [load_var show_details] - if {[string length $show_details]==0} { - set show_details 0 - } - if {$toggle_details==1} { - set show_details [expr 1-$show_details] - save_var show_details $show_details - } - - if {[string length $console]!=0} { - - - + + + + + set toggle_details [formfetch toggle_details] + if {[string length $toggle_details]==0} { + set toggle_details 0 + } + set show_details [load_var show_details] + if {[string length $show_details]==0} { + set show_details 0 + } + if {$toggle_details==1} { + set show_details [expr 1-$show_details] + save_var show_details $show_details + } + + if {[string length $console]!=0} { + + + - - - if {$show_details==1} { - append buffer - append buffer {td style="background-color:#dddddd;padding-left:5px;padding-right:5px;padding-top:3px;padding-bottom:3px;"} - append buffer ]]> - } else { - append buffer - append buffer {td style="background-image:url('menu_cuts/h_tab_free.png');width:110px;height:29px;background-repeat: no-repeat;background-position:top left;"} - append buffer ]]> - } - - + + + if {$show_details==1} { + append buffer + append buffer {td style="background-color:#dddddd;padding-left:5px;padding-right:5px;padding-top:3px;padding-bottom:3px;"} + append buffer ]]> + } else { + append buffer + append buffer {td style="background-image:url('menu_cuts/h_tab_free.png');width:110px;height:29px;background-repeat: no-repeat;background-position:top left;"} + append buffer ]]> + } + + ?toggle_details=1 if {$show_details==1} { append buffer "Hide details" - append buffer
+ append buffer
} else { append buffer {
} append buffer "Show details" append buffer {
} } - - - if {$show_details==1} { - append buffer $console - } - + + + if {$show_details==1} { + append buffer $console + } + /td]]> - if {$show_details!=1} { - append buffer {} - } + if {$show_details!=1} { + append buffer {} + } - -
      
- +   + + - + } - - -
-   -
- - - + + +
+   +
+ + + @@ -240,56 +240,56 @@
- Documentation + Documentation
- - -   - - - + + +   + + + - - - - - - OpenOCD Manual
- - - - - - - - - -
- - - - - + + + + + + OpenOCD Manual
+ + + + + + + + + +
+ + + + + - + - - - - -   - - + + + + +   + + - + - + diff --git a/src/server/httpd/menuweb.css b/src/server/httpd/menuweb.css index ac87c85ec..60c62393e 100644 --- a/src/server/httpd/menuweb.css +++ b/src/server/httpd/menuweb.css @@ -70,7 +70,7 @@ body font-size: 12px; line-height: 15px; color : #024d67; - + } h1 @@ -86,7 +86,7 @@ td { padding: 0px; font-size: 12px; - vertical-align:top; + vertical-align:top; } @@ -95,7 +95,7 @@ td color: #cccccc; padding: 0px; font-size: 12px; - vertical-align:top; + vertical-align:top; } diff --git a/src/server/httpd/readme.txt b/src/server/httpd/readme.txt index bade32cba..7bc80e66b 100644 --- a/src/server/httpd/readme.txt +++ b/src/server/httpd/readme.txt @@ -7,7 +7,7 @@ tcl with embedded html. sh build.sh -xalan.jar can be gotten from apache.org. +xalan.jar can be gotten from apache.org. 2. libmicrohttpd is a bit tricky to build under Cygwin: diff --git a/testing/examples/PIC32/readme.txt b/testing/examples/PIC32/readme.txt index cb32ac2ee..8a5ac3b43 100644 --- a/testing/examples/PIC32/readme.txt +++ b/testing/examples/PIC32/readme.txt @@ -1,4 +1,3 @@ Here you'll find a simple example tested with PIC32 Starter kit (source code and .elf file). It will blink repeatedly the LEDs on the board. -The program was compiled and written on the target using MPLAB IDE v 8.0 that comes with the kit because openocd is missing currently the ability -to program the flash for this specific target. It is possible in the future this limitation to be removed. - \ No newline at end of file +The program was compiled and written on the target using MPLAB IDE v 8.0 that comes with the kit because openocd is missing currently the ability +to program the flash for this specific target. It is possible in the future this limitation to be removed. diff --git a/testing/index.html b/testing/index.html index 7e5fcb030..af3ce9348 100644 --- a/testing/index.html +++ b/testing/index.html @@ -7,7 +7,7 @@ A release test must be done on code committed to git. Commit, then test. That way one can know for sure *what* code was actually tested.

- Note that this testing document does not have anything to do with testing that is done + Note that this testing document does not have anything to do with testing that is done before committing to git. It is a test document for released code. Pre-commit testing is done mostly by the developer who has written the change. Sometimes code is committed to synchronize work, even if it has known problems. Release testing is @@ -16,7 +16,7 @@ and test setup. Also the testing will take place over an extended period of time.

All of the above makes it imperative that there can be no doubt about *which* code - is tested and thus all tests refer to committed code by subversion number. + is tested and thus all tests refer to committed code by subversion number.

Release procedure

OpenOCD mainline is work in progress. Expect it to change daily and to have some quirks. @@ -35,7 +35,7 @@

Test cases

Additionally OpenOCD has test cases that target specific functionality more precisely.

- A full release test must include both smoketests and unit testing. + A full release test must include both smoketests and unit testing.

Test cases diff --git a/testing/profile_stm32.txt b/testing/profile_stm32.txt index 3328e5db2..a7e03b08f 100644 --- a/testing/profile_stm32.txt +++ b/testing/profile_stm32.txt @@ -33,7 +33,7 @@ set before [flush_count] flash fillb 0x8000000 0x55 0x10000 set flash_fill_count [expr [flush_count]-$before] -puts "counts" ; puts "step $step_count" ; puts "mem $mem_count" ; puts "erase $erase_count" ; puts "flash fill $flash_fill_count" +puts "counts" ; puts "step $step_count" ; puts "mem $mem_count" ; puts "erase $erase_count" ; puts "flash fill $flash_fill_count" parport trunk rev 1675 ====================== diff --git a/testing/smoketests.html b/testing/smoketests.html index 459f8bf69..7d5efc1cb 100644 --- a/testing/smoketests.html +++ b/testing/smoketests.html @@ -183,7 +183,7 @@

OpenOCD JTAG device test results

Each JTAG device must be tested - + diff --git a/testing/testcases.html b/testing/testcases.html index 3c1a0242f..a3d65b918 100644 --- a/testing/testcases.html +++ b/testing/testcases.html @@ -12,7 +12,7 @@ each subversion number. - +
ID
Test resultscomment
SAM7 R607PASS
STR710 R607PASS
templateTest results template