X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fjtag%2Fadapter.c;h=5953de7e529dd311077ca5ec6a1dc80687f41861;hb=7851207cf0d03428904a80f64db295268919ce86;hp=5d29bd795fc213d9b4c78f355f0f92d9592db29e;hpb=c91dbd41ba5490b1b63617bab42624e45f5cd3ad;p=openocd.git

diff --git a/src/jtag/adapter.c b/src/jtag/adapter.c
index 5d29bd795f..5953de7e52 100644
--- a/src/jtag/adapter.c
+++ b/src/jtag/adapter.c
@@ -23,9 +23,7 @@
  *   GNU General Public License for more details.                          *
  *                                                                         *
  *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
 
 #ifdef HAVE_CONFIG_H
@@ -48,7 +46,7 @@
  */
 
 extern struct jtag_interface *jtag_interface;
-const char *jtag_only[] = { "jtag", NULL };
+const char * const jtag_only[] = { "jtag", NULL };
 
 static int jim_adapter_name(Jim_Interp *interp, int argc, Jim_Obj * const *argv)
 {
@@ -274,7 +272,7 @@ COMMAND_HANDLER(handle_reset_config_command)
 			goto next;
 
 		/* srst_type (NOP without HAS_SRST) */
-		m |= RESET_SRST_PUSH_PULL;
+		m = RESET_SRST_PUSH_PULL;
 		if (strcmp(*CMD_ARGV, "srst_push_pull") == 0)
 			tmp |= RESET_SRST_PUSH_PULL;
 		else if (strcmp(*CMD_ARGV, "srst_open_drain") == 0)
@@ -519,7 +517,8 @@ static const struct command_registration interface_command_handlers[] = {
 			"[srst_pulls_trst|trst_pulls_srst|combined|separate] "
 			"[srst_gates_jtag|srst_nogate] "
 			"[trst_push_pull|trst_open_drain] "
-			"[srst_push_pull|srst_open_drain]",
+			"[srst_push_pull|srst_open_drain] "
+			"[connect_deassert_srst|connect_assert_srst]",
 	},
 	COMMAND_REGISTRATION_DONE
 };