build: fix build with --enable-minidriver-dummy

Commit 462c01206692 ("Add complete JTAG debug logging.") breaks
the build for minidriver, that is enabled either on zy1000 build
and on minidriver-dummy build. The check on BUILD_ZY1000 was added
to pass the auto-build in jenkins. While the build issue with
minidriver-dummy was known, as reported in the comment, it was not
addressed and got ignored for slightly more than one year.

Use the macro HAVE_JTAG_MINIDRIVER_H in place of BUILD_ZY1000 to
take in account both builds that require the minidriver.
Fix also the build in case configure enables the HLA drivers due
to autodetection of libusb. The HLA drivers would not be in the
build and the function transport_is_hla() would be missing.

Change-Id: I1d85c5fa247bf4a85aba29b233c0b573b46665bc
Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com>
Reviewed-on: http://openocd.zylin.com/5911
Tested-by: jenkins

diff --git a/src/jtag/core.c b/src/jtag/core.c
index f0f74eb808d7c2016dbb40662e6bee7cbe9a54f9..5abf832f8502710e4b139fb8f545f24ab3d0ac51 100644 (file)
--- a/src/jtag/core.c
+++ b/src/jtag/core.c
@@ -953,12 +953,12 @@ int default_interface_jtag_execute_queue(void)
 
        int result = jtag->jtag_ops->execute_queue();
 
-#if !BUILD_ZY1000
+#if !HAVE_JTAG_MINIDRIVER_H
        /* Only build this if we use a regular driver with a command queue.
         * Otherwise jtag_command_queue won't be found at compile/link time. Its
         * definition is in jtag/commands.c, which is only built/linked by
         * jtag/Makefile.am if MINIDRIVER_DUMMY || !MINIDRIVER, but those variables
-        * aren't accessible here. */
+        * aren't accessible here. Use HAVE_JTAG_MINIDRIVER_H */
        struct jtag_command *cmd = jtag_command_queue;
        while (debug_level >= LOG_LVL_DEBUG_IO && cmd) {
                switch (cmd->type) {

diff --git a/src/transport/transport.h b/src/transport/transport.h
index e04f78063529996396b3f7a4a81d07b85d6ff762..6bf6aaced9ca3e3173e59ba107f7e33cf9faddd1 100644 (file)
--- a/src/transport/transport.h
+++ b/src/transport/transport.h
@@ -98,7 +98,7 @@ bool transport_is_dapdirect_jtag(void);
 bool transport_is_dapdirect_swd(void);
 bool transport_is_swim(void);
 
-#if BUILD_HLADAPTER
+#if BUILD_HLADAPTER && !HAVE_JTAG_MINIDRIVER_H
 bool transport_is_hla(void);
 #else
 static inline bool transport_is_hla(void)