From: Uwe Hermann <redacted>
Date: Thu, 10 May 2012 07:38:54 +0000 (+0200)
Subject: srd: JTAG: Enavble and get/use optional probes.
X-Git-Tag: libsigrokdecode-0.1.1~118
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=1cc590f73673ce209ae41d6aa42ffa9a60649415;p=libsigrokdecode.git

srd: JTAG: Enavble and get/use optional probes.
---

diff --git a/decoders/jtag/jtag.py b/decoders/jtag/jtag.py
index d2568ab..baeb764 100644
--- a/decoders/jtag/jtag.py
+++ b/decoders/jtag/jtag.py
@@ -38,8 +38,9 @@ class Decoder(srd.Decoder):
         {'id': 'tms',  'name': 'TMS',  'desc': 'Test mode select'},
     ]
     optional_probes = [
-        # {'id': 'trst', 'name': 'TRST#', 'desc': 'Test reset'},
-        # {'id': 'srst', 'name': 'SRST#', 'desc': 'System reset'},
+        {'id': 'trst', 'name': 'TRST#', 'desc': 'Test reset'},
+        {'id': 'srst', 'name': 'SRST#', 'desc': 'System reset'},
+        {'id': 'rtck', 'name': 'RTCK',  'desc': 'Return clock signal'},
     ]
     options = {}
     annotations = [
@@ -158,8 +159,8 @@ class Decoder(srd.Decoder):
             self.oldpins = pins
 
             # Get individual pin values into local variables.
-            # TODO: Handle optional pins (TRST, SRST).
-            (tdi, tdo, tck, tms) = pins
+            # Unused probes will have a value of > 1.
+            (tdi, tdo, tck, tms, trst, srst, rtck) = pins
 
             # We only care about TCK edges (either rising or falling).
             if (self.oldtck == tck):