X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=decoders%2Fsdcard_spi%2Fpd.py;h=4f7c9f75b5fd9dc652a7eeebd82e4f87d688b0e1;hb=12851357e784b893e24880efc6cd22a0cbcc64ce;hp=fdf16e39d20e7083dbf5de767638cc25b24a1934;hpb=21e7a67e9a9d70aca44577d7556c1008e872d14c;p=libsigrokdecode.git diff --git a/decoders/sdcard_spi/pd.py b/decoders/sdcard_spi/pd.py index fdf16e3..4f7c9f7 100644 --- a/decoders/sdcard_spi/pd.py +++ b/decoders/sdcard_spi/pd.py @@ -69,14 +69,15 @@ cmd_name = { 51: 'SEND_SCR', } -def ann_cmd_list(): +def cmd_list(): l = [] for i in range(63 + 1): - l.append(['cmd%d' % i, 'CMD%d' % i]) - return l + l.append(('cmd%d' % i, 'CMD%d' % i)) + + return tuple(l) class Decoder(srd.Decoder): - api_version = 1 + api_version = 2 id = 'sdcard_spi' name = 'SD card (SPI mode)' longname = 'Secure Digital card (SPI mode)' @@ -84,19 +85,16 @@ class Decoder(srd.Decoder): license = 'gplv2+' inputs = ['spi'] outputs = ['sdcard_spi'] - probes = [] - optional_probes = [] - options = {} - annotations = ann_cmd_list() + [ - ['cmd-token', 'Command token'], - ['r1', 'R1 reply'], - ['r1b', 'R1B reply'], - ['r2', 'R2 reply'], - ['r3', 'R3 reply'], - ['r7', 'R7 reply'], - ['bits', 'Bits'], - ['bit-warnings', 'Bit warnings'], - ] + annotations = cmd_list() + ( + ('cmd-desc', 'Command description'), + ('r1', 'R1 reply'), + ('r1b', 'R1B reply'), + ('r2', 'R2 reply'), + ('r3', 'R3 reply'), + ('r7', 'R7 reply'), + ('bits', 'Bits'), + ('bit-warnings', 'Bit warnings'), + ) annotation_rows = ( ('bits', 'Bits', (70, 71)), ('cmd-reply', 'Commands/replies', @@ -115,14 +113,17 @@ class Decoder(srd.Decoder): self.is_acmd = False # Indicates CMD vs. ACMD self.blocklen = 0 self.read_buf = [] + self.cmd_str = '' def start(self): - # self.out_python = self.register(srd.OUTPUT_PYTHON) self.out_ann = self.register(srd.OUTPUT_ANN) def putx(self, data): self.put(self.cmd_ss, self.cmd_es, self.out_ann, data) + def putc(self, cmd, desc): + self.putx([cmd, ['%s: %s' % (self.cmd_str, desc)]]) + def putb(self, data): self.put(self.bit_ss, self.bit_es, self.out_ann, data) @@ -142,7 +143,6 @@ class Decoder(srd.Decoder): self.cmd_token.append(mosi) self.cmd_token_bits.append(self.mosi_bits) - # TODO: Record MISO too? # All command tokens are 6 bytes long. if len(self.cmd_token) < 6: @@ -150,17 +150,13 @@ class Decoder(srd.Decoder): self.cmd_es = self.es - # Received all 6 bytes of the command token. Now decode it. - t = self.cmd_token # CMD or ACMD? s = 'ACMD' if self.is_acmd else 'CMD' - # TODO - self.putx([64, [s + ': %02x %02x %02x %02x %02x %02x' % tuple(t)]]) def tb(byte, bit): - return self.cmd_token_bits[5 - byte][7 - bit] + return self.cmd_token_bits[5 - byte][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] @@ -186,11 +182,11 @@ class Decoder(srd.Decoder): self.bit_ss, self.bit_es = tb(4, 7)[1], tb(1, 0)[2] self.putb([70, ['Argument: 0x%04x' % self.arg]]) - # Bits[7:1]: CRC - # TODO: Check CRC. + # Bits[7:1]: CRC7 + # TODO: Check CRC7. 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]]) + self.putb([70, ['CRC7: 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] @@ -203,29 +199,33 @@ class Decoder(srd.Decoder): # Handle command. if cmd in (0, 1, 9, 16, 17, 41, 49, 55, 59): self.state = 'HANDLE CMD%d' % cmd + self.cmd_str = '%s%d (%s)' % (s, cmd, cmd_name[cmd]) + else: + self.state = 'HANDLE CMD999' + a = '%s%d: %02x %02x %02x %02x %02x %02x' % ((s, cmd) + tuple(t)) + self.putx([cmd, [a]]) # ... if self.is_acmd and cmd != 55: self.is_acmd = False - self.cmd_token = [] - self.cmd_token_bits = [] - - def handle_cmd0(self, ): + def handle_cmd0(self): # CMD0: GO_IDLE_STATE - # TODO - self.putx([0, ['CMD0: Card reset / idle state']]) + self.putc(0, 'Reset the SD card') self.state = 'GET RESPONSE R1' def handle_cmd1(self): # CMD1: SEND_OP_COND - # TODO + self.putc(1, 'Send HCS info and activate the card init process') hcs = (self.arg & (1 << 30)) >> 30 - self.putb([1, ['HCS bit = %d' % hcs]]) + self.bit_ss = self.cmd_token_bits[5 - 4][6][1] + self.bit_es = self.cmd_token_bits[5 - 4][6][2] + self.putb([70, ['HCS: %d' % hcs]]) self.state = 'GET RESPONSE R1' def handle_cmd9(self): # CMD9: SEND_CSD (128 bits / 16 bytes) + self.putc(9, 'Ask card to send its card specific data (CSD)') if len(self.read_buf) == 0: self.cmd_ss = self.ss self.read_buf.append(self.miso) @@ -243,6 +243,7 @@ class Decoder(srd.Decoder): def handle_cmd10(self): # CMD10: SEND_CID (128 bits / 16 bytes) + self.putc(10, 'Ask card to send its card identification (CID)') self.read_buf.append(self.miso) if len(self.read_buf) < 16: return @@ -253,18 +254,17 @@ class Decoder(srd.Decoder): def handle_cmd16(self): # CMD16: SET_BLOCKLEN - self.blocklen = self.arg # TODO + self.blocklen = self.arg # TODO: Sanity check on block length. - self.putx([16, ['Block length: %d' % self.blocklen]]) + self.putc(16, 'Set the block length to %d bytes' % self.blocklen) self.state = 'GET RESPONSE R1' def handle_cmd17(self): # CMD17: READ_SINGLE_BLOCK + self.putc(17, 'Read a block from address 0x%04x' % self.arg) if len(self.read_buf) == 0: self.cmd_ss = self.ss self.read_buf.append(self.miso) - if len(self.read_buf) == 1: - self.putx([0, ['Read block at address: 0x%04x' % self.arg]]) if len(self.read_buf) < self.blocklen + 2: # FIXME return self.cmd_es = self.es @@ -275,6 +275,7 @@ class Decoder(srd.Decoder): def handle_cmd41(self): # ACMD41: SD_SEND_OP_COND + self.putc(41, 'Send HCS info and activate the card init process') self.state = 'GET RESPONSE R1' def handle_cmd49(self): @@ -282,6 +283,7 @@ class Decoder(srd.Decoder): def handle_cmd55(self): # CMD55: APP_CMD + self.putc(55, 'Next command is an application-specific command') self.is_acmd = True self.state = 'GET RESPONSE R1' @@ -289,7 +291,10 @@ class Decoder(srd.Decoder): # CMD59: CRC_ON_OFF crc_on_off = self.arg & (1 << 0) s = 'on' if crc_on_off == 1 else 'off' - self.putb([59, ['SD card CRC option: %s' % s]]) + self.putc(59, 'Turn the SD card CRC option %s' % s) + self.state = 'GET RESPONSE R1' + + def handle_cmd999(self): self.state = 'GET RESPONSE R1' def handle_cid_register(self): @@ -333,11 +338,11 @@ class Decoder(srd.Decoder): # 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.miso_bits[0][1], self.miso_bits[7][2] + self.cmd_ss, self.cmd_es = self.miso_bits[7][1], self.miso_bits[0][2] self.putx([65, ['R1: 0x%02x' % res]]) def putbit(bit, data): - b = self.miso_bits[7 - bit] + b = self.miso_bits[bit] self.bit_ss, self.bit_es = b[1], b[2] self.putb([70, data]) @@ -424,6 +429,8 @@ class Decoder(srd.Decoder): s = 'handle_cmd%s' % self.state[10:].lower() handle_cmd = getattr(self, s) handle_cmd() + self.cmd_token = [] + self.cmd_token_bits = [] elif self.state.startswith('GET RESPONSE'): # Ignore stray 0xff bytes, some devices seem to send those!? if miso == 0xff: # TODO?