['r3', 'R3 reply'],
['r7', 'R7 reply'],
['bits', 'Bits'],
+ ['bit-warnings', 'Bit warnings'],
]
annotation_rows = (
- ('bits', 'Bits', (70,)),
+ ('bits', 'Bits', (70, 71)),
('cmd-reply', 'Commands/replies',
tuple(range(0, 63 + 1)) + tuple(range(65, 69 + 1))),
('cmd-token', 'Command tokens', (64,)),
self.bit_ss, self.bit_es = 0, 0
self.cmd_ss, self.cmd_es = 0, 0
self.cmd_token = []
+ self.cmd_token_bits = []
self.is_acmd = False # Indicates CMD vs. ACMD
self.blocklen = 0
self.read_buf = []
self.cmd_ss = self.ss
self.cmd_token.append(mosi)
+ self.cmd_token_bits.append(self.mosi_bits)
# TODO: Record MISO too?
# All command tokens are 6 bytes long.
# TODO
self.putx([64, [s + ': %02x %02x %02x %02x %02x %02x' % tuple(t)]])
- # Start bit
- self.startbit = (t[0] & (1 << 7)) >> 7
- self.putb([70, ['Start bit: %d' % self.startbit]])
- if self.startbit != 0:
- # TODO
- self.putb([1, ['Warning: Start bit != 0']])
-
- # Transmitter bit
- self.transmitterbit = (t[0] & (1 << 6)) >> 6
- self.putb([70, ['Transmitter bit: %d' % self.transmitterbit]])
- if self.transmitterbit != 0:
- # TODO
- self.putb([1, ['Warning: Transmitter bit != 1']])
-
- # Command index
+ def tb(byte, bit):
+ return self.cmd_token_bits[5 - byte][7 - bit]
+
+ # Bits[47:47]: Start bit (always 0)
+ bit, self.bit_ss, self.bit_es = tb(5, 7)[0], tb(5, 7)[1], tb(5, 7)[2]
+ if bit == 0:
+ self.putb([70, ['Start bit: %d' % bit]])
+ else:
+ self.putb([71, ['Start bit: %s (Warning: Must be 0!)' % bit]])
+
+ # Bits[46:46]: Transmitter bit (1 == host)
+ bit, self.bit_ss, self.bit_es = tb(5, 6)[0], tb(5, 6)[1], tb(5, 6)[2]
+ if bit == 1:
+ self.putb([70, ['Transmitter bit: %d' % bit]])
+ else:
+ self.putb([71, ['Transmitter bit: %d (Warning: Must be 1!)' % bit]])
+
+ # Bits[45:40]: Command index (BCD; valid: 0-63)
cmd = self.cmd_index = t[0] & 0x3f
- # TODO
+ self.bit_ss, self.bit_es = tb(5, 5)[1], tb(5, 0)[2]
self.putb([70, ['Command: %s%d (%s)' % (s, cmd, cmd_name[cmd])]])
- # Argument
+ # Bits[39:8]: Argument
self.arg = (t[1] << 24) | (t[2] << 16) | (t[3] << 8) | t[4]
+ self.bit_ss, self.bit_es = tb(4, 7)[1], tb(1, 0)[2]
self.putb([70, ['Argument: 0x%04x' % self.arg]])
- # TODO: Sanity check on argument? Must be per-cmd?
- # CRC
+ # Bits[7:1]: CRC
# TODO: Check CRC.
- self.crc = t[5] >> 1
- self.putb([70, ['CRC: 0x%01x' % self.crc]])
-
- # End bit
- self.endbit = t[5] & (1 << 0)
- self.putb([70, ['End bit: %d' % self.endbit]])
- if self.endbit != 1:
- # TODO
- self.putb([1, ['Warning: End bit != 1']])
+ crc = t[5] >> 1
+ self.bit_ss, self.bit_es = tb(0, 7)[1], tb(0, 1)[2]
+ self.putb([70, ['CRC: 0x%01x' % crc]])
+
+ # Bits[0:0]: End bit (always 1)
+ bit, self.bit_ss, self.bit_es = tb(0, 0)[0], tb(0, 0)[1], tb(0, 0)[2]
+ self.putb([70, ['End bit: %d' % bit]])
+ if bit == 1:
+ self.putb([70, ['End bit: %d' % bit]])
+ else:
+ self.putb([71, ['End bit: %d (Warning: Must be 1!)' % bit]])
# Handle command.
if cmd in (0, 1, 9, 16, 17, 41, 49, 55, 59):
self.is_acmd = False
self.cmd_token = []
+ self.cmd_token_bits = []
def handle_cmd0(self, ):
# CMD0: GO_IDLE_STATE
# The R1 response token format (1 byte).
# Sent by the card after every command except for SEND_STATUS.
- self.cmd_ss, self.cmd_es = self.ss, self.es
-
+ self.cmd_ss, self.cmd_es = self.miso_bits[0][1], self.miso_bits[7][2]
self.putx([65, ['R1: 0x%02x' % res]])
- # TODO: Configurable whether all bits are decoded.
+ def putbit(bit, data):
+ b = self.miso_bits[7 - bit]
+ self.bit_ss, self.bit_es = b[1], b[2]
+ self.putb([70, data])
- # 'In idle state' bit
+ # Bit 0: 'In idle state' bit
s = '' if (res & (1 << 0)) else 'not '
- self.putb([0, ['Card is %sin idle state' % s]])
+ putbit(0, ['Card is %sin idle state' % s])
- # 'Erase reset' bit
+ # Bit 1: 'Erase reset' bit
s = '' if (res & (1 << 1)) else 'not '
- self.putb([0, ['Erase sequence %scleared' % s]])
+ putbit(1, ['Erase sequence %scleared' % s])
- # 'Illegal command' bit
+ # Bit 2: 'Illegal command' bit
s = 'I' if (res & (1 << 2)) else 'No i'
- self.putb([0, ['%sllegal command detected' % s]])
+ putbit(2, ['%sllegal command detected' % s])
- # 'Communication CRC error' bit
+ # Bit 3: 'Communication CRC error' bit
s = 'failed' if (res & (1 << 3)) else 'was successful'
- self.putb([0, ['CRC check of last command %s' % s]])
+ putbit(3, ['CRC check of last command %s' % s])
- # 'Erase sequence error' bit
+ # Bit 4: 'Erase sequence error' bit
s = 'E' if (res & (1 << 4)) else 'No e'
- self.putb([0, ['%srror in the sequence of erase commands' % s]])
+ putbit(4, ['%srror in the sequence of erase commands' % s])
- # 'Address error' bit
+ # Bit 5: 'Address error' bit
s = 'M' if (res & (1 << 4)) else 'No m'
- self.putb([0, ['%sisaligned address used in command' % s]])
+ putbit(5, ['%sisaligned address used in command' % s])
- # 'Parameter error' bit
+ # Bit 6: 'Parameter error' bit
s = '' if (res & (1 << 4)) else 'not '
- self.putb([0, ['Command argument %soutside allowed range' % s]])
+ putbit(6, ['Command argument %soutside allowed range' % s])
+
+ # Bit 7: Always set to 0
+ putbit(7, ['Bit 7 (always 0)'])
self.state = 'IDLE'
def decode(self, ss, es, data):
ptype, mosi, miso = data
- # For now, ignore non-data packets.
- if ptype != 'DATA':
+ # For now, only use DATA and BITS packets.
+ if ptype not in ('DATA', 'BITS'):
+ return
+
+ # Store the individual bit values and ss/es numbers. The next packet
+ # is guaranteed to be a 'DATA' packet belonging to this 'BITS' one.
+ if ptype == 'BITS':
+ self.miso_bits, self.mosi_bits = miso, mosi
return
self.ss, self.es = ss, es
projects / libsigrokdecode.git / blobdiff