cfp: Use the Python in/range keywords.

[libsigrokdecode.git] / decoders / cfp / pd.py

diff --git a/decoders/cfp/pd.py b/decoders/cfp/pd.py
index 1acd88382c36c29e0ac4ddc86224019e1ec3dcc2..dec2e4135dea7662c7810a478128fb7783d7cb46 100644 (file)
--- a/decoders/cfp/pd.py
+++ b/decoders/cfp/pd.py
@@ -59,12 +59,12 @@ class Decoder(srd.Decoder):
     inputs = ['mdio']
     outputs = ['cfp']
     annotations = (
-        ('cfp-register', 'Register'),
-        ('cfp-decode', 'Decode'),
+        ('register', 'Register'),
+        ('decode', 'Decode'),
     )
     annotation_rows = (
-        ('cfp-register', 'Register', (0,)),
-        ('cfp-decode', 'Decode', (1,)),
+        ('registers', 'Registers', (0,)),
+        ('decodes', 'Decodes', (1,)),
     )
 
     def __init__(self):
@@ -73,28 +73,34 @@ class Decoder(srd.Decoder):
     def start(self):
         self.out_ann = self.register(srd.OUTPUT_ANN)
 
+    def putx(self, data):
+        self.put(self.ss, self.es, self.out_ann, data)
+
     def decode(self, ss, es, data):
-        for (clause45, clause45_address, is_read, portad, devad, register) in data:
-            if is_read:
-                if clause45_address >= 0x8000 and clause45_address <= 0x807F:
-                    self.put(ss, es, self.out_ann, [0, ['CFP NVR 1: Basic ID registers', 'NVR1']])
-                    if clause45_address == 0x8000:
-                        self.put(ss, es, self.out_ann, [1, ['Module identifier: %s' % MODULE_ID.get(register, 'Reserved')]])
-                elif clause45_address >= 0x8080 and clause45_address <= 0x80FF:
-                    self.put(ss, es, self.out_ann, [0, ['CFP NVR 2: Extended ID registers', 'NVR2']])
-                elif clause45_address >= 0x8100 and clause45_address <= 0x817F:
-                    self.put(ss, es, self.out_ann, [0, ['CFP NVR 3: Network lane specific registers', 'NVR3']])
-                elif clause45_address >= 0x8180 and clause45_address <= 0x81FF:
-                    self.put(ss, es, self.out_ann, [0, ['CFP NVR 4', 'NVR4']])
-                elif clause45_address >= 0x8400 and clause45_address <= 0x847F:
-                    self.put(ss, es, self.out_ann, [0, ['Vendor NVR 1: Vendor data registers', 'V-NVR1']])
-                elif clause45_address >= 0x8480 and clause45_address <= 0x84FF:
-                    self.put(ss, es, self.out_ann, [0, ['Vendor NVR 2: Vendor data registers', 'V-NVR2']])
-                elif clause45_address >= 0x8800 and clause45_address <= 0x887F:
-                    self.put(ss, es, self.out_ann, [0, ['User NVR 1: User data registers', 'U-NVR1']])
-                elif clause45_address >= 0x8880 and clause45_address <= 0x88FF:
-                    self.put(ss, es, self.out_ann, [0, ['User NVR 2: User data registers', 'U-NVR2']])
-                elif clause45_address >= 0xA000 and clause45_address <= 0xA07F:
-                    self.put(ss, es, self.out_ann, [0, ['CFP Module VR 1: CFP Module level control and DDM registers', 'Mod-VR1']])
-                elif clause45_address >= 0xA080 and clause45_address <= 0xA0FF:
-                    self.put(ss, es, self.out_ann, [0, ['MLG VR 1: MLG Management Interface registers', 'MLG-VR1']])
+        self.ss, self.es = ss, es
+        for (clause45, clause45_addr, is_read, portad, devad, reg) in data:
+            if not is_read:
+                continue
+            if clause45_addr in range(0x8000, 0x807F + 1):
+                self.putx([0, ['CFP NVR 1: Basic ID register', 'NVR1']])
+                if clause45_addr == 0x8000:
+                    self.putx([1, ['Module identifier: %s' % \
+                              MODULE_ID.get(reg, 'Reserved')]])
+            elif clause45_addr in range(0x8080, 0x80FF + 1):
+                self.putx([0, ['CFP NVR 2: Extended ID register', 'NVR2']])
+            elif clause45_addr in range(0x8100, 0x817F + 1):
+                self.putx([0, ['CFP NVR 3: Network lane specific register', 'NVR3']])
+            elif clause45_addr in range(0x8180, 0x81FF + 1):
+                self.putx([0, ['CFP NVR 4', 'NVR4']])
+            elif clause45_addr in range(0x8400, 0x847F + 1):
+                self.putx([0, ['Vendor NVR 1: Vendor data register', 'V-NVR1']])
+            elif clause45_addr in range(0x8480, 0x84FF + 1):
+                self.putx([0, ['Vendor NVR 2: Vendor data register', 'V-NVR2']])
+            elif clause45_addr in range(0x8800, 0x887F + 1):
+                self.putx([0, ['User NVR 1: User data register', 'U-NVR1']])
+            elif clause45_addr in range(0x8880, 0x88FF + 1):
+                self.putx([0, ['User NVR 2: User data register', 'U-NVR2']])
+            elif clause45_addr in range(0xA000, 0xA07F + 1):
+                self.putx([0, ['CFP Module VR 1: CFP Module level control and DDM register', 'Mod-VR1']])
+            elif clause45_addr in range(0xA080, 0xA0FF + 1):
+                self.putx([0, ['MLG VR 1: MLG Management Interface register', 'MLG-VR1']])