X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fjtag%2Fhla%2Fhla_interface.c;h=44a7fc69f8917b821a0ed5a3a10beb1d6a637b88;hp=53ad8e71739fbbdfbbecf092973993806f542ca7;hb=1f8518fef4f959dca96e9ce5bcff273222a427a8;hpb=87668aebf1851c06af2513ab5f27ebb9ebf1ff16 diff --git a/src/jtag/hla/hla_interface.c b/src/jtag/hla/hla_interface.c index 53ad8e7173..44a7fc69f8 100644 --- a/src/jtag/hla/hla_interface.c +++ b/src/jtag/hla/hla_interface.c @@ -18,7 +18,7 @@ * 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. * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * ***************************************************************************/ #ifdef HAVE_CONFIG_H @@ -37,12 +37,21 @@ #include -static struct hl_interface_s hl_if = { {0, 0, 0, 0, 0, 0, 0}, 0, 0 }; +static struct hl_interface_s hl_if = { {0, 0, 0, 0, 0, HL_TRANSPORT_UNKNOWN, false, NULL, 0}, 0, 0 }; int hl_interface_open(enum hl_transports tr) { LOG_DEBUG("hl_interface_open"); + enum reset_types jtag_reset_config = jtag_get_reset_config(); + + if (jtag_reset_config & RESET_CNCT_UNDER_SRST) { + if (jtag_reset_config & RESET_SRST_NO_GATING) + hl_if.param.connect_under_reset = true; + else + LOG_WARNING("\'srst_nogate\' reset_config option is required"); + } + /* set transport mode */ hl_if.param.transport = tr; @@ -63,7 +72,7 @@ int hl_interface_init_target(struct target *t) * can setup the private pointer in the tap structure * if the interface match the tap idcode */ - res = hl_if.layout->api->idcode(hl_if.fd, &t->tap->idcode); + res = hl_if.layout->api->idcode(hl_if.handle, &t->tap->idcode); if (res != ERROR_OK) return res; @@ -75,15 +84,19 @@ int hl_interface_init_target(struct target *t) uint32_t expected = t->tap->expected_ids[ii]; /* treat "-expected-id 0" as a "don't-warn" wildcard */ - if (!expected || (t->tap->idcode == expected)) { + if (!expected || !t->tap->idcode || + (t->tap->idcode == expected)) { found = 1; break; } } if (found == 0) { - LOG_ERROR("hl_interface_init_target: target not found: idcode: 0x%08x", - t->tap->idcode); + LOG_WARNING("UNEXPECTED idcode: 0x%08" PRIx32, t->tap->idcode); + for (ii = 0; ii < limit; ii++) + LOG_ERROR("expected %u of %u: 0x%08" PRIx32, ii + 1, limit, + t->tap->expected_ids[ii]); + return ERROR_FAIL; } @@ -105,6 +118,12 @@ static int hl_interface_quit(void) { LOG_DEBUG("hl_interface_quit"); + if (hl_if.param.trace_f) { + fclose(hl_if.param.trace_f); + hl_if.param.trace_f = NULL; + } + hl_if.param.trace_source_hz = 0; + return ERROR_OK; } @@ -117,19 +136,47 @@ static int hl_interface_execute_queue(void) int hl_interface_init_reset(void) { - enum reset_types jtag_reset_config = jtag_get_reset_config(); - - if (jtag_reset_config & RESET_CNCT_UNDER_SRST) { - if (jtag_reset_config & RESET_SRST_NO_GATING) { - jtag_add_reset(0, 1); - hl_if.layout->api->assert_srst(hl_if.fd, 0); - } else - LOG_WARNING("\'srst_nogate\' reset_config option is required"); + /* incase the adapter has not already handled asserting srst + * we will attempt it again */ + if (hl_if.param.connect_under_reset) { + jtag_add_reset(0, 1); + hl_if.layout->api->assert_srst(hl_if.handle, 0); + } else { + jtag_add_reset(0, 0); } return ERROR_OK; } +static int dummy_khz(int khz, int *jtag_speed) +{ + *jtag_speed = khz; + return ERROR_OK; +} + +static int dummy_speed_div(int speed, int *khz) +{ + *khz = speed; + return ERROR_OK; +} + +static int dummy_speed(int speed) +{ + return ERROR_OK; +} + +int hl_interface_override_target(const char **targetname) +{ + if (hl_if.layout->api->override_target) { + if (hl_if.layout->api->override_target(*targetname)) { + *targetname = "hla_target"; + return ERROR_OK; + } else + return ERROR_FAIL; + } + return ERROR_FAIL; +} + COMMAND_HANDLER(hl_interface_handle_device_desc_command) { LOG_DEBUG("hl_interface_handle_device_desc_command"); @@ -199,17 +246,42 @@ COMMAND_HANDLER(hl_interface_handle_vid_pid_command) return ERROR_OK; } -COMMAND_HANDLER(stlink_interface_handle_api_command) +COMMAND_HANDLER(interface_handle_trace_command) { - if (CMD_ARGC != 1) + FILE *f = NULL; + unsigned source_hz; + + if ((CMD_ARGC < 1) || (CMD_ARGC > 2)) return ERROR_COMMAND_SYNTAX_ERROR; - unsigned new_api; - COMMAND_PARSE_NUMBER(uint, CMD_ARGV[0], new_api); - if ((new_api == 0) || (new_api > 2)) + COMMAND_PARSE_NUMBER(uint, CMD_ARGV[0], source_hz); + if (source_hz == 0) { + return ERROR_COMMAND_SYNTAX_ERROR; + } + + if (CMD_ARGC == 2) { + f = fopen(CMD_ARGV[1], "a"); + if (!f) + return ERROR_COMMAND_SYNTAX_ERROR; + } + + hl_if.param.trace_f = f; + hl_if.param.trace_source_hz = source_hz; + + return ERROR_OK; +} + +COMMAND_HANDLER(interface_handle_hla_command) +{ + if (CMD_ARGC != 1) return ERROR_COMMAND_SYNTAX_ERROR; - hl_if.param.api = new_api; + if (!hl_if.layout->api->custom_command) { + LOG_ERROR("The selected adapter doesn't support custom commands"); + return ERROR_FAIL; + } + + hl_if.layout->api->custom_command(hl_if.handle, CMD_ARGV[0]); return ERROR_OK; } @@ -244,11 +316,18 @@ static const struct command_registration hl_interface_command_handlers[] = { .usage = "(vid pid)* ", }, { - .name = "stlink_api", - .handler = &stlink_interface_handle_api_command, + .name = "trace", + .handler = &interface_handle_trace_command, .mode = COMMAND_CONFIG, - .help = "set the desired stlink api level", - .usage = "api version 1 or 2", + .help = "configure trace reception", + .usage = "source_lock_hz [destination_path]", + }, + { + .name = "hla_command", + .handler = &interface_handle_hla_command, + .mode = COMMAND_EXEC, + .help = "execute a custom adapter-specific command", + .usage = "hla_command ", }, COMMAND_REGISTRATION_DONE }; @@ -261,4 +340,7 @@ struct jtag_interface hl_interface = { .init = hl_interface_init, .quit = hl_interface_quit, .execute_queue = hl_interface_execute_queue, + .speed = &dummy_speed, + .khz = &dummy_khz, + .speed_div = &dummy_speed_div, };