spi: Provide multiple annotation types.

For now SPI gets the following annotation types:

 - MISO/MOSI SPI data
 - MISO SPI data
 - MOSI SPI data

(i.e. you can see either MISO, or MOSI, or both; the latter is most
useful for CLI usage)

Also, show the hex values as e.g. F5 (upper-case letters, no "0x" prefix).

diff --git a/decoders/spi/pd.py b/decoders/spi/pd.py
index 1dff414e3c7ef75c1fc2da138c95355021a18b8e..47bbe322a3342e8c5ee548c3e1c8c947f3725b39 100644 (file)
--- a/decoders/spi/pd.py
+++ b/decoders/spi/pd.py
@@ -60,7 +60,9 @@ class Decoder(srd.Decoder):
         'format': ['Data format', 'hex'],
     }
     annotations = [
-        ['Data', 'SPI data'],
+        ['MISO/MOSI data', 'MISO/MOSI SPI data'],
+        ['MISO data', 'MISO SPI data'],
+        ['MOSI data', 'MOSI SPI data'],
         ['Warnings', 'Human-readable warnings'],
     ]
 
@@ -150,11 +152,12 @@ class Decoder(srd.Decoder):
                 continue
 
             self.putpw(['DATA', self.mosidata, self.misodata])
-            self.putw([0, ['MOSI: 0x%02x, MISO: 0x%02x' % (self.mosidata,
-                           self.misodata)]])
+            self.putw([0, ['%02X/%02X' % (self.mosidata, self.misodata)]])
+            self.putw([1, ['%02X' % self.misodata]])
+            self.putw([2, ['%02X' % self.mosidata]])
 
             if self.cs_was_deasserted_during_data_word:
-                self.putw([1, ['CS# was deasserted during this data word!']])
+                self.putw([3, ['CS# was deasserted during this data word!']])
 
             # Reset decoder state.
             self.mosidata = 0