Various PDs: Drop currently unsupported probes in stacked PDs.

At the moment we don't yet support PDs which take both input from
another PD (which they're stacked on top of) and from one or more
logic inputs/pins.

This will be supported later on, and at that time we'll bring back
these changes.

diff --git a/decoders/avr_isp/pd.py b/decoders/avr_isp/pd.py
index 42ac48b7d6712f74d77878e39b658c8750e90c4f..0168875449d52477169544492bec89da289b5537 100644 (file)
--- a/decoders/avr_isp/pd.py
+++ b/decoders/avr_isp/pd.py
@@ -30,11 +30,8 @@ class Decoder(srd.Decoder):
     longname = 'AVR In-System Programming'
     desc = 'Protocol for in-system programming Atmel AVR MCUs.'
     license = 'gplv2+'
-    inputs = ['spi', 'logic']
+    inputs = ['spi']
     outputs = ['avr_isp']
-    optional_probes = (
-        {'id': 'reset', 'name': 'RESET#', 'desc': 'Target AVR MCU reset'},
-    )
     annotations = (
         ('pe', 'Programming enable'),
         ('rsb0', 'Read signature byte 0'),

diff --git a/decoders/lm75/pd.py b/decoders/lm75/pd.py
index 1fe03a6609d9ac14be113a7dafffc05a3721c6a5..bdd8cb0a43317298e37aa6f00ace9b2a9a10561c 100644 (file)
--- a/decoders/lm75/pd.py
+++ b/decoders/lm75/pd.py
@@ -48,12 +48,6 @@ class Decoder(srd.Decoder):
     license = 'gplv2+'
     inputs = ['i2c']
     outputs = ['lm75']
-    optional_probes = (
-        {'id': 'os', 'name': 'OS', 'desc': 'Overtemperature shutdown'},
-        {'id': 'a0', 'name': 'A0', 'desc': 'I²C slave address input 0'},
-        {'id': 'a1', 'name': 'A1', 'desc': 'I²C slave address input 1'},
-        {'id': 'a2', 'name': 'A2', 'desc': 'I²C slave address input 2'},
-    )
     options = (
         {'id': 'sensor', 'desc': 'Sensor type', 'default': 'lm75'},
         {'id': 'resolution', 'desc': 'Resolution', 'default': 9,

diff --git a/decoders/maxim_ds28ea00/pd.py b/decoders/maxim_ds28ea00/pd.py
index 2492c6bcfeb270f799615e7557c15a1187aa372c..9f120ae63f083903555147f15c9a876542dba30a 100644 (file)
--- a/decoders/maxim_ds28ea00/pd.py
+++ b/decoders/maxim_ds28ea00/pd.py
@@ -44,12 +44,6 @@ class Decoder(srd.Decoder):
     license = 'gplv2+'
     inputs = ['onewire_network']
     outputs = ['maxim_ds28ea00']
-    optional_probes = (
-        {'id': 'pioa', 'name': 'PIOA/DONE#',
-         'desc': 'PIOA channel and chain output'},
-        {'id': 'piob', 'name': 'PIOB/EN#',
-         'desc': 'PIOB channel and chain output'},
-    )
     annotations = (
         ('text', 'Human-readable text'),
     )

diff --git a/decoders/mx25lxx05d/pd.py b/decoders/mx25lxx05d/pd.py
index 2a4fa61dfac822746358ee76575aade3404b8190..1099953553d4c0333484624ca20b56b803ea3208 100644 (file)
--- a/decoders/mx25lxx05d/pd.py
+++ b/decoders/mx25lxx05d/pd.py
@@ -89,12 +89,8 @@ class Decoder(srd.Decoder):
     longname = 'Macronix MX25Lxx05D'
     desc = 'SPI (NOR) flash chip protocol.'
     license = 'gplv2+'
-    inputs = ['spi', 'logic']
+    inputs = ['logic']
     outputs = ['mx25lxx05d']
-    optional_probes = (
-        {'id': 'hold', 'name': 'HOLD#', 'desc': 'Pause device w/o deselecting it'},
-        {'id': 'wp_acc', 'name': 'WP#/ACC', 'desc': 'Write protect'},
-    )
     annotations = cmd_annotation_classes() + (
         ('bits', 'Bits'),
         ('bits2', 'Bits2'),

diff --git a/decoders/mxc6225xu/pd.py b/decoders/mxc6225xu/pd.py
index c1a2a810a9a3d560b6b78df94ecda135b19be41d..67656a9af0538a571b4b322912083ed1ac49d44e 100644 (file)
--- a/decoders/mxc6225xu/pd.py
+++ b/decoders/mxc6225xu/pd.py
@@ -68,9 +68,6 @@ class Decoder(srd.Decoder):
     license = 'gplv2+'
     inputs = ['i2c']
     outputs = ['mxc6225xu']
-    optional_probes = (
-        {'id': 'int', 'name': 'INT', 'desc': 'DTOS interrupt output pin'},
-    )
     annotations = (
         ('text', 'Human-readable text'),
     )

diff --git a/decoders/rtc8564/pd.py b/decoders/rtc8564/pd.py
index 41cff0d6ef5f8bea2d885589a3f7f034b9396439..47bb5d562f22d399980217391736538d512e6325 100644 (file)
--- a/decoders/rtc8564/pd.py
+++ b/decoders/rtc8564/pd.py
@@ -40,11 +40,6 @@ class Decoder(srd.Decoder):
     license = 'gplv2+'
     inputs = ['i2c']
     outputs = ['rtc8564']
-    optional_probes = (
-        {'id': 'clkout', 'name': 'CLKOUT', 'desc': 'Clock output'},
-        {'id': 'clkoe', 'name': 'CLKOE', 'desc': 'Clock output enable'},
-        {'id': 'int', 'name': 'INT#', 'desc': 'Interrupt'},
-    )
     annotations = reg_list() + (
         ('read', 'Read date/time'),
         ('write', 'Write date/time'),