From bf1c3f4db0ffbc05f29f81541c551c691ccd2ba7 Mon Sep 17 00:00:00 2001 From: Uwe Hermann Date: Thu, 12 Jan 2012 21:57:51 +0100 Subject: srd: i2c: Use short-form if-else Python idiom. --- decoders/i2c.py | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) (limited to 'decoders') diff --git a/decoders/i2c.py b/decoders/i2c.py index edaeb94..15ef9c6 100644 --- a/decoders/i2c.py +++ b/decoders/i2c.py @@ -183,10 +183,7 @@ class Decoder(srd.Decoder): return False def found_start(self, scl, sda): - if self.is_repeat_start == 1: - cmd = 'START_REPEAT' - else: - cmd = 'START' + cmd = 'START_REPEAT' if (self.is_repeat_start == 1) else 'START' self.put(self.out_proto, [cmd, None, None]) self.put(self.out_ann, [ANN_SHIFTED, [protocol[cmd][0]]]) @@ -222,10 +219,7 @@ class Decoder(srd.Decoder): if self.state == FIND_ADDRESS: # The READ/WRITE bit is only in address bytes, not data bytes. - if self.databyte & 1: - self.wr = 0 - else: - self.wr = 1 + self.wr = 0 if (self.databyte & 1) else 1 d = self.databyte >> 1 elif self.state == FIND_DATA: d = self.databyte @@ -234,10 +228,7 @@ class Decoder(srd.Decoder): pass # Last bit that came in was the ACK/NACK bit (1 = NACK). - if sda == 1: - ack_bit = 'NACK' - else: - ack_bit = 'ACK' + ack_bit = 'NACK' if (sda == 1) else 'ACK' if self.state == FIND_ADDRESS and self.wr == 1: cmd = 'ADDRESS_WRITE' -- cgit v1.2.3-70-g09d2