xlx: change xlx xsdb client behaviour

Change the implementation of the xlx xsdb command to more intuitive and
as internally discussed to get a interactive mode.

Author: sessl3r

labgrid/driver/xsdbdriver.py

@@ -1,5 +1,6 @@
 "Xilinx System Debugger (XSDB) driver"
 import attr
+import subprocess
 
 from .common import Driver
 from ..factory import target_factory
@@ -31,17 +32,22 @@ def __attrs_post_init__(self):
             self.xsdb_bin = 'xsdb'
 
     @Driver.check_active
-    @step(args=['tcl_cmds'])
-    def run(self, tcl_cmds):
+    @step(args=['tcl_cmds', 'interactive'])
+    def run(self, tcl_cmds, interactive=False):
         url = self.interface.agent_url.split(":")
         if not url[1]:
             url[1] = self.interface.host
 
         tcl_cmd = "connect -url {}; ".format(":".join(url))
-        tcl_cmd += "; ".join(tcl_cmds) + "; disconnect"
+        tcl_cmd += "; ".join(tcl_cmds)
+        if not interactive:
+            tcl_cmd += '; disconnect'
 
         cmd = [self.xsdb_bin, "-eval", tcl_cmd]
-        return processwrapper.check_output(cmd)
+        if interactive:
+            cmd.append('-interactive')
+
+        subprocess.run(cmd, check=True)
 
     @Driver.check_active
     @step(args=['filename'])

labgrid/remote/client.py

@@ -1307,11 +1307,10 @@ def _get_xlx(self, name):
         return drv
 
     def xlx_run_xsdb(self):
-        drv = self._get_xlx(self.args.name)
+        _, drv = self._get_xlx(self.args.name)
 
-        processwrapper.enable_print()
-        drv.run([self.args.tcl_cmds])
-        processwrapper.disable_print()
+        drv.run([self.args.tcl_cmds],
+                interactive = self.args.interactive or not bool(self.args.tcl_cmds))
 
     def xlx_program_bitstream(self):
         drv = self._get_xlx(self.args.name)
@@ -1912,8 +1911,9 @@ def main():
         metavar="SUBCOMMAND",
     )
 
-    xlx_subparser = xlx_subparsers.add_parser('xsdb', help="run XSDB")
-    xlx_subparser.add_argument('tcl_cmds', help="Tcl commands")
+    xlx_subparser = xlx_subparsers.add_parser('xsdb', help="run XSDB and connect to Vivado hardware server")
+    xlx_subparser.add_argument('tcl_cmds', nargs='?', default='', help="Tcl command to execute")
+    xlx_subparser.add_argument('-i', '--interactive', action='store_true', help="enter interactive mode after executing Tcl command")
     xlx_subparser.set_defaults(func=ClientSession.xlx_run_xsdb)
 
     xlx_subparser = xlx_subparsers.add_parser('program-bitstream', help="program bitstream")