From b197383cfb39b39ff04644855eef57f5d3c18bc1 Mon Sep 17 00:00:00 2001
From: Uwe Hermann <uwe@hermann-uwe.de>
Date: Fri, 16 Jun 2017 16:27:08 +0200
Subject: [PATCH] Mark all stacked decoders as being PD API version 3.

This is not really relevant for stacked PDs currently (they can be used
unmodified with either PDv2 or PDv3 low-level decoders), but it'll allow
us to drop PDv2 support completely.
---
 decoders/ade77xx/pd.py         | 2 +-
 decoders/adf435x/pd.py         | 2 +-
 decoders/adns5020/pd.py        | 2 +-
 decoders/arm_etmv3/pd.py       | 2 +-
 decoders/arm_itm/pd.py         | 2 +-
 decoders/arm_tpiu/pd.py        | 2 +-
 decoders/avr_isp/pd.py         | 2 +-
 decoders/ds1307/pd.py          | 2 +-
 decoders/ds28ea00/pd.py        | 2 +-
 decoders/edid/pd.py            | 2 +-
 decoders/eeprom24xx/pd.py      | 2 +-
 decoders/eeprom93xx/pd.py      | 2 +-
 decoders/i2cdemux/pd.py        | 2 +-
 decoders/i2cfilter/pd.py       | 2 +-
 decoders/jtag_stm32/pd.py      | 2 +-
 decoders/lm75/pd.py            | 2 +-
 decoders/max7219/pd.py         | 2 +-
 decoders/midi/pd.py            | 2 +-
 decoders/mlx90614/pd.py        | 2 +-
 decoders/modbus/pd.py          | 2 +-
 decoders/mrf24j40/pd.py        | 2 +-
 decoders/mxc6225xu/pd.py       | 2 +-
 decoders/nrf24l01/pd.py        | 2 +-
 decoders/nunchuk/pd.py         | 2 +-
 decoders/onewire_network/pd.py | 2 +-
 decoders/pan1321/pd.py         | 2 +-
 decoders/rfm12/pd.py           | 2 +-
 decoders/rgb_led_spi/pd.py     | 2 +-
 decoders/rtc8564/pd.py         | 2 +-
 decoders/sdcard_spi/pd.py      | 2 +-
 decoders/spiflash/pd.py        | 2 +-
 decoders/ssi32/pd.py           | 2 +-
 decoders/tca6408a/pd.py        | 2 +-
 decoders/usb_packet/pd.py      | 2 +-
 decoders/usb_request/pd.py     | 2 +-
 decoders/xfp/pd.py             | 2 +-
 36 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/decoders/ade77xx/pd.py b/decoders/ade77xx/pd.py
index 053575e..2871025 100644
--- a/decoders/ade77xx/pd.py
+++ b/decoders/ade77xx/pd.py
@@ -26,7 +26,7 @@ import sigrokdecode as srd
 from .lists import *
 
 class Decoder(srd.Decoder):
-    api_version = 2
+    api_version = 3
     id = 'ade77xx'
     name = 'ADE77xx'
     longname = 'Analog Devices ADE77xx'
diff --git a/decoders/adf435x/pd.py b/decoders/adf435x/pd.py
index 8f51ee2..a17eb84 100644
--- a/decoders/adf435x/pd.py
+++ b/decoders/adf435x/pd.py
@@ -88,7 +88,7 @@ regs = {
 ANN_REG = 0
 
 class Decoder(srd.Decoder):
-    api_version = 2
+    api_version = 3
     id = 'adf435x'
     name = 'ADF435x'
     longname = 'Analog Devices ADF4350/1'
diff --git a/decoders/adns5020/pd.py b/decoders/adns5020/pd.py
index 5857314..0ee3f8b 100644
--- a/decoders/adns5020/pd.py
+++ b/decoders/adns5020/pd.py
@@ -39,7 +39,7 @@ regs = {
 }
 
 class Decoder(srd.Decoder):
-    api_version = 2
+    api_version = 3
     id = 'adns5020'
     name = 'ADNS-5020'
     longname = 'Avago ADNS-5020 optical mouse sensor'
diff --git a/decoders/arm_etmv3/pd.py b/decoders/arm_etmv3/pd.py
index 8f353a2..8a2a8bb 100644
--- a/decoders/arm_etmv3/pd.py
+++ b/decoders/arm_etmv3/pd.py
@@ -127,7 +127,7 @@ def parse_branch_addr(bytes, ref_addr, cpu_state, branch_enc):
     return addr, addrlen, cpu_state, exc_info
 
 class Decoder(srd.Decoder):
-    api_version = 2
+    api_version = 3
     id = 'arm_etmv3'
     name = 'ARM ETMv3'
     longname = 'ARM Embedded Trace Macroblock'
diff --git a/decoders/arm_itm/pd.py b/decoders/arm_itm/pd.py
index 33649a0..15ffe72 100644
--- a/decoders/arm_itm/pd.py
+++ b/decoders/arm_itm/pd.py
@@ -37,7 +37,7 @@ ARM_EXCEPTIONS = {
 }
 
 class Decoder(srd.Decoder):
-    api_version = 2
+    api_version = 3
     id = 'arm_itm'
     name = 'ARM ITM'
     longname = 'ARM Instrumentation Trace Macroblock'
diff --git a/decoders/arm_tpiu/pd.py b/decoders/arm_tpiu/pd.py
index 0a32571..efacb27 100644
--- a/decoders/arm_tpiu/pd.py
+++ b/decoders/arm_tpiu/pd.py
@@ -20,7 +20,7 @@
 import sigrokdecode as srd
 
 class Decoder(srd.Decoder):
-    api_version = 2
+    api_version = 3
     id = 'arm_tpiu'
     name = 'ARM TPIU'
     longname = 'ARM Trace Port Interface Unit'
diff --git a/decoders/avr_isp/pd.py b/decoders/avr_isp/pd.py
index 6a3a241..9c8647d 100644
--- a/decoders/avr_isp/pd.py
+++ b/decoders/avr_isp/pd.py
@@ -23,7 +23,7 @@ from .parts import *
 VENDOR_CODE_ATMEL = 0x1e
 
 class Decoder(srd.Decoder):
-    api_version = 2
+    api_version = 3
     id = 'avr_isp'
     name = 'AVR ISP'
     longname = 'AVR In-System Programming'
diff --git a/decoders/ds1307/pd.py b/decoders/ds1307/pd.py
index 9b7a21f..560d94d 100644
--- a/decoders/ds1307/pd.py
+++ b/decoders/ds1307/pd.py
@@ -52,7 +52,7 @@ def regs_and_bits():
     return tuple(l)
 
 class Decoder(srd.Decoder):
-    api_version = 2
+    api_version = 3
     id = 'ds1307'
     name = 'DS1307'
     longname = 'Dallas DS1307'
diff --git a/decoders/ds28ea00/pd.py b/decoders/ds28ea00/pd.py
index 255f7c8..2ae9469 100644
--- a/decoders/ds28ea00/pd.py
+++ b/decoders/ds28ea00/pd.py
@@ -35,7 +35,7 @@ command = {
 }
 
 class Decoder(srd.Decoder):
-    api_version = 2
+    api_version = 3
     id = 'ds28ea00'
     name = 'DS28EA00'
     longname = 'Maxim DS28EA00 1-Wire digital thermometer'
diff --git a/decoders/edid/pd.py b/decoders/edid/pd.py
index 389fbda..baf2263 100644
--- a/decoders/edid/pd.py
+++ b/decoders/edid/pd.py
@@ -73,7 +73,7 @@ ANN_FIELDS = 0
 ANN_SECTIONS = 1
 
 class Decoder(srd.Decoder):
-    api_version = 2
+    api_version = 3
     id = 'edid'
     name = 'EDID'
     longname = 'Extended Display Identification Data'
diff --git a/decoders/eeprom24xx/pd.py b/decoders/eeprom24xx/pd.py
index c259dc1..8d250b7 100644
--- a/decoders/eeprom24xx/pd.py
+++ b/decoders/eeprom24xx/pd.py
@@ -21,7 +21,7 @@ import sigrokdecode as srd
 from .lists import *
 
 class Decoder(srd.Decoder):
-    api_version = 2
+    api_version = 3
     id = 'eeprom24xx'
     name = '24xx EEPROM'
     longname = '24xx I²C EEPROM'
diff --git a/decoders/eeprom93xx/pd.py b/decoders/eeprom93xx/pd.py
index 5ae789f..82c1ae8 100644
--- a/decoders/eeprom93xx/pd.py
+++ b/decoders/eeprom93xx/pd.py
@@ -20,7 +20,7 @@
 import sigrokdecode as srd
 
 class Decoder(srd.Decoder):
-    api_version = 2
+    api_version = 3
     id = 'eeprom93xx'
     name = '93xx EEPROM'
     longname = '93xx Microwire EEPROM'
diff --git a/decoders/i2cdemux/pd.py b/decoders/i2cdemux/pd.py
index d28763b..c6ab53d 100644
--- a/decoders/i2cdemux/pd.py
+++ b/decoders/i2cdemux/pd.py
@@ -20,7 +20,7 @@
 import sigrokdecode as srd
 
 class Decoder(srd.Decoder):
-    api_version = 2
+    api_version = 3
     id = 'i2cdemux'
     name = 'I²C demux'
     longname = 'I²C demultiplexer'
diff --git a/decoders/i2cfilter/pd.py b/decoders/i2cfilter/pd.py
index c3f148f..af09c49 100644
--- a/decoders/i2cfilter/pd.py
+++ b/decoders/i2cfilter/pd.py
@@ -23,7 +23,7 @@
 import sigrokdecode as srd
 
 class Decoder(srd.Decoder):
-    api_version = 2
+    api_version = 3
     id = 'i2cfilter'
     name = 'I²C filter'
     longname = 'I²C filter'
diff --git a/decoders/jtag_stm32/pd.py b/decoders/jtag_stm32/pd.py
index d8e10e7..4cc39e0 100644
--- a/decoders/jtag_stm32/pd.py
+++ b/decoders/jtag_stm32/pd.py
@@ -134,7 +134,7 @@ def data_out(bits):
            % (data_hex, ack_meaning)
 
 class Decoder(srd.Decoder):
-    api_version = 2
+    api_version = 3
     id = 'jtag_stm32'
     name = 'JTAG / STM32'
     longname = 'Joint Test Action Group / ST STM32'
diff --git a/decoders/lm75/pd.py b/decoders/lm75/pd.py
index c8f4a1a..d65fb4d 100644
--- a/decoders/lm75/pd.py
+++ b/decoders/lm75/pd.py
@@ -39,7 +39,7 @@ ft = {
 }
 
 class Decoder(srd.Decoder):
-    api_version = 2
+    api_version = 3
     id = 'lm75'
     name = 'LM75'
     longname = 'National LM75'
diff --git a/decoders/max7219/pd.py b/decoders/max7219/pd.py
index 9589c8f..76b9b1c 100644
--- a/decoders/max7219/pd.py
+++ b/decoders/max7219/pd.py
@@ -41,7 +41,7 @@ registers = {
 ann_reg, ann_digit, ann_warning = range(3)
 
 class Decoder(srd.Decoder):
-    api_version = 2
+    api_version = 3
     id = 'max7219'
     name = 'MAX7219'
     longname = 'Maxim MAX7219/MAX7221'
diff --git a/decoders/midi/pd.py b/decoders/midi/pd.py
index 21c4024..c2d3f72 100644
--- a/decoders/midi/pd.py
+++ b/decoders/midi/pd.py
@@ -25,7 +25,7 @@ RX = 0
 TX = 1
 
 class Decoder(srd.Decoder):
-    api_version = 2
+    api_version = 3
     id = 'midi'
     name = 'MIDI'
     longname = 'Musical Instrument Digital Interface'
diff --git a/decoders/mlx90614/pd.py b/decoders/mlx90614/pd.py
index c2b37c7..1f627e6 100644
--- a/decoders/mlx90614/pd.py
+++ b/decoders/mlx90614/pd.py
@@ -20,7 +20,7 @@
 import sigrokdecode as srd
 
 class Decoder(srd.Decoder):
-    api_version = 2
+    api_version = 3
     id = 'mlx90614'
     name = 'MLX90614'
     longname = 'Melexis MLX90614'
diff --git a/decoders/modbus/pd.py b/decoders/modbus/pd.py
index 3420f99..2404312 100644
--- a/decoders/modbus/pd.py
+++ b/decoders/modbus/pd.py
@@ -811,7 +811,7 @@ class Modbus_ADU_CS(Modbus_ADU):
         self.check_crc(bytecount + 12)
 
 class Decoder(srd.Decoder):
-    api_version = 2
+    api_version = 3
     id = 'modbus'
     name = 'Modbus'
     longname = 'Modbus RTU over RS232/RS485'
diff --git a/decoders/mrf24j40/pd.py b/decoders/mrf24j40/pd.py
index 83fc254..a91e765 100644
--- a/decoders/mrf24j40/pd.py
+++ b/decoders/mrf24j40/pd.py
@@ -21,7 +21,7 @@ import sigrokdecode as srd
 from .lists import *
 
 class Decoder(srd.Decoder):
-    api_version = 2
+    api_version = 3
     id = 'mrf24j40'
     name = 'MRF24J40'
     longname = 'Microchip MRF24J40'
diff --git a/decoders/mxc6225xu/pd.py b/decoders/mxc6225xu/pd.py
index 39e73f7..34482cd 100644
--- a/decoders/mxc6225xu/pd.py
+++ b/decoders/mxc6225xu/pd.py
@@ -59,7 +59,7 @@ status = {
 }
 
 class Decoder(srd.Decoder):
-    api_version = 2
+    api_version = 3
     id = 'mxc6225xu'
     name = 'MXC6225XU'
     longname = 'MEMSIC MXC6225XU'
diff --git a/decoders/nrf24l01/pd.py b/decoders/nrf24l01/pd.py
index ae1cb35..02cdddb 100644
--- a/decoders/nrf24l01/pd.py
+++ b/decoders/nrf24l01/pd.py
@@ -59,7 +59,7 @@ xn297_regs = {
 }
 
 class Decoder(srd.Decoder):
-    api_version = 2
+    api_version = 3
     id = 'nrf24l01'
     name = 'nRF24L01(+)'
     longname = 'Nordic Semiconductor nRF24L01/nRF24L01+'
diff --git a/decoders/nunchuk/pd.py b/decoders/nunchuk/pd.py
index 6a6b4e9..de6e157 100644
--- a/decoders/nunchuk/pd.py
+++ b/decoders/nunchuk/pd.py
@@ -20,7 +20,7 @@
 import sigrokdecode as srd
 
 class Decoder(srd.Decoder):
-    api_version = 2
+    api_version = 3
     id = 'nunchuk'
     name = 'Nunchuk'
     longname = 'Nintendo Wii Nunchuk'
diff --git a/decoders/onewire_network/pd.py b/decoders/onewire_network/pd.py
index fca16da..a24cb16 100644
--- a/decoders/onewire_network/pd.py
+++ b/decoders/onewire_network/pd.py
@@ -32,7 +32,7 @@ command = {
 }
 
 class Decoder(srd.Decoder):
-    api_version = 2
+    api_version = 3
     id = 'onewire_network'
     name = '1-Wire network layer'
     longname = '1-Wire serial communication bus (network layer)'
diff --git a/decoders/pan1321/pd.py b/decoders/pan1321/pd.py
index d054e89..c1a3bea 100644
--- a/decoders/pan1321/pd.py
+++ b/decoders/pan1321/pd.py
@@ -24,7 +24,7 @@ RX = 0
 TX = 1
 
 class Decoder(srd.Decoder):
-    api_version = 2
+    api_version = 3
     id = 'pan1321'
     name = 'PAN1321'
     longname = 'Panasonic PAN1321'
diff --git a/decoders/rfm12/pd.py b/decoders/rfm12/pd.py
index ab20823..3148a57 100644
--- a/decoders/rfm12/pd.py
+++ b/decoders/rfm12/pd.py
@@ -20,7 +20,7 @@
 import sigrokdecode as srd
 
 class Decoder(srd.Decoder):
-    api_version = 2
+    api_version = 3
     id = 'rfm12'
     name = 'RFM12'
     longname = 'RFM12 control protocol'
diff --git a/decoders/rgb_led_spi/pd.py b/decoders/rgb_led_spi/pd.py
index c64bd29..95cbf19 100644
--- a/decoders/rgb_led_spi/pd.py
+++ b/decoders/rgb_led_spi/pd.py
@@ -20,7 +20,7 @@
 import sigrokdecode as srd
 
 class Decoder(srd.Decoder):
-    api_version = 2
+    api_version = 3
     id = 'rgb_led_spi'
     name = 'RGB LED (SPI)'
     longname = 'RGB LED string decoder (SPI)'
diff --git a/decoders/rtc8564/pd.py b/decoders/rtc8564/pd.py
index 2e90573..8560ac7 100644
--- a/decoders/rtc8564/pd.py
+++ b/decoders/rtc8564/pd.py
@@ -28,7 +28,7 @@ def reg_list():
     return tuple(l)
 
 class Decoder(srd.Decoder):
-    api_version = 2
+    api_version = 3
     id = 'rtc8564'
     name = 'RTC-8564'
     longname = 'Epson RTC-8564 JE/NB'
diff --git a/decoders/sdcard_spi/pd.py b/decoders/sdcard_spi/pd.py
index 545cee5..478dfc8 100644
--- a/decoders/sdcard_spi/pd.py
+++ b/decoders/sdcard_spi/pd.py
@@ -21,7 +21,7 @@ import sigrokdecode as srd
 from common.sdcard import (cmd_names, acmd_names)
 
 class Decoder(srd.Decoder):
-    api_version = 2
+    api_version = 3
     id = 'sdcard_spi'
     name = 'SD card (SPI mode)'
     longname = 'Secure Digital card (SPI mode)'
diff --git a/decoders/spiflash/pd.py b/decoders/spiflash/pd.py
index a9eff9e..8e2b041 100644
--- a/decoders/spiflash/pd.py
+++ b/decoders/spiflash/pd.py
@@ -71,7 +71,7 @@ def decode_status_reg(data):
     return ret
 
 class Decoder(srd.Decoder):
-    api_version = 2
+    api_version = 3
     id = 'spiflash'
     name = 'SPI flash'
     longname = 'SPI flash chips'
diff --git a/decoders/ssi32/pd.py b/decoders/ssi32/pd.py
index f2e79b8..a2fd859 100644
--- a/decoders/ssi32/pd.py
+++ b/decoders/ssi32/pd.py
@@ -23,7 +23,7 @@
 import sigrokdecode as srd
 
 class Decoder(srd.Decoder):
-    api_version = 2
+    api_version = 3
     id = 'ssi32'
     name = 'SSI32'
     longname = 'Synchronous Serial Interface (32bit)'
diff --git a/decoders/tca6408a/pd.py b/decoders/tca6408a/pd.py
index 9fa9d23..73de1b9 100644
--- a/decoders/tca6408a/pd.py
+++ b/decoders/tca6408a/pd.py
@@ -22,7 +22,7 @@
 import sigrokdecode as srd
 
 class Decoder(srd.Decoder):
-    api_version = 2
+    api_version = 3
     id = 'tca6408a'
     name = 'TI TCA6408A'
     longname = 'Texas Instruments TCA6408A'
diff --git a/decoders/usb_packet/pd.py b/decoders/usb_packet/pd.py
index aab0c95..3983f2c 100644
--- a/decoders/usb_packet/pd.py
+++ b/decoders/usb_packet/pd.py
@@ -173,7 +173,7 @@ def calc_crc16(bitstr):
     return reverse_number(crc16, 16)
 
 class Decoder(srd.Decoder):
-    api_version = 2
+    api_version = 3
     id = 'usb_packet'
     name = 'USB packet'
     longname = 'Universal Serial Bus (LS/FS) packet'
diff --git a/decoders/usb_request/pd.py b/decoders/usb_request/pd.py
index c1f00cd..5d2d47d 100644
--- a/decoders/usb_request/pd.py
+++ b/decoders/usb_request/pd.py
@@ -112,7 +112,7 @@ class pcap_usb_pkt():
         return 64 + len(self.data)
 
 class Decoder(srd.Decoder):
-    api_version = 2
+    api_version = 3
     id = 'usb_request'
     name = 'USB request'
     longname = 'Universal Serial Bus (LS/FS) transaction/request'
diff --git a/decoders/xfp/pd.py b/decoders/xfp/pd.py
index 27135e5..fcadab9 100644
--- a/decoders/xfp/pd.py
+++ b/decoders/xfp/pd.py
@@ -23,7 +23,7 @@ from common.plugtrx import (MODULE_ID, ALARM_THRESHOLDS, AD_READOUTS, GCS_BITS,
         ENHANCED_OPTS, AUX_TYPES)
 
 class Decoder(srd.Decoder):
-    api_version = 2
+    api_version = 3
     id = 'xfp'
     name = 'XFP'
     longname = '10 Gigabit Small Form Factor Pluggable Module (XFP)'
-- 
2.30.2