X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=decoders%2Flpc%2Fpd.py;h=983e8d9b28e6d5f85d2b4918250def9f8a9c8043;hp=61c63834d9528da9f03d62c479506d57f9535d3d;hb=9f2f42c064e8a7100cee13460a7a3638f468f56a;hpb=1cb844734958781fea47b7884db6e56d8a83c000 diff --git a/decoders/lpc/pd.py b/decoders/lpc/pd.py index 61c6383..983e8d9 100644 --- a/decoders/lpc/pd.py +++ b/decoders/lpc/pd.py @@ -1,7 +1,7 @@ ## ## This file is part of the libsigrokdecode project. ## -## Copyright (C) 2012 Uwe Hermann +## Copyright (C) 2012-2013 Uwe Hermann ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by @@ -18,8 +18,6 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -# LPC protocol decoder - import sigrokdecode as srd # ... @@ -108,7 +106,6 @@ class Decoder(srd.Decoder): outputs = ['lpc'] probes = [ {'id': 'lframe', 'name': 'LFRAME#', 'desc': 'TODO'}, - {'id': 'lreset', 'name': 'LRESET#', 'desc': 'TODO'}, {'id': 'lclk', 'name': 'LCLK', 'desc': 'TODO'}, {'id': 'lad0', 'name': 'LAD[0]', 'desc': 'TODO'}, {'id': 'lad1', 'name': 'LAD[1]', 'desc': 'TODO'}, @@ -116,6 +113,7 @@ class Decoder(srd.Decoder): {'id': 'lad3', 'name': 'LAD[3]', 'desc': 'TODO'}, ] optional_probes = [ + {'id': 'lreset', 'name': 'LRESET#', 'desc': 'TODO'}, {'id': 'ldrq', 'name': 'LDRQ#', 'desc': 'TODO'}, {'id': 'serirq', 'name': 'SERIRQ', 'desc': 'TODO'}, {'id': 'clkrun', 'name': 'CLKRUN#', 'desc': 'TODO'}, @@ -125,7 +123,14 @@ class Decoder(srd.Decoder): ] options = {} annotations = [ - ['Text', 'Human-readable text'], + ['warnings', 'Warnings'], + ['start', 'Start'], + ['cycle-type', 'Cycle-type/direction'], + ['addr', 'Address'], + ['tar1', 'Turn-around cycle 1'], + ['sync', 'Sync'], + ['data', 'Data'], + ['tar2', 'Turn-around cycle 2'], ] def __init__(self, **kwargs): @@ -140,14 +145,15 @@ class Decoder(srd.Decoder): self.databyte = 0 self.tarcount = 0 self.synccount = 0 - self.oldpins = (-1, -1, -1, -1, -1, -1, -1) + self.oldpins = None + self.ss_block = self.es_block = None - def start(self, metadata): - # self.out_proto = self.add(srd.OUTPUT_PROTO, 'lpc') - self.out_ann = self.add(srd.OUTPUT_ANN, 'lpc') + def start(self): + # self.out_proto = self.register(srd.OUTPUT_PYTHON) + self.out_ann = self.register(srd.OUTPUT_ANN) - def report(self): - pass + def putb(self, data): + self.put(self.ss_block, self.es_block, self.out_ann, data) def handle_get_start(self, lad, lad_bits, lframe): # LAD[3:0]: START field (1 clock cycle). @@ -156,15 +162,14 @@ class Decoder(srd.Decoder): # the peripherals must use. However, the host can keep LFRAME# asserted # multiple clocks, and we output all START fields that occur, even # though the peripherals are supposed to ignore all but the last one. - s = fields['START'][lad] - self.put(0, 0, self.out_ann, [0, [s]]) + self.es_block = self.samplenum + self.putb([1, [fields['START'][lad], 'START', 'St', 'S']]) + self.ss_block = self.samplenum # Output a warning if LAD[3:0] changes while LFRAME# is low. # TODO if (self.lad != -1 and self.lad != lad): - self.put(0, 0, self.out_ann, - [0, ['Warning: LAD[3:0] changed while ' - 'LFRAME# was asserted']]) + self.putb([0, ['LAD[3:0] changed while LFRAME# was asserted']]) # LFRAME# is asserted (low). Wait until it gets de-asserted again # (the host is allowed to keep it asserted multiple clocks). @@ -181,11 +186,11 @@ class Decoder(srd.Decoder): # TODO: Warning/error on invalid cycle types. if self.cycle_type == 'Reserved': - self.put(0, 0, self.out_ann, - [0, ['Warning: Invalid cycle type (%s)' % lad_bits]]) + self.putb([0, ['Invalid cycle type (%s)' % lad_bits]]) - # ... - self.put(0, 0, self.out_ann, [0, ['Cycle type: %s' % self.cycle_type]]) + self.es_block = self.samplenum + self.putb([2, ['Cycle type: %s' % self.cycle_type]]) + self.ss_block = self.samplenum self.state = 'GET ADDR' self.addr = 0 @@ -212,8 +217,10 @@ class Decoder(srd.Decoder): self.cur_nibble += 1 return + self.es_block = self.samplenum s = 'Address: 0x%%0%dx' % addr_nibbles - self.put(0, 0, self.out_ann, [0, [s % self.addr]]) + self.putb([3, [s % self.addr]]) + self.ss_block = self.samplenum self.state = 'GET TAR' self.tar_count = 0 @@ -221,17 +228,17 @@ class Decoder(srd.Decoder): def handle_get_tar(self, lad, lad_bits): # LAD[3:0]: First TAR (turn-around) field (2 clock cycles). - self.put(0, 0, self.out_ann, [0, ['TAR, cycle %d: %s' - % (self.tarcount, lad_bits)]]) + self.es_block = self.samplenum + self.putb([4, ['TAR, cycle %d: %s' % (self.tarcount, lad_bits)]]) + self.ss_block = self.samplenum # On the first TAR clock cycle LAD[3:0] is driven to 1111 by # either the host or peripheral. On the second clock cycle, # the host or peripheral tri-states LAD[3:0], but its value # should still be 1111, due to pull-ups on the LAD lines. if lad_bits != '1111': - self.put(0, 0, self.out_ann, - [0, ['Warning: TAR, cycle %d: %s (expected 1111)' - % (self.tarcount, lad_bits)]]) + self.putb([0, ['TAR, cycle %d: %s (expected 1111)' % \ + (self.tarcount, lad_bits)]]) if (self.tarcount != 1): self.tarcount += 1 @@ -248,11 +255,12 @@ class Decoder(srd.Decoder): # TODO: Warnings if reserved value are seen? if self.cycle_type == 'Reserved': - self.put(0, 0, self.out_ann, [0, ['Warning: SYNC, cycle %d: %s ' - '(reserved value)' % (self.synccount, self.sync_val)]]) + self.putb([0, ['SYNC, cycle %d: %s (reserved value)' % \ + (self.synccount, self.sync_val)]]) - self.put(0, 0, self.out_ann, [0, ['SYNC, cycle %d: %s' - % (self.synccount, self.sync_val)]]) + self.es_block = self.samplenum + self.putb([5, ['SYNC, cycle %d: %s' % (self.synccount, self.sync_val)]]) + self.ss_block = self.samplenum # TODO @@ -274,7 +282,9 @@ class Decoder(srd.Decoder): self.cycle_count += 1 return - self.put(0, 0, self.out_ann, [0, ['DATA: 0x%02x' % self.databyte]]) + self.es_block = self.samplenum + self.putb([6, ['DATA: 0x%02x' % self.databyte]]) + self.ss_block = self.samplenum self.cycle_count = 0 self.state = 'GET TAR2' @@ -282,17 +292,17 @@ class Decoder(srd.Decoder): def handle_get_tar2(self, lad, lad_bits): # LAD[3:0]: Second TAR field (2 clock cycles). - self.put(0, 0, self.out_ann, [0, ['TAR, cycle %d: %s' - % (self.tarcount, lad_bits)]]) + self.es_block = self.samplenum + self.putb([7, ['TAR, cycle %d: %s' % (self.tarcount, lad_bits)]]) + self.ss_block = self.samplenum # On the first TAR clock cycle LAD[3:0] is driven to 1111 by # either the host or peripheral. On the second clock cycle, # the host or peripheral tri-states LAD[3:0], but its value # should still be 1111, due to pull-ups on the LAD lines. if lad_bits != '1111': - self.put(0, 0, self.out_ann, - [0, ['Warning: TAR, cycle %d: %s (expected 1111)' - % (self.tarcount, lad_bits)]]) + self.putb([0, ['Warning: TAR, cycle %d: %s (expected 1111)' + % (self.tarcount, lad_bits)]]) if (self.tarcount != 1): self.tarcount += 1 @@ -302,7 +312,7 @@ class Decoder(srd.Decoder): self.state = 'IDLE' def decode(self, ss, es, data): - for (samplenum, pins) in data: + for (self.samplenum, pins) in data: # If none of the pins changed, there's nothing to do. if self.oldpins == pins: @@ -312,8 +322,8 @@ class Decoder(srd.Decoder): self.oldpins = pins # Get individual pin values into local variables. - # TODO: Handle optional pins. - (lframe, lreset, lclk, lad0, lad1, lad2, lad3) = pins + (lframe, lclk, lad0, lad1, lad2, lad3) = pins[:6] + (lreset, ldrq, serirq, clkrun, lpme, lpcpd, lsmi) = pins[6:] # Only look at the signals upon rising LCLK edges. The LPC clock # is the same as the PCI clock (which is sampled at rising edges). @@ -326,7 +336,7 @@ class Decoder(srd.Decoder): if self.state != 'IDLE': lad = (lad3 << 3) | (lad2 << 2) | (lad1 << 1) | lad0 lad_bits = bin(lad)[2:].zfill(4) - # self.put(0, 0, self.out_ann, [0, ['LAD: %s' % lad_bits]]) + # self.putb([0, ['LAD: %s' % lad_bits]]) # TODO: Only memory read/write is currently supported/tested. @@ -335,6 +345,7 @@ class Decoder(srd.Decoder): # A valid LPC cycle starts with LFRAME# being asserted (low). if lframe != 0: continue + self.ss_block = self.samplenum self.state = 'GET START' self.lad = -1 # self.clocknum = 0