X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fjtag%2Fhla%2Fhla_interface.c;h=62a8f59477f8b30c1438ffca7a655973a125098d;hp=0176a4823820229be5bf75d1c1945094f4c43176;hb=31c58c139d85;hpb=cfe9ca039f4f6c058dff64effea50a857ff80f96
diff --git a/src/jtag/hla/hla_interface.c b/src/jtag/hla/hla_interface.c
index 0176a48238..62a8f59477 100644
--- a/src/jtag/hla/hla_interface.c
+++ b/src/jtag/hla/hla_interface.c
@@ -16,9 +16,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., *
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. *
+ * along with this program. If not, see . *
***************************************************************************/
#ifdef HAVE_CONFIG_H
@@ -37,7 +35,7 @@
#include
-static struct hl_interface_s hl_if = { {0, 0, 0, 0, 0, HL_TRANSPORT_UNKNOWN, false, NULL, 0}, 0, 0 };
+static struct hl_interface_s hl_if = { {0, 0, { 0 }, { 0 }, 0, HL_TRANSPORT_UNKNOWN, false, -1}, 0, 0 };
int hl_interface_open(enum hl_transports tr)
{
@@ -72,7 +70,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;
@@ -84,15 +82,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;
}
@@ -114,10 +116,8 @@ 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;
- }
+ if (hl_if.layout->api->close)
+ hl_if.layout->api->close(hl_if.handle);
return ERROR_OK;
}
@@ -135,12 +135,79 @@ int hl_interface_init_reset(void)
* 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.fd, 0);
+ hl_if.layout->api->assert_srst(hl_if.handle, 0);
+ } else {
+ jtag_add_reset(0, 0);
}
return ERROR_OK;
}
+static int hl_interface_khz(int khz, int *jtag_speed)
+{
+ if (hl_if.layout->api->speed == NULL)
+ return ERROR_OK;
+
+ *jtag_speed = hl_if.layout->api->speed(hl_if.handle, khz, true);
+ return ERROR_OK;
+}
+
+static int hl_interface_speed_div(int speed, int *khz)
+{
+ *khz = speed;
+ return ERROR_OK;
+}
+
+static int hl_interface_speed(int speed)
+{
+ if (hl_if.layout->api->speed == NULL)
+ return ERROR_OK;
+
+ if (hl_if.handle == NULL) {
+ /* pass speed as initial param as interface not open yet */
+ hl_if.param.initial_interface_speed = speed;
+ return ERROR_OK;
+ }
+
+ hl_if.layout->api->speed(hl_if.handle, speed, false);
+
+ 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;
+}
+
+int hl_interface_config_trace(bool enabled, enum tpio_pin_protocol pin_protocol,
+ uint32_t port_size, unsigned int *trace_freq)
+{
+ if (hl_if.layout->api->config_trace)
+ return hl_if.layout->api->config_trace(hl_if.handle, enabled, pin_protocol,
+ port_size, trace_freq);
+ else if (enabled) {
+ LOG_ERROR("The selected interface does not support tracing");
+ return ERROR_FAIL;
+ }
+
+ return ERROR_OK;
+}
+
+int hl_interface_poll_trace(uint8_t *buf, size_t *size)
+{
+ if (hl_if.layout->api->poll_trace)
+ return hl_if.layout->api->poll_trace(hl_if.handle, buf, size);
+
+ return ERROR_FAIL;
+}
+
COMMAND_HANDLER(hl_interface_handle_device_desc_command)
{
LOG_DEBUG("hl_interface_handle_device_desc_command");
@@ -197,54 +264,42 @@ COMMAND_HANDLER(hl_interface_handle_layout_command)
COMMAND_HANDLER(hl_interface_handle_vid_pid_command)
{
- LOG_DEBUG("hl_interface_handle_vid_pid_command");
-
- if (CMD_ARGC != 2) {
- LOG_WARNING("ignoring extra IDs in hl_vid_pid (maximum is 1 pair)");
- return ERROR_COMMAND_SYNTAX_ERROR;
+ if (CMD_ARGC > HLA_MAX_USB_IDS * 2) {
+ LOG_WARNING("ignoring extra IDs in hla_vid_pid "
+ "(maximum is %d pairs)", HLA_MAX_USB_IDS);
+ CMD_ARGC = HLA_MAX_USB_IDS * 2;
}
-
- COMMAND_PARSE_NUMBER(u16, CMD_ARGV[0], hl_if.param.vid);
- COMMAND_PARSE_NUMBER(u16, CMD_ARGV[1], hl_if.param.pid);
-
- return ERROR_OK;
-}
-
-COMMAND_HANDLER(stlink_interface_handle_api_command)
-{
- if (CMD_ARGC != 1)
+ if (CMD_ARGC < 2 || (CMD_ARGC & 1)) {
+ LOG_WARNING("incomplete hla_vid_pid configuration directive");
return ERROR_COMMAND_SYNTAX_ERROR;
+ }
- unsigned new_api;
- COMMAND_PARSE_NUMBER(uint, CMD_ARGV[0], new_api);
- if ((new_api == 0) || (new_api > 2))
- return ERROR_COMMAND_SYNTAX_ERROR;
+ unsigned i;
+ for (i = 0; i < CMD_ARGC; i += 2) {
+ COMMAND_PARSE_NUMBER(u16, CMD_ARGV[i], hl_if.param.vid[i / 2]);
+ COMMAND_PARSE_NUMBER(u16, CMD_ARGV[i + 1], hl_if.param.pid[i / 2]);
+ }
- hl_if.param.api = new_api;
+ /*
+ * Explicitly terminate, in case there are multiple instances of
+ * hla_vid_pid.
+ */
+ hl_if.param.vid[i / 2] = hl_if.param.pid[i / 2] = 0;
return ERROR_OK;
}
-COMMAND_HANDLER(interface_handle_trace_command)
+COMMAND_HANDLER(interface_handle_hla_command)
{
- FILE *f;
- unsigned source_hz;
-
- if (CMD_ARGC != 2)
- return ERROR_COMMAND_SYNTAX_ERROR;
-
- f = fopen(CMD_ARGV[0], "a");
- if (!f)
+ if (CMD_ARGC != 1)
return ERROR_COMMAND_SYNTAX_ERROR;
- COMMAND_PARSE_NUMBER(uint, CMD_ARGV[1], source_hz);
- if (source_hz == 0) {
- fclose(f);
- return ERROR_COMMAND_SYNTAX_ERROR;
+ if (!hl_if.layout->api->custom_command) {
+ LOG_ERROR("The selected adapter doesn't support custom commands");
+ return ERROR_FAIL;
}
- hl_if.param.trace_f = f;
- hl_if.param.trace_source_hz = source_hz;
+ hl_if.layout->api->custom_command(hl_if.handle, CMD_ARGV[0]);
return ERROR_OK;
}
@@ -279,18 +334,11 @@ static const struct command_registration hl_interface_command_handlers[] = {
.usage = "(vid pid)* ",
},
{
- .name = "stlink_api",
- .handler = &stlink_interface_handle_api_command,
- .mode = COMMAND_CONFIG,
- .help = "set the desired stlink api level",
- .usage = "api version 1 or 2",
- },
- {
- .name = "trace",
- .handler = &interface_handle_trace_command,
- .mode = COMMAND_CONFIG,
- .help = "configure trace reception",
- .usage = "destination_path source_lock_hz",
+ .name = "hla_command",
+ .handler = &interface_handle_hla_command,
+ .mode = COMMAND_EXEC,
+ .help = "execute a custom adapter-specific command",
+ .usage = "hla_command ",
},
COMMAND_REGISTRATION_DONE
};
@@ -303,4 +351,9 @@ struct jtag_interface hl_interface = {
.init = hl_interface_init,
.quit = hl_interface_quit,
.execute_queue = hl_interface_execute_queue,
+ .speed = &hl_interface_speed,
+ .khz = &hl_interface_khz,
+ .speed_div = &hl_interface_speed_div,
+ .config_trace = &hl_interface_config_trace,
+ .poll_trace = &hl_interface_poll_trace,
};