i2c: Generate proper exception for missing samplerate, and test for it.

Also remove some dead code.

diff --git a/decoders/i2c/pd.py b/decoders/i2c/pd.py
index 2d6e5c2986bdf26d1ca54b0e9cc23641dfc58a2b..ced58cde5d093278b93f8af7328be135e7482729 100644 (file)
--- a/decoders/i2c/pd.py
+++ b/decoders/i2c/pd.py
@@ -63,6 +63,9 @@ proto = {
     'DATA WRITE':      [9, 'Data write',    'DW'],
 }
 
+class SamplerateError(Exception):
+    pass
+
 class Decoder(srd.Decoder):
     api_version = 2
     id = 'i2c'
@@ -265,8 +268,8 @@ class Decoder(srd.Decoder):
         self.bits = []
 
     def decode(self, ss, es, data):
-        if self.samplerate is None:
-            raise Exception("Cannot decode without samplerate.")
+        if not self.samplerate:
+            raise SamplerateError("Cannot decode without samplerate.")
         for (self.samplenum, pins) in data:
 
             # Ignore identical samples early on (for performance reasons).
@@ -293,8 +296,6 @@ class Decoder(srd.Decoder):
             elif self.state == 'FIND ACK':
                 if self.is_data_bit(scl, sda):
                     self.get_ack(scl, sda)
-            else:
-                raise Exception('Invalid state: %s' % self.state)
 
             # Save current SDA/SCL values for the next round.
             self.oldscl, self.oldsda = scl, sda

diff --git a/decoders/i2c/test/test.conf b/decoders/i2c/test/test.conf
index bd1068beff4b3bb5f2fd8fff6d3fde42ead325a0..5c08e1d517b70b9317b5a37d2fde0a06781ac887 100644 (file)
--- a/decoders/i2c/test/test.conf
+++ b/decoders/i2c/test/test.conf
@@ -20,3 +20,8 @@ test xfp
        output i2c binary class address-read match xfp_address_read.binary
        output i2c binary class address-write match xfp_address_write.binary
 
+test exceptions
+       protocol-decoder i2c
+       input misc/no-samplerate.sr
+       output i2c exception match SamplerateError
+