X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fjtag%2Fjtag.c;h=90d52d0f0093c0a91e1b8da51c9ad06616b2156c;hb=68c598e88d5e09728ea845a81ab279c615bbaf0f;hp=c28858ee77d91a5b364123c8ba547a7a5c74bca8;hpb=bb36f541dd9f67a69471f29650e194a8a827ff95;p=openocd.git

diff --git a/src/jtag/jtag.c b/src/jtag/jtag.c
index c28858ee77..90d52d0f00 100644
--- a/src/jtag/jtag.c
+++ b/src/jtag/jtag.c
@@ -2,7 +2,7 @@
  *   Copyright (C) 2005 by Dominic Rath                                    *
  *   Dominic.Rath@gmx.de                                                   *
  *                                                                         *
- *   Copyright (C) 2007,2008 Øyvind Harboe                                      *
+ *   Copyright (C) 2007,2008 Øyvind Harboe                                 *
  *   oyvind.harboe@zylin.com                                               *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -252,7 +252,7 @@ void jtag_add_runtest(int num_cycles, enum tap_state endstate);
 void jtag_add_end_state(enum tap_state endstate);
 void jtag_add_sleep(u32 us);
 int jtag_execute_queue(void);
-int jtag_cancel_queue(void);
+
 
 /* jtag commands */
 int handle_interface_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
@@ -811,7 +811,7 @@ int MINIDRIVER(interface_jtag_add_plain_dr_scan)(int num_fields, scan_field_t *f
 	return ERROR_OK;
 }
 
-void jtag_add_tlr()
+void jtag_add_tlr(void)
 {
 	jtag_prelude(TAP_TLR);
 	
@@ -1311,7 +1311,7 @@ int jtag_reset_callback(enum jtag_event event, void *priv)
 
 void jtag_sleep(u32 us)
 {
-	usleep(us);
+	alive_sleep(us/1000);
 }
 
 /* Try to examine chain layout according to IEEE 1149.1 §12
@@ -1364,9 +1364,8 @@ int jtag_examine_chain(void)
 		if ((idcode & 1) == 0)
 		{
 			/* LSB must not be 0, this indicates a device in bypass */
-			device_count++;
-			
-			LOG_WARNING("Device was in bypass after TRST/TMS reset");
+			LOG_WARNING("Device does not have IDCODE");
+			idcode=0;
 			
 			bit_count += 1;
 		}
@@ -1403,13 +1402,6 @@ int jtag_examine_chain(void)
 				break;
 			}
 			
-			if (device)
-			{
-				device->idcode = idcode;
-				device = device->next;
-			}
-			device_count++;
-			
 			manufacturer = (idcode & 0xffe) >> 1;
 			part = (idcode & 0xffff000) >> 12;
 			version = (idcode & 0xf0000000) >> 28;
@@ -1419,6 +1411,12 @@ int jtag_examine_chain(void)
 			
 			bit_count += 32;
 		}
+		if (device)
+		{
+			device->idcode = idcode;
+			device = device->next;
+		}
+		device_count++;
 	}
 	
 	/* see if number of discovered devices matches configuration */
@@ -1493,8 +1491,69 @@ int jtag_validate_chain(void)
 	return ERROR_OK;
 }
 
+
+static int
+jim_jtag_command( Jim_Interp *interp, int argc, Jim_Obj *const *argv )
+{
+	Jim_GetOptInfo goi;
+	int e;
+	Jim_Nvp *n;
+	struct command_context_s *context;
+
+	enum {
+		JTAG_CMD_INTERFACE,
+		JTAG_CMD_INIT_RESET,
+	};
+	
+	const Jim_Nvp jtag_cmds[] = {
+		{ .name = "interface"     , .value = JTAG_CMD_INTERFACE },
+		{ .name = "arp_init-reset", .value = JTAG_CMD_INIT_RESET },
+		
+		{ .name = NULL, .value = -1 },
+	};
+
+	context = Jim_GetAssocData(interp, "context");
+	// go past the command 
+	Jim_GetOpt_Setup( &goi, interp, argc-1, argv+1 );
+
+	e = Jim_GetOpt_Nvp( &goi, jtag_cmds, &n );
+	if( e != JIM_OK ){
+		Jim_GetOpt_NvpUnknown( &goi, jtag_cmds, 0 );
+		return e;
+	}
+		Jim_SetEmptyResult( goi.interp );
+	switch( n->value ){
+	case JTAG_CMD_INTERFACE:
+		// return the name of the interface
+		// TCL code might need to know the exact type...
+		// FUTURE: we allow this as a means to "set" the interface.
+		if( goi.argc != 0 ){
+			Jim_WrongNumArgs( goi.interp, 1, goi.argv-1, "(no params)");
+			return JIM_ERR;
+		}
+		Jim_SetResultString( goi.interp, jtag_interface->name, -1 );
+		return JIM_OK;
+	case JTAG_CMD_INIT_RESET:
+		if( goi.argc != 0 ){
+			Jim_WrongNumArgs( goi.interp, 1, goi.argv-1, "(no params)");
+			return JIM_ERR;
+		}
+		e = jtag_init_reset(context);
+		if( e != ERROR_OK ){
+			Jim_SetResult_sprintf( goi.interp, "error: %d", e);
+			return JIM_ERR;
+		}
+		return JIM_OK;
+	}
+		
+
+	return JIM_ERR;
+}
+
 int jtag_register_commands(struct command_context_s *cmd_ctx)
 {
+	register_jim( cmd_ctx, "jtag", jim_jtag_command, "perform jtag tap actions");
+
 	register_command(cmd_ctx, NULL, "interface", handle_interface_command,
 		COMMAND_CONFIG, NULL);
 	register_command(cmd_ctx, NULL, "jtag_speed", handle_jtag_speed_command,
@@ -1556,7 +1615,6 @@ int jtag_interface_init(struct command_context_s *cmd_ctx)
 
 static int jtag_init_inner(struct command_context_s *cmd_ctx)
 {
-	int validate_tries = 0;
 	jtag_device_t *device;
 	int retval;
 
@@ -1582,16 +1640,9 @@ static int jtag_init_inner(struct command_context_s *cmd_ctx)
 		LOG_ERROR("trying to validate configured JTAG chain anyway...");
 	}
 	
-	while (jtag_validate_chain() != ERROR_OK)
+	if (jtag_validate_chain() != ERROR_OK)
 	{
-		validate_tries++;
-		
-		if (validate_tries > 5)
-		{
-			LOG_ERROR("Could not validate JTAG chain");
-			return ERROR_JTAG_INVALID_INTERFACE;
-		}
-		usleep(10000);
+		LOG_ERROR("Could not validate JTAG chain, continuing anyway...");
 	}
 	
 	return ERROR_OK;
@@ -1940,7 +1991,6 @@ int handle_jtag_khz_command(struct command_context_s *cmd_ctx, char *cmd, char *
 
 	if (jtag!=NULL)	
 	{
-		int what_speed;
 		if ((retval=jtag->speed_div(jtag_speed, &speed_khz))!=ERROR_OK)
 			return retval;
 	}