From: Uwe Hermann Date: Wed, 1 Mar 2017 23:03:16 +0000 (+0100) Subject: Drop obsolete workarounds in PDs. X-Git-Tag: libsigrokdecode-0.5.0~69 X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=fcd5d23a05282728ad7693f997b1b81d67d409cb;p=libsigrokdecode.git Drop obsolete workarounds in PDs. Some PDs were using a temporary workaround for (as it turned out) a refcounting issue that was fixed in 066fbafdc3ba734a73b5f7fcfa1dbae67ddebf8a. --- diff --git a/decoders/i2c/pd.py b/decoders/i2c/pd.py index 6172fb4..d2f8bc4 100644 --- a/decoders/i2c/pd.py +++ b/decoders/i2c/pd.py @@ -272,8 +272,7 @@ class Decoder(srd.Decoder): # a) Data sampling of receiver: SCL = rising, and/or # b) START condition (S): SCL = high, SDA = falling, and/or # c) STOP condition (P): SCL = high, SDA = rising - conds = [{0: 'r'}, {0: 'h', 1: 'f'}, {0: 'h', 1: 'r'}] - pins = self.wait(conds[:]) # TODO + pins = self.wait([{0: 'r'}, {0: 'h', 1: 'f'}, {0: 'h', 1: 'r'}]) # Check which of the condition(s) matched and handle them. if self.matched[0]: diff --git a/decoders/parallel/pd.py b/decoders/parallel/pd.py index 748cb2b..db9b371 100644 --- a/decoders/parallel/pd.py +++ b/decoders/parallel/pd.py @@ -177,7 +177,7 @@ class Decoder(srd.Decoder): if self.has_channel(i): conds.append({i: 'e'}) while True: - self.handle_bits(self.wait(conds[:])[1:]) + self.handle_bits(self.wait(conds)[1:]) else: # Sample on the rising or falling CLK edge (depends on config). while True: