from common.sdcard import (cmd_names, acmd_names, accepted_voltages, card_status, sd_status)
responses = '1 1b 2 3 6 7'.split()
+reg_cid = 'MID OID PNM PRV PSN RSVD MDT CRC ONE'.split()
Pin = SrdIntEnum.from_str('Pin', 'CMD CLK DAT0 DAT1 DAT2 DAT3')
a = ['CMD%d' % i for i in range(64)] + ['ACMD%d' % i for i in range(64)] + \
- ['R' + r.upper() for r in responses] + \
+ ['RESPONSE_R' + r.upper() for r in responses] + \
+ ['R_CID_' + r for r in reg_cid] + \
['F_' + f for f in 'START TRANSM CMD ARG CRC END'.split()] + \
['BIT', 'DECODED_BIT', 'DECODED_F']
Ann = SrdIntEnum.from_list('Ann', a)
['GET_RESPONSE_R%s' % r.upper() for r in responses]
St = SrdStrEnum.from_list('St', s)
+class Bit:
+ def __init__(self, s, e, b):
+ self.ss, self.es, self.bit = s, e ,b
+
class Decoder(srd.Decoder):
api_version = 3
id = 'sdcard_sd'
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)) + \
- tuple(('r%s' % r, 'R%s response' % r) for r in responses) + ( \
+ tuple(('response_r%s' % r, 'R%s' % r) for r in responses) + \
+ tuple(('reg_cid_' + r.lower(), 'CID: ' + r) for r in reg_cid) + \
+ ( \
('field-start', 'Start bit'),
('field-transmission', 'Transmission bit'),
('field-cmd', 'Command'),
)
annotation_rows = (
('raw-bits', 'Raw bits', (Ann.BIT,)),
- ('decoded-bits', 'Decoded bits', (Ann.DECODED_BIT,)),
+ ('decoded-bits', 'Decoded bits', (Ann.DECODED_BIT,) + Ann.prefixes('R_')),
('decoded-fields', 'Decoded fields', (Ann.DECODED_F,)),
('fields', 'Fields', Ann.prefixes('F_')),
- ('commands', 'Commands', Ann.prefixes('CMD ACMD R')),
+ ('commands', 'Commands', Ann.prefixes('CMD ACMD RESPONSE_')),
)
def __init__(self):
self.out_ann = self.register(srd.OUTPUT_ANN)
def putbit(self, b, data):
- self.put(self.token[b][0], self.token[b][1], self.out_ann,
+ self.put(self.token[b].ss, self.token[b].es, self.out_ann,
[Ann.DECODED_BIT, data])
def putt(self, data):
- self.put(self.token[0][0], self.token[47][1], self.out_ann, data)
+ self.put(self.token[0].ss, self.token[47].es, self.out_ann, data)
def putf(self, s, e, data):
- self.put(self.token[s][0], self.token[e][1], self.out_ann, data)
+ self.put(self.token[s].ss, self.token[e].es, self.out_ann, data)
def puta(self, s, e, data):
- self.put(self.token[47 - 8 - e][0], self.token[47 - 8 - s][1],
+ self.put(self.token[47 - 8 - e].ss, self.token[47 - 8 - s].es,
self.out_ann, data)
def putc(self, desc):
- cmd = self.cmd + 64 if self.is_acmd else self.cmd
+ cmd = Ann.ACMD0 + self.cmd if self.is_acmd else self.cmd
self.last_cmd = cmd
self.putt([cmd, ['%s: %s' % (self.cmd_str, desc), self.cmd_str,
self.cmd_str.split(' ')[0]]])
def putr(self, r):
- self.putt([r, ['Response: %s' % r.name]])
+ self.putt([r, ['Response: %s' % r.name.split('_')[1]]])
def cmd_name(self, cmd):
c = acmd_names if self.is_acmd else cmd_names
def get_token_bits(self, cmd_pin, n):
# Get a bit, return True if we already got 'n' bits, False otherwise.
- self.token.append([self.samplenum, self.samplenum, cmd_pin])
+ self.token.append(Bit(self.samplenum, self.samplenum, cmd_pin))
if len(self.token) > 0:
- self.token[len(self.token) - 2][1] = self.samplenum
+ self.token[len(self.token) - 2].es = self.samplenum
if len(self.token) < n:
return False
- self.token[n - 1][1] += self.token[n - 1][0] - self.token[n - 2][0]
+ self.token[n - 1].es += self.token[n - 1].ss - self.token[n - 2].ss
return True
def handle_common_token_fields(self):
# Annotations for each individual bit.
for bit in range(len(self.token)):
- self.putf(bit, bit, [Ann.BIT, ['%d' % s[bit][2]]])
+ self.putf(bit, bit, [Ann.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][2] == 1 else 'card'
+ t = 'host' if s[1].bit == 1 else 'card'
self.putf(1, 1, [Ann.F_TRANSM, ['Transmission: ' + t, 'T: ' + t, 'T']])
# CMD[45:40]: Command index (BCD; valid: 0-63)
- self.cmd = int('0b' + ''.join([str(s[i][2]) for i in range(2, 8)]), 2)
+ self.cmd = int('0b' + ''.join([str(s[i].bit) for i in range(2, 8)]), 2)
c = '%s (%d)' % (self.cmd_name(self.cmd), self.cmd)
self.putf(2, 7, [Ann.F_CMD, ['Command: ' + c, 'Cmd: ' + c,
'CMD%d' % self.cmd, 'Cmd', 'C']])
# CMD[39:08]: Argument
- self.arg = int('0b' + ''.join([str(s[i][2]) for i in range(8, 40)]), 2)
+ self.arg = int('0b' + ''.join([str(s[i].bit) for i in range(8, 40)]), 2)
self.putf(8, 39, [Ann.F_ARG, ['Argument: 0x%08x' % self.arg, 'Arg', 'A']])
# CMD[07:01]: CRC7
- self.crc = int('0b' + ''.join([str(s[i][2]) for i in range(40, 47)]), 2)
+ self.crc = int('0b' + ''.join([str(s[i].bit) for i in range(40, 47)]), 2)
self.putf(40, 46, [Ann.F_CRC, ['CRC: 0x%x' % self.crc, 'CRC', 'C']])
# CMD[00:00]: End bit (always 1)
def handle_acmd999(self):
self.token, self.state = [], St.GET_RESPONSE_R1
+ def handle_reg_cid(self):
+ self.putf(8, 15, [Ann.R_CID_MID, ['Manufacturer ID', 'MID']])
+ self.putf(16, 31, [Ann.R_CID_OID, ['OEM/application ID', 'OID']])
+ self.putf(32, 71, [Ann.R_CID_PNM, ['Product name', 'PNM']])
+ self.putf(72, 79, [Ann.R_CID_PRV, ['Product revision', 'PRV']])
+ self.putf(80, 111, [Ann.R_CID_PSN, ['Product serial number', 'PSN']])
+ self.putf(112, 115, [Ann.R_CID_RSVD, ['Reserved', 'RSVD', 'R']])
+ self.putf(116, 127, [Ann.R_CID_MDT, ['Manufacturing date', 'MDT']])
+ self.putf(128, 134, [Ann.R_CID_CRC, ['CRC7 checksum', 'CRC']])
+ self.putf(135, 135, [Ann.R_CID_ONE, ['Always 1', '1']])
+
# Response tokens can have one of four formats (depends on content).
# They can have a total length of 48 or 136 bits.
# They're sent serially (MSB-first) by the card that the host
if not self.get_token_bits(cmd_pin, 48):
return
self.handle_common_token_fields()
- self.putr(Ann.R1)
+ self.putr(Ann.RESPONSE_R1)
self.puta(0, 31, [Ann.DECODED_F, ['Card status', 'Status', 'S']])
for i in range(32):
self.putbit(8 + i, [card_status[31 - i]])
return
self.handle_common_token_fields()
self.puta(0, 31, [Ann.DECODED_F, ['Card status', 'Status', 'S']])
- self.putr(Ann.R1B)
+ self.putr(Ann.RESPONSE_R1B)
self.token, self.state = [], St.GET_COMMAND_TOKEN
def handle_response_r2(self, cmd_pin):
return
# Annotations for each individual bit.
for bit in range(len(self.token)):
- self.putf(bit, bit, [Ann.BIT, ['%d' % self.token[bit][2]]])
+ self.putf(bit, bit, [Ann.BIT, ['%d' % self.token[bit].bit]])
self.putf(0, 0, [Ann.F_START, ['Start bit', 'Start', 'S']])
- t = 'host' if self.token[1][2] == 1 else 'card'
+ t = 'host' if self.token[1].bit == 1 else 'card'
self.putf(1, 1, [Ann.F_TRANSM, ['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']])
self.putf(8, 134, [Ann.DECODED_F, ['CID/CSD register', 'CID/CSD', 'C']])
- self.putf(0, 135, [Ann.R2, ['R2']])
+ self.putf(0, 135, [Ann.RESPONSE_R2, ['Response: R2']])
+
+ if self.last_cmd in (Ann.CMD2, Ann.CMD10):
+ self.handle_reg_cid()
+
self.token, self.state = [], St.GET_COMMAND_TOKEN
def handle_response_r3(self, cmd_pin):
# - Bits[00:00]: End bit (always 1)
if not self.get_token_bits(cmd_pin, 48):
return
- self.putr(Ann.R3)
+ 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][2]]])
+ self.putf(bit, bit, [Ann.BIT, ['%d' % self.token[bit].bit]])
self.putf(0, 0, [Ann.F_START, ['Start bit', 'Start', 'S']])
- t = 'host' if self.token[1][2] == 1 else 'card'
+ t = 'host' if self.token[1].bit == 1 else 'card'
self.putf(1, 1, [Ann.F_TRANSM, ['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.handle_common_token_fields()
self.puta(0, 15, [Ann.DECODED_F, ['Card status bits', 'Status', 'S']])
self.puta(16, 31, [Ann.DECODED_F, ['Relative card address', 'RCA', 'R']])
- self.putr(Ann.R6)
+ self.putr(Ann.RESPONSE_R6)
self.token, self.state = [], St.GET_COMMAND_TOKEN
def handle_response_r7(self, cmd_pin):
return
self.handle_common_token_fields()
- self.putr(Ann.R7)
+ self.putr(Ann.RESPONSE_R7)
# Arg[31:12]: Reserved bits (all-zero)
self.puta(12, 31, [Ann.DECODED_F, ['Reserved', 'Res', 'R']])
# Arg[11:08]: Voltage accepted
- v = ''.join(str(i[2]) for i in self.token[28:32])
+ v = ''.join(str(i.bit) for i in self.token[28:32])
av = accepted_voltages.get(int('0b' + v, 2), 'Unknown')
self.puta(8, 11, [Ann.DECODED_F,
['Voltage accepted: ' + av, 'Voltage', 'Volt', 'V']])