X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=decoders%2Fspi%2Fpd.py;h=5f18d7291de17d568652c0c112327b7d28d6dcd3;hb=5d6d8896ded87ce72b42e68c77120008b2d1b779;hp=27971378c24d664301b3a9a70172ab361acaa3df;hpb=d6d8a8a440ea2a81e6ddde33d16bc84d01cdb432;p=libsigrokdecode.git

diff --git a/decoders/spi/pd.py b/decoders/spi/pd.py
index 2797137..5f18d72 100644
--- a/decoders/spi/pd.py
+++ b/decoders/spi/pd.py
@@ -108,12 +108,16 @@ class Decoder(srd.Decoder):
         ('miso-bits', 'MISO bits'),
         ('mosi-bits', 'MOSI bits'),
         ('warnings', 'Human-readable warnings'),
+        ('miso-transfer', 'MISO transfer'),
+        ('mosi-transfer', 'MOSI transfer'),
     )
     annotation_rows = (
-        ('miso-data', 'MISO data', (0,)),
         ('miso-bits', 'MISO bits', (2,)),
-        ('mosi-data', 'MOSI data', (1,)),
+        ('miso-data', 'MISO data', (0,)),
+        ('miso-transfer', 'MISO transfer', (5,)),
         ('mosi-bits', 'MOSI bits', (3,)),
+        ('mosi-data', 'MOSI data', (1,)),
+        ('mosi-transfer', 'MOSI transfer', (6,)),
         ('other', 'Other', (4,)),
     )
     binary = (
@@ -133,7 +137,6 @@ class Decoder(srd.Decoder):
         self.misobytes = []
         self.mosibytes = []
         self.ss_block = -1
-        self.samplenum = -1
         self.ss_transfer = -1
         self.cs_was_deasserted = False
         self.have_cs = self.have_miso = self.have_mosi = None
@@ -275,7 +278,13 @@ class Decoder(srd.Decoder):
                 self.ss_transfer = self.samplenum
                 self.misobytes = []
                 self.mosibytes = []
-            else:
+            elif self.ss_transfer != -1:
+                if self.have_miso:
+                    self.put(self.ss_transfer, self.samplenum, self.out_ann,
+                        [5, [' '.join(format(x.val, '02X') for x in self.misobytes)]])
+                if self.have_mosi:
+                    self.put(self.ss_transfer, self.samplenum, self.out_ann,
+                        [6, [' '.join(format(x.val, '02X') for x in self.mosibytes)]])
                 self.put(self.ss_transfer, self.samplenum, self.out_python,
                     ['TRANSFER', self.mosibytes, self.misobytes])