X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=decoders%2Fsdcard_spi%2Fpd.py;h=5cdea4cfc6bd03b8ed9ecf1d37b7f3b7a2e05deb;hp=cf2f487f174fc4ede2345dc7ca6fdd76674fa9f7;hb=a74855de187198624fefd2c12ef8355e5a869f80;hpb=86f685145345cabef1373a1242016b769ff199b4 diff --git a/decoders/sdcard_spi/pd.py b/decoders/sdcard_spi/pd.py index cf2f487..5cdea4c 100644 --- a/decoders/sdcard_spi/pd.py +++ b/decoders/sdcard_spi/pd.py @@ -110,6 +110,7 @@ class Decoder(srd.Decoder): 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 = [] @@ -139,6 +140,7 @@ class Decoder(srd.Decoder): 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. @@ -156,39 +158,45 @@ class Decoder(srd.Decoder): # 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: + 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] + self.putb([70, ['Start bit: %d' % bit]]) + if bit != 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: + # 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] + self.putb([70, ['Transmitter bit: %d' % bit]]) + if bit != 1: # TODO self.putb([1, ['Warning: Transmitter bit != 1']]) - # Command index - cmd = self.cmd_index = t[0] & 0x3f + # Bits[45:40]: Command index (BCD; valid: 0-63) + cmd = self.cmd_index = t[5] & 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: + 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: # TODO self.putb([1, ['Warning: End bit != 1']]) @@ -201,6 +209,7 @@ class Decoder(srd.Decoder): self.is_acmd = False self.cmd_token = [] + self.cmd_token_bits = [] def handle_cmd0(self, ): # CMD0: GO_IDLE_STATE @@ -325,38 +334,43 @@ class Decoder(srd.Decoder): # Sent by the card after every command except for SEND_STATUS. self.cmd_ss, self.cmd_es = self.ss, self.es - 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' @@ -383,8 +397,14 @@ class Decoder(srd.Decoder): 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