adapter: switch from struct jtag_interface to adapter_driver

[openocd.git] / src / jtag / zy1000 / zy1000.c

diff --git a/src/jtag/zy1000/zy1000.c b/src/jtag/zy1000/zy1000.c
index 16c3e5d0f420d66f4446e0cca1f802a4292be9b3..48a3d4d039dbc295874f8e5a620ce24919e313a1 100644 (file)
--- a/src/jtag/zy1000/zy1000.c
+++ b/src/jtag/zy1000/zy1000.c
@@ -12,9 +12,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/>. *
  ***************************************************************************/
 
 /* This file supports the zy1000 debugger:
@@ -147,8 +145,8 @@ static int zy1000_power_dropout(int *dropout)
 static void waitSRST(bool asserted)
 {
        bool first = true;
-       long long start = 0;
-       long total = 0;
+       int64_t start = 0;
+       int64_t total = 0;
        const char *mode = asserted ? "assert" : "deassert";
 
        for (;; ) {
@@ -169,7 +167,7 @@ static void waitSRST(bool asserted)
                keep_alive();
 
                if (total > 5000) {
-                       LOG_ERROR("SRST took too long to %s: %dms", mode, (int)total);
+                       LOG_ERROR("SRST took too long to %s: %" PRId64 "ms", mode, total);
                        break;
                }
        }
@@ -267,8 +265,8 @@ COMMAND_HANDLER(handle_power_command)
                        bool enable;
                        COMMAND_PARSE_ON_OFF(CMD_ARGV[0], enable);
                        setPower(enable);
-                       /* fall through */
                }
+                       /* fall through */
                case 0:
                        LOG_INFO("Target power %s", savePower ? "on" : "off");
                        break;
@@ -1239,16 +1237,23 @@ int zy1000_init(void)
        return ERROR_OK;
 }
 
-struct jtag_interface zy1000_interface = {
-       .name = "ZY1000",
+static struct jtag_interface zy1000_interface = {
        .supported = DEBUG_CAP_TMS_SEQ,
        .execute_queue = NULL,
-       .speed = zy1000_speed,
+};
+
+struct adapter_driver zy1000_adapter_driver = {
+       .name = "ZY1000",
+       .transports = jtag_only,
        .commands = zy1000_commands,
+
        .init = zy1000_init,
        .quit = zy1000_quit,
+       .speed = zy1000_speed,
        .khz = zy1000_khz,
        .speed_div = zy1000_speed_div,
        .power_dropout = zy1000_power_dropout,
        .srst_asserted = zy1000_srst_asserted,
+
+       .jtag_ops = &zy1000_interface,
 };