X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=decoders%2Fjtag%2Fpd.py;h=fec75d65772ba02e9b2b51bcba9fb4c45ffce363;hb=da9bcbd9f45b0153465c55ec726a0d76f6d7f01e;hp=26ddbac5fd9a7152e6287b370a4962c321689aae;hpb=c515eed7ef7a04a42b5b34abd308e08d6942835e;p=libsigrokdecode.git diff --git a/decoders/jtag/pd.py b/decoders/jtag/pd.py index 26ddbac..fec75d6 100644 --- a/decoders/jtag/pd.py +++ b/decoders/jtag/pd.py @@ -53,12 +53,6 @@ jtag_states = [ 'SHIFT-IR', 'EXIT1-IR', 'EXIT2-IR', ] -def get_annotation_classes(): - l = [] - for s in jtag_states: - l.append([s.lower(), s]) - return l - class Decoder(srd.Decoder): api_version = 1 id = 'jtag' @@ -68,19 +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'}, - ] - options = {} - annotations = get_annotation_classes() + ) + annotations = tuple([tuple([s.lower(), s]) for s in jtag_states]) def __init__(self, **kwargs): # self.state = 'TEST-LOGIC-RESET'