X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=decoders%2Flpc%2Fpd.py;h=ef782e0cdc91f3cf86fdd6ada31c680d03c35c97;hp=f097574b6bdbd6aa558fe0eb39ca3bd67a95d5b5;hb=780770f1295b7fdeb4481eb42623bad5da1e19a7;hpb=0169f19c53e195df2f96c4df731ad3214c59e20a

diff --git a/decoders/lpc/pd.py b/decoders/lpc/pd.py
index f097574..ef782e0 100644
--- a/decoders/lpc/pd.py
+++ b/decoders/lpc/pd.py
@@ -18,8 +18,6 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
-# LPC protocol decoder
-
 import sigrokdecode as srd
 
 # ...
@@ -107,33 +105,36 @@ class Decoder(srd.Decoder):
     inputs = ['logic']
     outputs = ['lpc']
     probes = [
-        {'id': 'lframe', 'name': 'LFRAME#', 'desc': 'TODO'},
-        {'id': 'lclk',   'name': 'LCLK',    'desc': 'TODO'},
-        {'id': 'lad0',   'name': 'LAD[0]',  'desc': 'TODO'},
-        {'id': 'lad1',   'name': 'LAD[1]',  'desc': 'TODO'},
-        {'id': 'lad2',   'name': 'LAD[2]',  'desc': 'TODO'},
-        {'id': 'lad3',   'name': 'LAD[3]',  'desc': 'TODO'},
+        {'id': 'lframe', 'name': 'LFRAME#', 'desc': 'Frame'},
+        {'id': 'lclk',   'name': 'LCLK',    'desc': 'Clock'},
+        {'id': 'lad0',   'name': 'LAD[0]',  'desc': 'Addr/control/data 0'},
+        {'id': 'lad1',   'name': 'LAD[1]',  'desc': 'Addr/control/data 1'},
+        {'id': 'lad2',   'name': 'LAD[2]',  'desc': 'Addr/control/data 2'},
+        {'id': 'lad3',   'name': 'LAD[3]',  'desc': 'Addr/control/data 3'},
     ]
     optional_probes = [
-        {'id': 'lreset', 'name': 'LRESET#', 'desc': 'TODO'},
-        {'id': 'ldrq',   'name': 'LDRQ#',   'desc': 'TODO'},
-        {'id': 'serirq', 'name': 'SERIRQ',  'desc': 'TODO'},
-        {'id': 'clkrun', 'name': 'CLKRUN#', 'desc': 'TODO'},
-        {'id': 'lpme',   'name': 'LPME#',   'desc': 'TODO'},
-        {'id': 'lpcpd',  'name': 'LPCPD#',  'desc': 'TODO'},
-        {'id': 'lsmi',   'name': 'LSMI#',   'desc': 'TODO'},
+        {'id': 'lreset', 'name': 'LRESET#', 'desc': 'Reset'},
+        {'id': 'ldrq',   'name': 'LDRQ#',   'desc': 'Encoded DMA / bus master request'},
+        {'id': 'serirq', 'name': 'SERIRQ',  'desc': 'Serialized IRQ'},
+        {'id': 'clkrun', 'name': 'CLKRUN#', 'desc': 'Clock run'},
+        {'id': 'lpme',   'name': 'LPME#',   'desc': 'LPC power management event'},
+        {'id': 'lpcpd',  'name': 'LPCPD#',  'desc': 'Power down'},
+        {'id': 'lsmi',   'name': 'LSMI#',   'desc': 'System Management Interrupt'},
     ]
-    options = {}
     annotations = [
         ['warnings', 'Warnings'],
         ['start', 'Start'],
-        ['cycle_type', 'Cycle-type/direction'],
+        ['cycle-type', 'Cycle-type/direction'],
         ['addr', 'Address'],
         ['tar1', 'Turn-around cycle 1'],
         ['sync', 'Sync'],
         ['data', 'Data'],
         ['tar2', 'Turn-around cycle 2'],
     ]
+    annotation_rows = (
+        ('data', 'Data', (1, 2, 3, 4, 5, 6, 7)),
+        ('warnings', 'Warnings', (0,)),
+    )
 
     def __init__(self, **kwargs):
         self.state = 'IDLE'
@@ -151,7 +152,7 @@ class Decoder(srd.Decoder):
         self.ss_block = self.es_block = None
 
     def start(self):
-        # self.out_proto = self.register(srd.OUTPUT_PYTHON)
+        # self.out_python = self.register(srd.OUTPUT_PYTHON)
         self.out_ann = self.register(srd.OUTPUT_ANN)
 
     def putb(self, data):