From da9bcbd9f45b0153465c55ec726a0d76f6d7f01e Mon Sep 17 00:00:00 2001 From: Bert Vermeulen Date: Mon, 10 Mar 2014 12:23:38 +0100 Subject: Probes, optional probes and annotations now take a tuple. Annotation entries also consist of a tuple, not a list. --- decoders/jtag/pd.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'decoders/jtag') diff --git a/decoders/jtag/pd.py b/decoders/jtag/pd.py index 0bb4069..fec75d6 100644 --- a/decoders/jtag/pd.py +++ b/decoders/jtag/pd.py @@ -62,18 +62,18 @@ class Decoder(srd.Decoder): license = 'gplv2+' inputs = ['logic'] outputs = ['jtag'] - probes = [ + probes = ( {'id': 'tdi', 'name': 'TDI', 'desc': 'Test data input'}, {'id': 'tdo', 'name': 'TDO', 'desc': 'Test data output'}, {'id': 'tck', 'name': 'TCK', 'desc': 'Test clock'}, {'id': 'tms', 'name': 'TMS', 'desc': 'Test mode select'}, - ] - optional_probes = [ + ) + optional_probes = ( {'id': 'trst', 'name': 'TRST#', 'desc': 'Test reset'}, {'id': 'srst', 'name': 'SRST#', 'desc': 'System reset'}, {'id': 'rtck', 'name': 'RTCK', 'desc': 'Return clock signal'}, - ] - annotations = [[s.lower(), s] for s in jtag_states] + ) + annotations = tuple([tuple([s.lower(), s]) for s in jtag_states]) def __init__(self, **kwargs): # self.state = 'TEST-LOGIC-RESET' -- cgit v1.2.3-70-g09d2