13 files changed, 13 insertions, 13 deletions
diff --git a/decoders/dcf77/dcf77.py b/decoders/dcf77/dcf77.py
index 5379592..098c3b9 100644
--- a/decoders/dcf77/dcf77.py
+++ b/decoders/dcf77/dcf77.py
@@ -57,7 +57,7 @@ class Decoder(srd.Decoder):
     probes = [
         {'id': 'data', 'name': 'DATA', 'desc': 'DATA line'},
     ]
-    extra_probes = [
+    optional_probes = [
         {'id': 'pon', 'name': 'PON', 'desc': 'TODO'},
     ]
     options = {}
diff --git a/decoders/ebr30a_i2c_demux/ebr30a_i2c_demux.py b/decoders/ebr30a_i2c_demux/ebr30a_i2c_demux.py
index 59649fd..6abed09 100644
--- a/decoders/ebr30a_i2c_demux/ebr30a_i2c_demux.py
+++ b/decoders/ebr30a_i2c_demux/ebr30a_i2c_demux.py
@@ -50,7 +50,7 @@ class Decoder(srd.Decoder):
     inputs = ['i2c']
     outputs = ['i2c-axp199', 'i2c-h8563s', 'i2c-accel'] # TODO: type vs. inst.
     probes = []
-    extra_probes = []
+    optional_probes = []
     options = {}
     annotations = []
 
diff --git a/decoders/i2c/i2c.py b/decoders/i2c/i2c.py
index 816fd79..527fa6e 100644
--- a/decoders/i2c/i2c.py
+++ b/decoders/i2c/i2c.py
@@ -129,7 +129,7 @@ class Decoder(srd.Decoder):
         {'id': 'scl', 'name': 'SCL', 'desc': 'Serial clock line'},
         {'id': 'sda', 'name': 'SDA', 'desc': 'Serial data line'},
     ]
-    extra_probes = []
+    optional_probes = []
     options = {
         'addressing': ['Slave addressing (in bits)', 7], # 7 or 10
     }
diff --git a/decoders/i2cdemux/i2cdemux.py b/decoders/i2cdemux/i2cdemux.py
index 4926160..354d06c 100644
--- a/decoders/i2cdemux/i2cdemux.py
+++ b/decoders/i2cdemux/i2cdemux.py
@@ -38,7 +38,7 @@ class Decoder(srd.Decoder):
     inputs = ['i2c']
     outputs = [] # TODO: Only known at run-time.
     probes = []
-    extra_probes = []
+    optional_probes = []
     options = {}
     annotations = []
 
diff --git a/decoders/mlx90614/mlx90614.py b/decoders/mlx90614/mlx90614.py
index 235d70d..4cc39a3 100644
--- a/decoders/mlx90614/mlx90614.py
+++ b/decoders/mlx90614/mlx90614.py
@@ -35,7 +35,7 @@ class Decoder(srd.Decoder):
     inputs = ['i2c']
     outputs = ['mlx90614']
     probes = []
-    extra_probes = []
+    optional_probes = []
     options = {}
     annotations = [
         ['Celsius', 'Temperature in degrees Celsius'],
diff --git a/decoders/mx25lxx05d/mx25lxx05d.py b/decoders/mx25lxx05d/mx25lxx05d.py
index 4139fcb..a21ba3f 100644
--- a/decoders/mx25lxx05d/mx25lxx05d.py
+++ b/decoders/mx25lxx05d/mx25lxx05d.py
@@ -112,7 +112,7 @@ class Decoder(srd.Decoder):
     inputs = ['spi', 'logic']
     outputs = ['mx25lxx05d']
     probes = []
-    extra_probes = [
+    optional_probes = [
         {'id': 'hold', 'name': 'HOLD#', 'desc': 'TODO.'},
         {'id': 'wp_acc', 'name': 'WP#/ACC', 'desc': 'TODO.'},
     ]
diff --git a/decoders/nunchuk/nunchuk.py b/decoders/nunchuk/nunchuk.py
index 0f1e356..db40d35 100644
--- a/decoders/nunchuk/nunchuk.py
+++ b/decoders/nunchuk/nunchuk.py
@@ -50,7 +50,7 @@ class Decoder(srd.Decoder):
     inputs = ['i2c']
     outputs = ['nunchuck']
     probes = []
-    extra_probes = [] # TODO
+    optional_probes = [] # TODO
     options = {}
     annotations = [
         ['TODO', 'TODO'], 
diff --git a/decoders/pan1321/pan1321.py b/decoders/pan1321/pan1321.py
index 13f1226..9c22637 100644
--- a/decoders/pan1321/pan1321.py
+++ b/decoders/pan1321/pan1321.py
@@ -47,7 +47,7 @@ class Decoder(srd.Decoder):
     inputs = ['uart']
     outputs = ['pan1321']
     probes = []
-    extra_probes = []
+    optional_probes = []
     options = {}
     annotations = [
         ['ASCII', 'TODO: description'],
diff --git a/decoders/rtc8564/rtc8564.py b/decoders/rtc8564/rtc8564.py
index 97b0808..18f8c24 100644
--- a/decoders/rtc8564/rtc8564.py
+++ b/decoders/rtc8564/rtc8564.py
@@ -47,7 +47,7 @@ class Decoder(srd.Decoder):
     inputs = ['i2c']
     outputs = ['rtc8564']
     probes = []
-    extra_probes = [
+    optional_probes = [
         {'id': 'clkout', 'name': 'CLKOUT', 'desc': 'TODO.'},
         {'id': 'clkoe', 'name': 'CLKOE', 'desc': 'TODO.'},
         {'id': 'int', 'name': 'INT#', 'desc': 'TODO.'},
diff --git a/decoders/spi/spi.py b/decoders/spi/spi.py
index a06498b..ff186dd 100644
--- a/decoders/spi/spi.py
+++ b/decoders/spi/spi.py
@@ -66,7 +66,7 @@ class Decoder(srd.Decoder):
         {'id': 'sck', 'name': 'CLK', 'desc': 'SPI clock line'},
         {'id': 'cs', 'name': 'CS#', 'desc': 'SPI CS (chip select) line'},
     ]
-    extra_probes = [] # TODO
+    optional_probes = [] # TODO
     options = {
         'cs_polarity': ['CS# polarity', ACTIVE_LOW],
         'cpol': ['Clock polarity', CPOL_0],
diff --git a/decoders/transitioncounter/transitioncounter.py b/decoders/transitioncounter/transitioncounter.py
index 86bbfbe..4156bfc 100644
--- a/decoders/transitioncounter/transitioncounter.py
+++ b/decoders/transitioncounter/transitioncounter.py
@@ -31,7 +31,7 @@ class Decoder(srd.Decoder):
     inputs = ['logic']
     outputs = ['transitioncounts']
     probes = []
-    extra_probes = []
+    optional_probes = []
     options = {}
     annotations = [
         ['TODO', 'TODO'],
diff --git a/decoders/uart/uart.py b/decoders/uart/uart.py
index abf596e..b70496f 100644
--- a/decoders/uart/uart.py
+++ b/decoders/uart/uart.py
@@ -199,7 +199,7 @@ class Decoder(srd.Decoder):
         {'id': 'rx', 'name': 'RX', 'desc': 'UART receive line'},
         {'id': 'tx', 'name': 'TX', 'desc': 'UART transmit line'},
     ]
-    extra_probes = []
+    optional_probes = []
     options = {
         'baudrate': ['Baud rate', 115200],
         'num_data_bits': ['Data bits', 8], # Valid: 5-9.
diff --git a/decoders/usb/usb.py b/decoders/usb/usb.py
index 6441526..b209aa3 100644
--- a/decoders/usb/usb.py
+++ b/decoders/usb/usb.py
@@ -118,7 +118,7 @@ class Decoder(srd.Decoder):
         {'id': 'dp', 'name': 'D+', 'desc': 'USB D+ signal'},
         {'id': 'dm', 'name': 'D-', 'desc': 'USB D- signal'},
     ]
-    extra_probes = []
+    optional_probes = []
     options = {}
     annotations = [
         ['TODO', 'TODO']