X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;ds=inline;f=decoders%2Fsdcard_sd%2Fpd.py;h=f5d6834aa0553289e0e68099c20bcfc13ace6b3a;hb=dca19fbfdf0650dba693c0ac6213f6cdb748a8c3;hp=2d880968a842badc7838d59b64736dbe12e70095;hpb=1cf5aeaf84f230fa13aa894f6bd719af42657169;p=libsigrokdecode.git

diff --git a/decoders/sdcard_sd/pd.py b/decoders/sdcard_sd/pd.py
index 2d88096..f5d6834 100644
--- a/decoders/sdcard_sd/pd.py
+++ b/decoders/sdcard_sd/pd.py
@@ -28,7 +28,8 @@ class Decoder(srd.Decoder):
     desc = 'Secure Digital card (SD mode) low-level protocol.'
     license = 'gplv2+'
     inputs = ['logic']
-    outputs = ['sdcard_sd']
+    outputs = []
+    tags = ['Memory']
     channels = (
         {'id': 'cmd',  'name': 'CMD',  'desc': 'Command'},
         {'id': 'clk',  'name': 'CLK',  'desc': 'Clock'},
@@ -42,29 +43,33 @@ class Decoder(srd.Decoder):
     annotations = \
         tuple(('cmd%d' % i, 'CMD%d' % i) for i in range(64)) + \
         tuple(('acmd%d' % i, 'ACMD%d' % i) for i in range(64)) + ( \
-        ('bits', 'Bits'),
+        ('bit', 'Bit'),
         ('field-start', 'Start bit'),
         ('field-transmission', 'Transmission bit'),
         ('field-cmd', 'Command'),
         ('field-arg', 'Argument'),
         ('field-crc', 'CRC'),
         ('field-end', 'End bit'),
-        ('decoded-bits', 'Decoded bits'),
-        ('decoded-fields', 'Decoded fields'),
+        ('decoded-bit', 'Decoded bit'),
+        ('decoded-field', 'Decoded field'),
     )
     annotation_rows = (
         ('raw-bits', 'Raw bits', (128,)),
         ('decoded-bits', 'Decoded bits', (135,)),
         ('decoded-fields', 'Decoded fields', (136,)),
         ('fields', 'Fields', tuple(range(129, 135))),
-        ('cmd', 'Commands', tuple(range(128))),
+        ('commands', 'Commands', tuple(range(128))),
     )
 
     def __init__(self):
+        self.reset()
+
+    def reset(self):
         self.state = 'GET COMMAND TOKEN'
         self.token = []
         self.is_acmd = False # Indicates CMD vs. ACMD
         self.cmd = None
+        self.last_cmd = None
         self.arg = None
 
     def start(self):
@@ -84,15 +89,12 @@ class Decoder(srd.Decoder):
                  self.out_ann, data)
 
     def putc(self, cmd, desc):
+        self.last_cmd = cmd
         self.putt([cmd, ['%s: %s' % (self.cmd_str, desc), self.cmd_str,
                          self.cmd_str.split(' ')[0]]])
 
-    def putr(self, cmd, desc):
-        self.putt([cmd, ['Reply: %s' % desc]])
-
-    def reset(self):
-        self.cmd, self.arg = None, None
-        self.token, self.state = [], 'GET COMMAND TOKEN'
+    def putr(self, desc):
+        self.putt([self.last_cmd, ['Reply: %s' % desc]])
 
     def cmd_name(self, cmd):
         c = acmd_names if self.is_acmd else cmd_names
@@ -288,7 +290,7 @@ class Decoder(srd.Decoder):
         if not self.get_token_bits(cmd, 48):
             return
         self.handle_common_token_fields()
-        self.putr(55, 'R1')
+        self.putr('R1')
         self.puta(0, 31, [136, ['Card status', 'Status', 'S']])
         for i in range(32):
             self.putbit(8 + i, [card_status[31 - i]])
@@ -300,7 +302,7 @@ class Decoder(srd.Decoder):
             return
         self.handle_common_token_fields()
         self.puta(0, 31, [136, ['Card status', 'Status', 'S']])
-        self.putr(55, 'R1b')
+        self.putr('R1b')
         self.token, self.state = [], 'GET COMMAND TOKEN'
 
     def handle_response_r2(self, cmd):
@@ -335,7 +337,7 @@ class Decoder(srd.Decoder):
         #  - Bits[00:00]: End bit (always 1)
         if not self.get_token_bits(cmd, 48):
             return
-        self.putr(55, 'R3')
+        self.putr('R3')
         # Annotations for each individual bit.
         for bit in range(len(self.token)):
             self.putf(bit, bit, [128, ['%d' % self.token[bit][2]]])
@@ -363,7 +365,7 @@ class Decoder(srd.Decoder):
         self.handle_common_token_fields()
         self.puta(0, 15, [136, ['Card status bits', 'Status', 'S']])
         self.puta(16, 31, [136, ['Relative card address', 'RCA', 'R']])
-        self.putr(55, 'R6')
+        self.putr('R6')
         self.token, self.state = [], 'GET COMMAND TOKEN'
 
     def handle_response_r7(self, cmd):
@@ -380,7 +382,7 @@ class Decoder(srd.Decoder):
             return
         self.handle_common_token_fields()
 
-        self.putr(55, 'R7')
+        self.putr('R7')
 
         # Arg[31:12]: Reserved bits (all-zero)
         self.puta(12, 31, [136, ['Reserved', 'Res', 'R']])