X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=decoders%2Fsdcard_sd%2Fpd.py;h=a6e983423c2f2a846766b6900951d51fe9553c45;hb=f697102ece64f8e99bfd26bbc2dedadaa037a0e5;hp=da7e62485586f9dd43dead0d1c6f99865a6bd217;hpb=2729ea3e586a64d8e84ef473cdc5fc5730953abd;p=libsigrokdecode.git

diff --git a/decoders/sdcard_sd/pd.py b/decoders/sdcard_sd/pd.py
index da7e624..a6e9834 100644
--- a/decoders/sdcard_sd/pd.py
+++ b/decoders/sdcard_sd/pd.py
@@ -22,6 +22,7 @@ from common.srdhelper import SrdIntEnum, SrdStrEnum
 from common.sdcard import (cmd_names, acmd_names, accepted_voltages, sd_status)
 
 responses = '1 1b 2 3 6 7'.split()
+token_fields = 'START TRANSMISSION CMD ARG CRC END'.split()
 reg_card_status = 'OUT_OF_RANGE ADDRESS_ERROR BLOCK_LEN_ERROR ERASE_SEQ_ERROR \
     ERASE_PARAM WP_VIOLATION CARD_IS_LOCKED LOCK_UNLOCK_FAILED COM_CRC_ERROR \
     ILLEGAL_COMMAND CARD_ECC_FAILED CC_ERROR ERROR RSVD_DEFERRED_RESPONSE \
@@ -43,8 +44,9 @@ a = ['CMD%d' % i for i in range(64)] + ['ACMD%d' % i for i in range(64)] + \
     ['R_STATUS_' + r for r in reg_card_status] + \
     ['R_CID_' + r for r in reg_cid] + \
     ['R_CSD_' + r for r in reg_csd] + \
-    ['F_' + f for f in 'START TRANSM CMD ARG CRC END'.split()] + \
-    ['BIT', 'DECODED_BIT', 'DECODED_F']
+    ['BIT_' + r for r in ('0', '1')] + \
+    ['F_' + f for f in token_fields] + \
+    ['DECODED_BIT', 'DECODED_F']
 Ann = SrdIntEnum.from_list('Ann', a)
 
 s = ['GET_COMMAND_TOKEN', 'HANDLE_CMD999'] + \
@@ -84,19 +86,14 @@ class Decoder(srd.Decoder):
         tuple(('reg_status_' + r.lower(), 'Status: ' + r) for r in reg_card_status) + \
         tuple(('reg_cid_' + r.lower(), 'CID: ' + r) for r in reg_cid) + \
         tuple(('reg_csd_' + r.lower(), 'CSD: ' + r) for r in reg_csd) + \
+        tuple(('bit_' + r, 'Bit ' + r) for r in ('0', '1')) + \
+        tuple(('field-' + r.lower(), r) for r in token_fields) + \
     ( \
-        ('field-start', 'Start bit'),
-        ('field-transmission', 'Transmission bit'),
-        ('field-cmd', 'Command'),
-        ('field-arg', 'Argument'),
-        ('field-crc', 'CRC'),
-        ('field-end', 'End bit'),
-        ('bit', 'Bit'),
         ('decoded-bit', 'Decoded bit'),
         ('decoded-field', 'Decoded field'),
     )
     annotation_rows = (
-        ('raw-bits', 'Raw bits', (Ann.BIT,)),
+        ('raw-bits', 'Raw bits', Ann.prefixes('BIT_')),
         ('decoded-bits', 'Decoded bits', (Ann.DECODED_BIT,) + Ann.prefixes('R_')),
         ('decoded-fields', 'Decoded fields', (Ann.DECODED_F,)),
         ('fields', 'Fields', Ann.prefixes('F_')),
@@ -155,14 +152,14 @@ class Decoder(srd.Decoder):
 
         # Annotations for each individual bit.
         for bit in range(len(self.token)):
-            self.putf(bit, bit, [Ann.BIT, ['%d' % s[bit].bit]])
+            self.putf(bit, bit, [Ann.BIT_0 + s[bit].bit, ['%d' % s[bit].bit]])
 
         # CMD[47:47]: Start bit (always 0)
         self.putf(0, 0, [Ann.F_START, ['Start bit', 'Start', 'S']])
 
         # CMD[46:46]: Transmission bit (1 == host)
         t = 'host' if s[1].bit == 1 else 'card'
-        self.putf(1, 1, [Ann.F_TRANSM, ['Transmission: ' + t, 'T: ' + t, 'T']])
+        self.putf(1, 1, [Ann.F_TRANSMISSION, ['Transmission: ' + t, 'T: ' + t, 'T']])
 
         # CMD[45:40]: Command index (BCD; valid: 0-63)
         self.cmd = int('0b' + ''.join([str(s[i].bit) for i in range(2, 8)]), 2)
@@ -436,10 +433,10 @@ class Decoder(srd.Decoder):
             return
         # Annotations for each individual bit.
         for bit in range(len(self.token)):
-            self.putf(bit, bit, [Ann.BIT, ['%d' % self.token[bit].bit]])
+            self.putf(bit, bit, [Ann.BIT_0 + self.token[bit].bit, ['%d' % self.token[bit].bit]])
         self.putf(0, 0, [Ann.F_START, ['Start bit', 'Start', 'S']])
         t = 'host' if self.token[1].bit == 1 else 'card'
-        self.putf(1, 1, [Ann.F_TRANSM, ['Transmission: ' + t, 'T: ' + t, 'T']])
+        self.putf(1, 1, [Ann.F_TRANSMISSION, ['Transmission: ' + t, 'T: ' + t, 'T']])
         self.putf(2, 7, [Ann.F_CMD, ['Reserved', 'Res', 'R']])
         self.putf(8, 134, [Ann.F_ARG, ['Argument', 'Arg', 'A']])
         self.putf(135, 135, [Ann.F_END, ['End bit', 'End', 'E']])
@@ -467,10 +464,10 @@ class Decoder(srd.Decoder):
         self.putr(Ann.RESPONSE_R3)
         # Annotations for each individual bit.
         for bit in range(len(self.token)):
-            self.putf(bit, bit, [Ann.BIT, ['%d' % self.token[bit].bit]])
+            self.putf(bit, bit, [Ann.BIT_0 + self.token[bit].bit, ['%d' % self.token[bit].bit]])
         self.putf(0, 0, [Ann.F_START, ['Start bit', 'Start', 'S']])
         t = 'host' if self.token[1].bit == 1 else 'card'
-        self.putf(1, 1, [Ann.F_TRANSM, ['Transmission: ' + t, 'T: ' + t, 'T']])
+        self.putf(1, 1, [Ann.F_TRANSMISSION, ['Transmission: ' + t, 'T: ' + t, 'T']])
         self.putf(2, 7, [Ann.F_CMD, ['Reserved', 'Res', 'R']])
         self.putf(8, 39, [Ann.F_ARG, ['Argument', 'Arg', 'A']])
         self.putf(40, 46, [Ann.F_CRC, ['Reserved', 'Res', 'R']])