Improve naming tpiu -> swv_raw

Add separate swv_raw_enable option (support setting port to 0)

Author: patrislav1

pyocd/core/options.py

@@ -137,8 +137,10 @@
     OptionInfo('swv_system_clock', int, None,
         "Frequency in Hertz of the target's system clock. Used to compute the SWO baud rate "
         "divider. No default."),
-    OptionInfo('tpiu_port', int, 3443,
-        "TCP port number for the raw TPIU stream server."),
+    OptionInfo('swv_raw_enable', bool, True,
+        "Enable flag for the raw SWV stream server."),
+    OptionInfo('swv_raw_port', int, 3443,
+        "TCP port number for the raw SWV stream server."),
     OptionInfo('telnet_port', int, 4444,
         "Base TCP port number for the semihosting telnet server."),
     OptionInfo('vector_catch', str, 'h',

pyocd/trace/swv.py

@@ -157,9 +157,11 @@ def run(self):
         if self._lock:
             self._lock.acquire()
 
-        tpiu_port = self._session.options.get('tpiu_port')
-        tpiu_server = StreamServer(tpiu_port, name="TPIU", is_read_only=True) \
-                      if tpiu_port else None
+        swv_raw_server = StreamServer(
+                            self._session.options.get('swv_raw_port'),
+                            name="SWV raw",
+                            is_read_only=True) \
+                         if self._session.options.get('swv_raw_enable') else None
 
         # Stop SWO first in case the probe already had it started. Ignore if this fails.
         try:
@@ -171,8 +173,8 @@ def run(self):
         while not self._shutdown_event.is_set():
             data = self._session.probe.swo_read()
             if data:
-                if tpiu_server:
-                    tpiu_server.write(data)
+                if swv_raw_server:
+                    swv_raw_server.write(data)
                 self._parser.parse(data)
 
             if self._lock:
@@ -185,8 +187,8 @@ def run(self):
 
         self._session.probe.swo_stop()
 
-        if tpiu_server:
-            tpiu_server.stop()
+        if swv_raw_server:
+            swv_raw_server.stop()
 
         if self._lock:
             self._lock.release()