sr/srd: Small fixes, constifications, doc updates.

diff --git a/decoder.c b/decoder.c
index d7780d5b8e5d0d6fe086a27ce363c7011e4d1a9e..0aa1c5f8474a11b105983dd36eaf58c65c09d291 100644 (file)
--- a/decoder.c
+++ b/decoder.c
@@ -62,7 +62,8 @@ SRD_API struct srd_decoder *srd_decoder_get_by_id(const char *id)
        return NULL;
 }
 
-static int get_probes(struct srd_decoder *d, char *attr, GSList **pl)
+static int get_probes(const struct srd_decoder *d, const char *attr,
+                     GSList **pl)
 {
        PyObject *py_probelist, *py_entry;
        struct srd_probe *p;

diff --git a/decoders/i2cdemux/i2cdemux.py b/decoders/i2cdemux/i2cdemux.py
index 4632c8df17644e73936f2a3b7c478e8152bf7f9e..6f2964933fbea75d379397ca9552729a7644173e 100644 (file)
--- a/decoders/i2cdemux/i2cdemux.py
+++ b/decoders/i2cdemux/i2cdemux.py
@@ -26,7 +26,7 @@ class Decoder(srd.Decoder):
     api_version = 1
     id = 'i2cdemux'
     name = 'I2C demux'
-    longname = 'Generic I2C demultiplexer'
+    longname = 'I2C demultiplexer'
     desc = 'TODO.'
     longdesc = 'TODO.'
     license = 'gplv2+'

diff --git a/decoders/usb/usb.py b/decoders/usb/usb.py
index bd402dd23c88a652c54d145f899d6ffda3679f83..576855f09bd0bd89a013d8937d626bd44ca54b30 100644 (file)
--- a/decoders/usb/usb.py
+++ b/decoders/usb/usb.py
@@ -105,14 +105,14 @@ class Decoder(srd.Decoder):
         pass
 
     def start(self, metadata):
-        self.rate = metadata['samplerate']
+        self.samplerate = metadata['samplerate']
 
         # self.out_proto = self.add(srd.OUTPUT_PROTO, 'usb')
         self.out_ann = self.add(srd.OUTPUT_ANN, 'usb')
 
-        if self.rate < 48000000:
-            raise Exception('Sample rate (%d) not sufficient for USB '
-                            'decoding, need at least 48MHz' % self.rate)
+        if self.samplerate < 48000000:
+            raise Exception('Samplerate (%d) not sufficient for USB '
+                            'decoding, need at least 48MHz' % self.samplerate)
 
         # Initialise decoder state.
         self.sym = 'J'
@@ -142,7 +142,7 @@ class Decoder(srd.Decoder):
 
             # How many bits since the last transition?
             if self.packet != '' or self.sym != 'J':
-                bitcount = int((self.scount - 1) * 12000000 / self.rate)
+                bitcount = int((self.scount - 1) * 12000000 / self.samplerate)
             else:
                 bitcount = 0