X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=decoders%2Fmdio%2Fpd.py;h=ed6cfef68f6081a226dd4fdf02c798297a7210e4;hb=00177e99094dc8a186238c12ee205cac105f9108;hp=2900444fe923a1b401e2b01c60e5fd5fcea87016;hpb=2452e2a32baaf818a92318165ca0bfeb7d75715b;p=libsigrokdecode.git diff --git a/decoders/mdio/pd.py b/decoders/mdio/pd.py index 2900444..ed6cfef 100644 --- a/decoders/mdio/pd.py +++ b/decoders/mdio/pd.py @@ -29,7 +29,7 @@ import sigrokdecode as srd class Decoder(srd.Decoder): - api_version = 2 + api_version = 3 id = 'mdio' name = 'MDIO' longname = 'Management Data Input/Output' @@ -62,7 +62,7 @@ class Decoder(srd.Decoder): ) def __init__(self): - self.last_mdc = 1 + self.initial_pins = [1, 1] self.illegal_bus = 0 self.samplenum = -1 self.clause45_addr = -1 # Clause 45 is context sensitive. @@ -273,9 +273,10 @@ class Decoder(srd.Decoder): def state_DATA(self, mdio): if self.data == -1: self.data = 0 - self.putff([2, ['TA', 'T']]) + self.putff([2, ['TURNAROUND', 'TA', 'T']]) if self.ta_invalid: - self.putff([4, ['TA%s' % self.ta_invalid, 'TA', 'T']]) + self.putff([4, ['TURNAROUND%s' % self.ta_invalid, + 'TA%s' % self.ta_invalid, 'TA', 'T']]) self.ss_frame_field = self.samplenum self.data_bits -= 1 self.data |= mdio << self.data_bits @@ -316,14 +317,8 @@ class Decoder(srd.Decoder): self.process_state(self.state, mdio) - def decode(self, ss, es, data): - for (self.samplenum, pins) in data: - # Ignore identical samples early on (for performance reasons). - if self.last_mdc == pins[0]: - continue - self.last_mdc = pins[0] - if pins[0] == 0: # Check for rising edge. - continue - - # Found the correct clock edge, now get/handle the bit(s). + def decode(self): + while True: + # Process pin state upon rising MDC edge. + pins = self.wait({0: 'r'}) self.handle_bit(pins[1])