X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=decoders%2Favr_isp%2Fpd.py;h=0168875449d52477169544492bec89da289b5537;hp=5fea72cc264a8a18638579de5d92cb4ef77d61c0;hb=4e4f8527de0927f2eb1d98e90b58e018ba28d341;hpb=ad30cb466b4f0c0ff448af7a34aee96f40c9c472

diff --git a/decoders/avr_isp/pd.py b/decoders/avr_isp/pd.py
index 5fea72c..0168875 100644
--- a/decoders/avr_isp/pd.py
+++ b/decoders/avr_isp/pd.py
@@ -30,30 +30,33 @@ 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']
-    probes = []
-    optional_probes = [
-        {'id': 'reset', 'name': 'RESET#', 'desc': 'Target AVR MCU reset'},
-    ]
-    options = {}
-    annotations = [
-        ['pe', 'Programming enable'],
-        ['rsb0', 'Read signature byte 0'],
-        ['rsb1', 'Read signature byte 1'],
-        ['rsb2', 'Read signature byte 2'],
-        ['ce', 'Chip erase'],
-        ['rfb', 'Read fuse bits'],
-        ['rhfb', 'Read high fuse bits'],
-        ['refb', 'Read extended fuse bits'],
-        ['warnings', 'Warnings'],
-    ]
+    annotations = (
+        ('pe', 'Programming enable'),
+        ('rsb0', 'Read signature byte 0'),
+        ('rsb1', 'Read signature byte 1'),
+        ('rsb2', 'Read signature byte 2'),
+        ('ce', 'Chip erase'),
+        ('rfb', 'Read fuse bits'),
+        ('rhfb', 'Read high fuse bits'),
+        ('refb', 'Read extended fuse bits'),
+        ('warnings', 'Warnings'),
+        ('dev', 'Device'),
+    )
+    annotation_rows = (
+        ('bits', 'Bits', ()),
+        ('commands', 'Commands', tuple(range(7 + 1))),
+        ('warnings', 'Warnings', (8,)),
+        ('dev', 'Device', (9,)),
+    )
 
     def __init__(self, **kwargs):
         self.state = 'IDLE'
         self.mosi_bytes, self.miso_bytes = [], []
         self.cmd_ss, self.cmd_es = 0, 0
         self.xx, self.yy, self.zz, self.mm = 0, 0, 0, 0
+        self.device_ss = None
 
     def start(self):
         # self.out_python = self.register(srd.OUTPUT_PYTHON)
@@ -97,6 +100,7 @@ class Decoder(srd.Decoder):
 
         # Store for later.
         self.mm = cmd[3]
+        self.device_ss = self.cmd_ss
 
         # Sanity check on reply.
         if ret[1] != 0x30 or ret[2] != cmd[1] or ret[0] != self.yy:
@@ -107,9 +111,9 @@ class Decoder(srd.Decoder):
         self.part_number = ret[3]
         self.putx([3, ['Part number: 0x%02x' % ret[3]]])
 
-        # TODO: Fix range.
         p = part[(self.part_fam_flash_size, self.part_number)]
-        self.putx([3, ['Device: Atmel %s' % p]])
+        data = [9, ['Device: Atmel %s' % p]]
+        self.put(self.device_ss, self.cmd_es, self.out_ann, data)
 
         # Sanity check on reply.
         if ret[1] != 0x30 or ret[2] != self.xx or ret[0] != self.mm: