Revert "adapter: expose HLA interface in struct adapter_driver"

[openocd.git] / src / jtag / hla / hla_interface.c

diff --git a/src/jtag/hla/hla_interface.c b/src/jtag/hla/hla_interface.c
index 85f083cecda1d928c97ae51598f11d9600668552..6d5cdc5e7018f3527385808ec585da4a571d1931 100644 (file)
--- 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 <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
 
 #ifdef HAVE_CONFIG_H
@@ -37,7 +35,7 @@
 
 #include <target/target.h>
 
-static struct hl_interface_s hl_if = { {0, 0, 0, 0, 0, HL_TRANSPORT_UNKNOWN, false, NULL, 0, -1}, 0, 0 };
+static struct hl_interface_s hl_if = { {0, 0, { 0 }, { 0 }, HL_TRANSPORT_UNKNOWN, false, -1}, 0, 0 };
 
 int hl_interface_open(enum hl_transports tr)
 {
@@ -118,34 +116,30 @@ 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;
-
        if (hl_if.layout->api->close)
                hl_if.layout->api->close(hl_if.handle);
 
+       jtag_command_queue_reset();
+
+       free((void *)hl_if.param.device_desc);
+       free((void *)hl_if.param.serial);
+
        return ERROR_OK;
 }
 
-static int hl_interface_execute_queue(void)
+static int hl_interface_reset(int req_trst, int req_srst)
 {
-       LOG_DEBUG("hl_interface_execute_queue: ignored");
-
-       return ERROR_OK;
+       return hl_if.layout->api->assert_srst(hl_if.handle, req_srst ? 0 : 1);
 }
 
 int hl_interface_init_reset(void)
 {
-       /* incase the adapter has not already handled asserting srst
+       /* in case 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);
+               adapter_assert_reset();
        } else {
-               jtag_add_reset(0, 0);
+               adapter_deassert_reset();
        }
 
        return ERROR_OK;
@@ -194,6 +188,29 @@ int hl_interface_override_target(const char **targetname)
        return ERROR_FAIL;
 }
 
+int hl_interface_config_trace(bool enabled, enum tpiu_pin_protocol pin_protocol,
+               uint32_t port_size, unsigned int *trace_freq,
+               unsigned int traceclkin_freq, uint16_t *prescaler)
+{
+       if (hl_if.layout->api->config_trace)
+               return hl_if.layout->api->config_trace(hl_if.handle, enabled,
+                       pin_protocol, port_size, trace_freq, traceclkin_freq, prescaler);
+       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");
@@ -250,40 +267,27 @@ 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(interface_handle_trace_command)
-{
-       FILE *f = NULL;
-       unsigned source_hz;
-
-       if ((CMD_ARGC < 1) || (CMD_ARGC > 2))
-               return ERROR_COMMAND_SYNTAX_ERROR;
-
-       COMMAND_PARSE_NUMBER(uint, CMD_ARGV[0], source_hz);
-       if (source_hz == 0) {
+       if (CMD_ARGC < 2 || (CMD_ARGC & 1)) {
+               LOG_WARNING("incomplete hla_vid_pid configuration directive");
                return ERROR_COMMAND_SYNTAX_ERROR;
        }
 
-       if (CMD_ARGC == 2) {
-               f = fopen(CMD_ARGV[1], "a");
-               if (!f)
-                       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.trace_f = f;
-       hl_if.param.trace_source_hz = source_hz;
+       /*
+        * 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;
 }
@@ -333,13 +337,6 @@ static const struct command_registration hl_interface_command_handlers[] = {
         .usage = "(vid pid)* ",
         },
         {
-        .name = "trace",
-        .handler = &interface_handle_trace_command,
-        .mode = COMMAND_CONFIG,
-        .help = "configure trace reception",
-        .usage = "source_lock_hz [destination_path]",
-        },
-        {
         .name = "hla_command",
         .handler = &interface_handle_hla_command,
         .mode = COMMAND_EXEC,
@@ -349,15 +346,19 @@ static const struct command_registration hl_interface_command_handlers[] = {
        COMMAND_REGISTRATION_DONE
 };
 
-struct jtag_interface hl_interface = {
+struct adapter_driver hl_adapter_driver = {
        .name = "hla",
-       .supported = 0,
-       .commands = hl_interface_command_handlers,
        .transports = hl_transports,
+       .commands = hl_interface_command_handlers,
+
        .init = hl_interface_init,
        .quit = hl_interface_quit,
-       .execute_queue = hl_interface_execute_queue,
+       .reset = hl_interface_reset,
        .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,
+
+       /* no ops for HLA, targets hla_target and stm8 intercept them all */
 };