From 353b06cd5bca3129cacca49ea685a45b384f23fe Mon Sep 17 00:00:00 2001 From: yunyaobaihong <896458252@qq.com> Date: Wed, 10 Apr 2024 17:15:15 +0800 Subject: [PATCH] Decoder update: Some decoders that support different data output formats have been annotated and rollback sdcard_spi decoder --- libsigrokdecode4DSL/decoders/0-i2c/pd.py | 8 +- libsigrokdecode4DSL/decoders/1-i2c/pd.py | 8 +- libsigrokdecode4DSL/decoders/a7105/pd.py | 8 +- libsigrokdecode4DSL/decoders/ade77xx/pd.py | 8 +- libsigrokdecode4DSL/decoders/adns5020/pd.py | 8 +- libsigrokdecode4DSL/decoders/adxl345/pd.py | 8 +- libsigrokdecode4DSL/decoders/cc1101/pd.py | 8 +- libsigrokdecode4DSL/decoders/enc28j60/pd.py | 8 +- libsigrokdecode4DSL/decoders/max7219/pd.py | 8 +- libsigrokdecode4DSL/decoders/mrf24j40/pd.py | 8 +- libsigrokdecode4DSL/decoders/nrf24l01/pd.py | 8 +- libsigrokdecode4DSL/decoders/nrf905/pd.py | 8 +- libsigrokdecode4DSL/decoders/rfm12/pd.py | 8 +- libsigrokdecode4DSL/decoders/sdcard_spi/pd.py | 181 +++++++++++------- libsigrokdecode4DSL/decoders/spiflash/pd.py | 8 +- .../decoders/st25r39xx_spi/pd.py | 8 +- libsigrokdecode4DSL/decoders/wiegand/pd.py | 1 - libsigrokdecode4DSL/decoders/x2444m/pd.py | 8 +- 18 files changed, 178 insertions(+), 132 deletions(-) diff --git a/libsigrokdecode4DSL/decoders/0-i2c/pd.py b/libsigrokdecode4DSL/decoders/0-i2c/pd.py index 7776de7e..bffb9f21 100644 --- a/libsigrokdecode4DSL/decoders/0-i2c/pd.py +++ b/libsigrokdecode4DSL/decoders/0-i2c/pd.py @@ -2,7 +2,7 @@ ## This file is part of the libsigrokdecode project. ## ## Copyright (C) 2010-2016 Uwe Hermann -## Copyright (C) 2024 DreamSourceLab +## Copyright (C) 2022 DreamSourceLab ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by @@ -22,9 +22,9 @@ # TODO: Implement support for inverting SDA/SCL levels (0->1 and 1->0). # TODO: Implement support for detecting various bus errors. -# -# DreamSourceLab :Choose hex, dec, oct, bin, or ascii to display the decoding result -# +## +## 2022/07/05 DreamSourceLab : Support for different data output formats +## import sigrokdecode as srd diff --git a/libsigrokdecode4DSL/decoders/1-i2c/pd.py b/libsigrokdecode4DSL/decoders/1-i2c/pd.py index 320cd1dc..a54b804d 100644 --- a/libsigrokdecode4DSL/decoders/1-i2c/pd.py +++ b/libsigrokdecode4DSL/decoders/1-i2c/pd.py @@ -2,7 +2,7 @@ ## This file is part of the libsigrokdecode project. ## ## Copyright (C) 2010-2016 Uwe Hermann -## Copyright (C) 2024 DreamSourceLab +## Copyright (C) 2022 DreamSourceLab ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by @@ -22,9 +22,9 @@ # TODO: Implement support for inverting SDA/SCL levels (0->1 and 1->0). # TODO: Implement support for detecting various bus errors. -# -# DreamSourceLab :Choose hex, dec, oct, bin, or ascii to display the decoding result -# +## +## 2022/07/05 DreamSourceLab : Support for different data output formats +## import sigrokdecode as srd diff --git a/libsigrokdecode4DSL/decoders/a7105/pd.py b/libsigrokdecode4DSL/decoders/a7105/pd.py index 89fa4632..7928e2a2 100644 --- a/libsigrokdecode4DSL/decoders/a7105/pd.py +++ b/libsigrokdecode4DSL/decoders/a7105/pd.py @@ -2,7 +2,7 @@ ## This file is part of the libsigrokdecode project. ## ## Copyright (C) 2020 Richard Li -## Copyright (C) 2024 DreamSourceLab +## Copyright (C) 2022 DreamSourceLab ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by @@ -18,9 +18,9 @@ ## along with this program; if not, see . ## -# -# DreamSourceLab :Choose hex, dec, oct, bin, or ascii to display the decoding result -# +## +## 2022/07/05 DreamSourceLab : Support for different data output formats +## import sigrokdecode as srd diff --git a/libsigrokdecode4DSL/decoders/ade77xx/pd.py b/libsigrokdecode4DSL/decoders/ade77xx/pd.py index 367e1c57..79f65139 100644 --- a/libsigrokdecode4DSL/decoders/ade77xx/pd.py +++ b/libsigrokdecode4DSL/decoders/ade77xx/pd.py @@ -2,7 +2,7 @@ ## This file is part of the libsigrokdecode project. ## ## Copyright (C) 2017 Karl Palsson -## Copyright (C) 2024 DreamSourceLab +## Copyright (C) 2022 DreamSourceLab ## ## Permission is hereby granted, free of charge, to any person obtaining a copy ## of this software and associated documentation files (the "Software"), to deal @@ -22,9 +22,9 @@ ## OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE ## SOFTWARE. -# -# DreamSourceLab :Choose hex, dec, oct, bin, or ascii to display the decoding result -# +## +## 2022/07/05 DreamSourceLab : Support for different data output formats +## import math import sigrokdecode as srd diff --git a/libsigrokdecode4DSL/decoders/adns5020/pd.py b/libsigrokdecode4DSL/decoders/adns5020/pd.py index 178376f1..9cd715e1 100644 --- a/libsigrokdecode4DSL/decoders/adns5020/pd.py +++ b/libsigrokdecode4DSL/decoders/adns5020/pd.py @@ -2,7 +2,7 @@ ## This file is part of the libsigrokdecode project. ## ## Copyright (C) 2015 Karl Palsson -## Copyright (C) 2024 DreamSourceLab +## Copyright (C) 2022 DreamSourceLab ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by @@ -18,9 +18,9 @@ ## along with this program; if not, see . ## -# -# DreamSourceLab :Choose hex, dec, oct, bin, or ascii to display the decoding result -# +## +## 2022/07/05 DreamSourceLab : Support for different data output formats +## import sigrokdecode as srd diff --git a/libsigrokdecode4DSL/decoders/adxl345/pd.py b/libsigrokdecode4DSL/decoders/adxl345/pd.py index 3e734658..d20e1cdf 100644 --- a/libsigrokdecode4DSL/decoders/adxl345/pd.py +++ b/libsigrokdecode4DSL/decoders/adxl345/pd.py @@ -2,7 +2,7 @@ ## This file is part of the libsigrokdecode project. ## ## Copyright (C) 2020 Analog Devices Inc. -## Copyright (C) 2024 DreamSourceLab +## Copyright (C) 2022 DreamSourceLab ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by @@ -18,9 +18,9 @@ ## along with this program; if not, see . ## -# -# DreamSourceLab :Choose hex, dec, oct, bin, or ascii to display the decoding result -# +## +## 2022/07/05 DreamSourceLab : Support for different data output formats +## import sigrokdecode as srd from common.srdhelper import SrdIntEnum diff --git a/libsigrokdecode4DSL/decoders/cc1101/pd.py b/libsigrokdecode4DSL/decoders/cc1101/pd.py index 238de19a..87267455 100644 --- a/libsigrokdecode4DSL/decoders/cc1101/pd.py +++ b/libsigrokdecode4DSL/decoders/cc1101/pd.py @@ -2,7 +2,7 @@ ## This file is part of the libsigrokdecode project. ## ## Copyright (C) 2019 Marco Geisler -## Copyright (C) 2024 DreamSourceLab +## Copyright (C) 2022 DreamSourceLab ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by @@ -18,9 +18,9 @@ ## along with this program; if not, see . ## -# -# DreamSourceLab :Choose hex, dec, oct, bin, or ascii to display the decoding result -# +## +## 2022/07/05 DreamSourceLab : Support for different data output formats +## import sigrokdecode as srd from collections import namedtuple diff --git a/libsigrokdecode4DSL/decoders/enc28j60/pd.py b/libsigrokdecode4DSL/decoders/enc28j60/pd.py index d7fd403f..41a5c1b9 100644 --- a/libsigrokdecode4DSL/decoders/enc28j60/pd.py +++ b/libsigrokdecode4DSL/decoders/enc28j60/pd.py @@ -2,7 +2,7 @@ ## This file is part of the libsigrokdecode project. ## ## Copyright (C) 2019 Jiahao Li -## Copyright (C) 2024 DreamSourceLab +## Copyright (C) 2022 DreamSourceLab ## ## Permission is hereby granted, free of charge, to any person obtaining a copy ## of this software and associated documentation files (the "Software"), to deal @@ -22,9 +22,9 @@ ## OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE ## SOFTWARE. -# -# DreamSourceLab :Choose hex, dec, oct, bin, or ascii to display the decoding result -# +## +## 2022/07/05 DreamSourceLab : Support for different data output formats +## import sigrokdecode as srd from .lists import * diff --git a/libsigrokdecode4DSL/decoders/max7219/pd.py b/libsigrokdecode4DSL/decoders/max7219/pd.py index a23c9878..d7ab7daf 100644 --- a/libsigrokdecode4DSL/decoders/max7219/pd.py +++ b/libsigrokdecode4DSL/decoders/max7219/pd.py @@ -2,7 +2,7 @@ ## This file is part of the libsigrokdecode project. ## ## Copyright (C) 2015 Paul Evans -## Copyright (C) 2024 DreamSourceLab +## Copyright (C) 2022 DreamSourceLab ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by @@ -18,9 +18,9 @@ ## along with this program; if not, see . ## -# -# DreamSourceLab :Choose hex, dec, oct, bin, or ascii to display the decoding result -# +## +## 2022/07/05 DreamSourceLab : Support for different data output formats +## import re import sigrokdecode as srd diff --git a/libsigrokdecode4DSL/decoders/mrf24j40/pd.py b/libsigrokdecode4DSL/decoders/mrf24j40/pd.py index 8cf184dd..dfb7d8f7 100644 --- a/libsigrokdecode4DSL/decoders/mrf24j40/pd.py +++ b/libsigrokdecode4DSL/decoders/mrf24j40/pd.py @@ -2,7 +2,7 @@ ## This file is part of the libsigrokdecode project. ## ## Copyright (C) 2015 Karl Palsson -## Copyright (C) 2024 DreamSourceLab +## Copyright (C) 2022 DreamSourceLab ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by @@ -18,9 +18,9 @@ ## along with this program; if not, see . ## -# -# DreamSourceLab :Choose hex, dec, oct, bin, or ascii to display the decoding result -# +## +## 2022/07/05 DreamSourceLab : Support for different data output formats +## import sigrokdecode as srd from .lists import * diff --git a/libsigrokdecode4DSL/decoders/nrf24l01/pd.py b/libsigrokdecode4DSL/decoders/nrf24l01/pd.py index c0c5a7ef..358f97df 100644 --- a/libsigrokdecode4DSL/decoders/nrf24l01/pd.py +++ b/libsigrokdecode4DSL/decoders/nrf24l01/pd.py @@ -2,7 +2,7 @@ ## This file is part of the libsigrokdecode project. ## ## Copyright (C) 2014 Jens Steinhauser -## Copyright (C) 2024 DreamSourceLab +## Copyright (C) 2022 DreamSourceLab ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by @@ -18,9 +18,9 @@ ## along with this program; if not, see . ## -# -# DreamSourceLab :Choose hex, dec, oct, bin, or ascii to display the decoding result -# +## +## 2022/07/05 DreamSourceLab : Support for different data output formats +## import sigrokdecode as srd diff --git a/libsigrokdecode4DSL/decoders/nrf905/pd.py b/libsigrokdecode4DSL/decoders/nrf905/pd.py index 269670de..b6873df3 100644 --- a/libsigrokdecode4DSL/decoders/nrf905/pd.py +++ b/libsigrokdecode4DSL/decoders/nrf905/pd.py @@ -2,7 +2,7 @@ ## This file is part of the libsigrokdecode project. ## ## Copyright (C) 2020 Jorge Solla Rubiales -## Copyright (C) 2024 DreamSourceLab +## Copyright (C) 2022 DreamSourceLab ## ## Permission is hereby granted, free of charge, to any person obtaining a copy ## of this software and associated documentation files (the "Software"), to deal @@ -22,9 +22,9 @@ ## OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE ## SOFTWARE. -# -# DreamSourceLab :Choose hex, dec, oct, bin, or ascii to display the decoding result -# +## +## 2022/07/05 DreamSourceLab : Support for different data output formats +## import sigrokdecode as srd from common.srdhelper import SrdIntEnum diff --git a/libsigrokdecode4DSL/decoders/rfm12/pd.py b/libsigrokdecode4DSL/decoders/rfm12/pd.py index eddf78a2..185ed8aa 100644 --- a/libsigrokdecode4DSL/decoders/rfm12/pd.py +++ b/libsigrokdecode4DSL/decoders/rfm12/pd.py @@ -2,7 +2,7 @@ ## This file is part of the libsigrokdecode project. ## ## Copyright (C) 2014 Sławek Piotrowski -## Copyright (C) 2024 DreamSourceLab +## Copyright (C) 2022 DreamSourceLab ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by @@ -18,9 +18,9 @@ ## along with this program; if not, see . ## -# -# DreamSourceLab :Choose hex, dec, oct, bin, or ascii to display the decoding result -# +## +## 2022/07/05 DreamSourceLab : Support for different data output formats +## import sigrokdecode as srd diff --git a/libsigrokdecode4DSL/decoders/sdcard_spi/pd.py b/libsigrokdecode4DSL/decoders/sdcard_spi/pd.py index 3df9dadb..72702677 100644 --- a/libsigrokdecode4DSL/decoders/sdcard_spi/pd.py +++ b/libsigrokdecode4DSL/decoders/sdcard_spi/pd.py @@ -1,8 +1,8 @@ ## ## This file is part of the libsigrokdecode project. ## -## Copyright (C) 2012-2014 Uwe Hermann -## Copyright (C) 2024 DreamSourceLab +## Copyright (C) 2012-2020 Uwe Hermann +## Copyright (C) 2022 DreamSourceLab ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by @@ -18,13 +18,20 @@ ## along with this program; if not, see . ## -# -# DreamSourceLab :Choose hex, dec, oct, bin, or ascii to display the decoding result -# +## +## 2022/07/05 DreamSourceLab : Support for different data output formats +## import sigrokdecode as srd +from common.srdhelper import SrdIntEnum from common.sdcard import (cmd_names, acmd_names) +responses = '1 1b 2 3 7'.split() + +a = ['CMD%d' % i for i in range(64)] + ['ACMD%d' % i for i in range(64)] + \ + ['R' + r.upper() for r in responses] + ['BIT', 'BIT_WARNING'] +Ann = SrdIntEnum.from_list('Ann', a) + class Decoder(srd.Decoder): api_version = 3 id = 'sdcard_spi' @@ -35,23 +42,16 @@ class Decoder(srd.Decoder): inputs = ['spi'] outputs = [] tags = ['Memory'] - - # annotations length: 135 + 1 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)) + ( \ - ('r1', 'R1 reply'), - ('r1b', 'R1B reply'), - ('r2', 'R2 reply'), - ('r3', 'R3 reply'), - ('r7', 'R7 reply'), - ('bits:', 'Bits'), - ('bits', 'Bits'), - ('bit-warnings', 'Bit warnings'), + tuple(('acmd%d' % i, 'ACMD%d' % i) for i in range(64)) + \ + tuple(('r%s' % r, 'R%s response' % r) for r in responses) + ( \ + ('bit', 'Bit'), + ('bit-warning', 'Bit warning'), ) annotation_rows = ( - ('bits', 'Bits', (134, 135)), - ('cmd-reply', 'Commands/replies', tuple(range(133))), #0-132 + ('bits', 'Bits', (Ann.BIT, Ann.BIT_WARNING)), + ('commands-replies', 'Commands/replies', Ann.prefixes('CMD ACMD R')), ) def __init__(self): @@ -62,6 +62,7 @@ class Decoder(srd.Decoder): self.ss, self.es = 0, 0 self.ss_bit, self.es_bit = 0, 0 self.ss_cmd, self.es_cmd = 0, 0 + self.ss_busy, self.es_busy = 0, 0 self.cmd_token = [] self.cmd_token_bits = [] self.is_acmd = False # Indicates CMD vs. ACMD @@ -70,6 +71,9 @@ class Decoder(srd.Decoder): self.cmd_str = '' self.is_cmd24 = False self.cmd24_start_token_found = False + self.is_cmd17 = False + self.cmd17_start_token_found = False + self.busy_first_byte = False def start(self): self.out_ann = self.register(srd.OUTPUT_ANN) @@ -79,9 +83,6 @@ class Decoder(srd.Decoder): def putc(self, cmd, desc): self.putx([cmd, ['%s: %s' % (self.cmd_str, desc)]]) - - def putc_4(self, cmd, desc, v): - self.putx([cmd, ['%s: %s' % (self.cmd_str, desc), '@%04X' % v]]) def putb(self, data): self.put(self.ss_bit, self.es_bit, self.out_ann, data) @@ -129,39 +130,39 @@ class Decoder(srd.Decoder): # Bits[47:47]: Start bit (always 0) bit, self.ss_bit, self.es_bit = tb(5, 7)[0], tb(5, 7)[1], tb(5, 7)[2] if bit == 0: - self.putb([134, ['Start bit: %d' % bit]]) + self.putb([Ann.BIT, ['Start bit: %d' % bit]]) else: - self.putb([135, ['Start bit: %s (Warning: Must be 0!)' % bit]]) + self.putb([Ann.BIT_WARNING, ['Start bit: %s (Warning: Must be 0!)' % bit]]) # Bits[46:46]: Transmitter bit (1 == host) bit, self.ss_bit, self.es_bit = tb(5, 6)[0], tb(5, 6)[1], tb(5, 6)[2] if bit == 1: - self.putb([134, ['Transmitter bit: %d' % bit]]) + self.putb([Ann.BIT, ['Transmitter bit: %d' % bit]]) else: - self.putb([135, ['Transmitter bit: %d (Warning: Must be 1!)' % bit]]) + self.putb([Ann.BIT_WARNING, ['Transmitter bit: %d (Warning: Must be 1!)' % bit]]) # Bits[45:40]: Command index (BCD; valid: 0-63) cmd = self.cmd_index = t[0] & 0x3f self.ss_bit, self.es_bit = tb(5, 5)[1], tb(5, 0)[2] - self.putb([134, ['Command: %s%d (%s)' % (s, cmd, self.cmd_name(cmd))]]) + self.putb([Ann.BIT, ['Command: %s%d (%s)' % (s, cmd, self.cmd_name(cmd))]]) # Bits[39:8]: Argument self.arg = (t[1] << 24) | (t[2] << 16) | (t[3] << 8) | t[4] self.ss_bit, self.es_bit = tb(4, 7)[1], tb(1, 0)[2] - self.putb([134, ['Argument: {$}', '@%04X' % self.arg]]) + self.putb([Ann.BIT, ['Argument: {$}', '@%04X' % self.arg]]) # Bits[7:1]: CRC7 # TODO: Check CRC7. crc = t[5] >> 1 self.ss_bit, self.es_bit = tb(0, 7)[1], tb(0, 1)[2] - self.putb([134, ['CRC7: {$}', '@%01X' % crc]]) + self.putb([Ann.BIT, ['CRC7: {$}', '@%01X' % crc]]) # Bits[0:0]: End bit (always 1) bit, self.ss_bit, self.es_bit = tb(0, 0)[0], tb(0, 0)[1], tb(0, 0)[2] if bit == 1: - self.putb([134, ['End bit: %d' % bit]]) + self.putb([Ann.BIT, ['End bit: %d' % bit]]) else: - self.putb([135, ['End bit: %d (Warning: Must be 1!)' % bit]]) + self.putb([Ann.BIT_WARNING, ['End bit: %d (Warning: Must be 1!)' % bit]]) # Handle command. if cmd in (0, 1, 9, 16, 17, 24, 41, 49, 55, 59): @@ -174,21 +175,21 @@ class Decoder(srd.Decoder): def handle_cmd0(self): # CMD0: GO_IDLE_STATE - self.putc(0, 'Reset the SD card') + self.putc(Ann.CMD0, 'Reset the SD card') self.state = 'GET RESPONSE R1' def handle_cmd1(self): # CMD1: SEND_OP_COND - self.putc(1, 'Send HCS info and activate the card init process') + self.putc(Ann.CMD1, 'Send HCS info and activate the card init process') hcs = (self.arg & (1 << 30)) >> 30 self.ss_bit = self.cmd_token_bits[5 - 4][6][1] self.es_bit = self.cmd_token_bits[5 - 4][6][2] - self.putb([134, ['HCS: %d' % hcs]]) + self.putb([Ann.BIT, ['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)') + self.putc(Ann.CMD9, 'Ask card to send its card specific data (CSD)') if len(self.read_buf) == 0: self.ss_cmd = self.ss self.read_buf.append(self.miso) @@ -198,7 +199,7 @@ class Decoder(srd.Decoder): return self.es_cmd = self.es self.read_buf = self.read_buf[4:] # TODO: Document or redo. - self.putx([9, ['CSD: %s' % self.read_buf]]) + self.putx([Ann.CMD9, ['CSD: %s' % self.read_buf]]) # TODO: Decode all bits. self.read_buf = [] ### self.state = 'GET RESPONSE R1' @@ -206,11 +207,11 @@ 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.putc(Ann.CMD10, 'Ask card to send its card identification (CID)') self.read_buf.append(self.miso) if len(self.read_buf) < 16: return - self.putx([10, ['CID: %s' % self.read_buf]]) + self.putx([Ann.CMD10, ['CID: %s' % self.read_buf]]) # TODO: Decode all bits. self.read_buf = [] self.state = 'GET RESPONSE R1' @@ -219,26 +220,18 @@ class Decoder(srd.Decoder): # CMD16: SET_BLOCKLEN self.blocklen = self.arg # TODO: Sanity check on block length. - self.putc(16, 'Set the block length to %d bytes' % self.blocklen) + self.putc(Ann.CMD16, 'Set the block length to %d bytes' % self.blocklen) self.state = 'GET RESPONSE R1' def handle_cmd17(self): # CMD17: READ_SINGLE_BLOCK - self.putc_4(17, 'Read a block from address {$}', self.arg) - if len(self.read_buf) == 0: - self.ss_cmd = self.ss - self.read_buf.append(self.miso) - if len(self.read_buf) < self.blocklen + 2: # FIXME - return - self.es_cmd = self.es - self.read_buf = self.read_buf[2:] # FIXME - self.putx([17, ['Block data: %s' % self.read_buf]]) - self.read_buf = [] + self.putc(Ann.CMD17, 'Read a block from address {$}', self.arg) + self.is_cmd17 = True self.state = 'GET RESPONSE R1' def handle_cmd24(self): # CMD24: WRITE_BLOCK - self.putc_4(24, 'Write a block to address {$}', self.arg) + self.putc(Ann.CMD24, 'Write a block to address {$}', self.arg)) self.is_cmd24 = True self.state = 'GET RESPONSE R1' @@ -247,7 +240,7 @@ class Decoder(srd.Decoder): def handle_cmd55(self): # CMD55: APP_CMD - self.putc(55, 'Next command is an application-specific command') + self.putc(Ann.CMD55, 'Next command is an application-specific command') self.is_acmd = True self.state = 'GET RESPONSE R1' @@ -255,12 +248,12 @@ 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.putc(59, 'Turn the SD card CRC option %s' % s) + self.putc(Ann.CMD59, 'Turn the SD card CRC option %s' % s) self.state = 'GET RESPONSE R1' def handle_acmd41(self): # ACMD41: SD_SEND_OP_COND - self.putc(64 + 41, 'Send HCS info and activate the card init process') + self.putc(Ann.ACMD41, 'Send HCS info and activate the card init process') self.state = 'GET RESPONSE R1' def handle_cmd999(self): @@ -308,12 +301,12 @@ class Decoder(srd.Decoder): # Sent by the card after every command except for SEND_STATUS. self.ss_cmd, self.es_cmd = self.miso_bits[7][1], self.miso_bits[0][2] - self.putx([65, ['R1: {$}', '@%02x' % res]]) + self.putx([Ann.R1, ['R1: {$}', '@%02x' % res]]) def putbit(bit, data): b = self.miso_bits[bit] self.ss_bit, self.es_bit = b[1], b[2] - self.putb([134, data]) + self.putb([Ann.BIT, data]) # Bit 0: 'In idle state' bit s = '' if (res & (1 << 0)) else 'not ' @@ -346,6 +339,8 @@ class Decoder(srd.Decoder): # Bit 7: Always set to 0 putbit(7, ['Bit 7 (always 0)']) + if self.is_cmd17: + self.state = 'HANDLE DATA BLOCK CMD17' if self.is_cmd24: self.state = 'HANDLE DATA BLOCK CMD24' @@ -369,6 +364,36 @@ class Decoder(srd.Decoder): # TODO pass + def handle_data_cmd17(self, miso): + # CMD17 returns one byte R1, then some bytes 0xff, then a Start Block + # (single byte 0xfe), then self.blocklen bytes of data, then always + # 2 bytes of CRC. + if self.cmd17_start_token_found: + if len(self.read_buf) == 0: + self.ss_data = self.ss + if not self.blocklen: + # Assume a fixed block size when inspection of the previous + # traffic did not provide the respective parameter value. + # TODO: Make the default block size a PD option? + self.blocklen = 512 + self.read_buf.append(miso) + # Wait until block transfer completed. + if len(self.read_buf) < self.blocklen: + return + if len(self.read_buf) == self.blocklen: + self.es_data = self.es + self.put(self.ss_data, self.es_data, self.out_ann, [Ann.CMD17, ['Block data: %s' % self.read_buf]]) + elif len(self.read_buf) == (self.blocklen + 1): + self.ss_crc = self.ss + elif len(self.read_buf) == (self.blocklen + 2): + self.es_crc = self.es + # TODO: Check CRC. + self.put(self.ss_crc, self.es_crc, self.out_ann, [Ann.CMD17, ['CRC']]) + self.state = 'IDLE' + elif miso == 0xfe: + self.put(self.ss, self.es, self.out_ann, [Ann.CMD17, ['Start Block']]) + self.cmd17_start_token_found = True + def handle_data_cmd24(self, mosi): if self.cmd24_start_token_found: if len(self.read_buf) == 0: @@ -384,11 +409,11 @@ class Decoder(srd.Decoder): if len(self.read_buf) < self.blocklen: return self.es_data = self.es - self.put(self.ss_data, self.es_data, self.out_ann, [24, ['Block data: %s' % self.read_buf]]) + self.put(self.ss_data, self.es_data, self.out_ann, [Ann.CMD24, ['Block data: %s' % self.read_buf]]) self.read_buf = [] self.state = 'DATA RESPONSE' elif mosi == 0xfe: - self.put(self.ss, self.es, self.out_ann, [24, ['Start Block']]) + self.put(self.ss, self.es, self.out_ann, [Ann.CMD24, ['Start Block']]) self.cmd24_start_token_found = True def handle_data_response(self, miso): @@ -408,21 +433,39 @@ class Decoder(srd.Decoder): # Should we return to IDLE here? return m = self.miso_bits - self.put(m[7][1], m[5][2], self.out_ann, [134, ['Don\'t care']]) - self.put(m[4][1], m[4][2], self.out_ann, [134, ['Always 0']]) + self.put(m[7][1], m[5][2], self.out_ann, [Ann.BIT, ['Don\'t care']]) + self.put(m[4][1], m[4][2], self.out_ann, [Ann.BIT, ['Always 0']]) if miso == 0x05: - self.put(m[3][1], m[1][2], self.out_ann, [134, ['Data accepted']]) + self.put(m[3][1], m[1][2], self.out_ann, [Ann.BIT, ['Data accepted']]) elif miso == 0x0b: - self.put(m[3][1], m[1][2], self.out_ann, [134, ['Data rejected (CRC error)']]) + self.put(m[3][1], m[1][2], self.out_ann, [Ann.BIT, ['Data rejected (CRC error)']]) elif miso == 0x0d: - self.put(m[3][1], m[1][2], self.out_ann, [134, ['Data rejected (write error)']]) - self.put(m[0][1], m[0][2], self.out_ann, [134, ['Always 1']]) - ann_class = None + self.put(m[3][1], m[1][2], self.out_ann, [Ann.BIT, ['Data rejected (write error)']]) + self.put(m[0][1], m[0][2], self.out_ann, [Ann.BIT, ['Always 1']]) + cls = Ann.CMD24 if self.is_cmd24 else None + if cls is not None: + self.put(self.ss, self.es, self.out_ann, [cls, ['Data Response']]) if self.is_cmd24: - ann_class = 24 - if ann_class is not None: - self.put(self.ss, self.es, self.out_ann, [ann_class, ['Data Response']]) - self.state = 'IDLE' + # We just send a block of data to be written to the card, + # this takes some time. + self.state = 'WAIT WHILE CARD BUSY' + self.busy_first_byte = True + else: + self.state = 'IDLE' + + def wait_while_busy(self, miso): + if miso != 0x00: + cls = Ann.CMD24 if self.is_cmd24 else None + if cls is not None: + self.put(self.ss_busy, self.es_busy, self.out_ann, [cls, ['Card is busy']]) + self.state = 'IDLE' + return + else: + if self.busy_first_byte: + self.ss_busy = self.ss + self.busy_first_byte = False + else: + self.es_busy = self.es def decode(self, ss, es, data): ptype, mosi, miso = data @@ -470,7 +513,11 @@ class Decoder(srd.Decoder): handle_response = getattr(self, s) self.state = 'IDLE' handle_response(miso) + elif self.state == 'HANDLE DATA BLOCK CMD17': + self.handle_data_cmd17(miso) elif self.state == 'HANDLE DATA BLOCK CMD24': self.handle_data_cmd24(mosi) elif self.state == 'DATA RESPONSE': self.handle_data_response(miso) + elif self.state == 'WAIT WHILE CARD BUSY': + self.wait_while_busy(miso) diff --git a/libsigrokdecode4DSL/decoders/spiflash/pd.py b/libsigrokdecode4DSL/decoders/spiflash/pd.py index 28fa211e..69176768 100644 --- a/libsigrokdecode4DSL/decoders/spiflash/pd.py +++ b/libsigrokdecode4DSL/decoders/spiflash/pd.py @@ -2,7 +2,7 @@ ## This file is part of the libsigrokdecode project. ## ## Copyright (C) 2011-2016 Uwe Hermann -## Copyright (C) 2024 DreamSourceLab +## Copyright (C) 2022 DreamSourceLab ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by @@ -18,9 +18,9 @@ ## along with this program; if not, see . ## -# -# DreamSourceLab :Choose hex, dec, oct, bin, or ascii to display the decoding result -# +## +## 2022/07/05 DreamSourceLab : Support for different data output formats +## import sigrokdecode as srd from .lists import * diff --git a/libsigrokdecode4DSL/decoders/st25r39xx_spi/pd.py b/libsigrokdecode4DSL/decoders/st25r39xx_spi/pd.py index 9f59ce38..391af89e 100644 --- a/libsigrokdecode4DSL/decoders/st25r39xx_spi/pd.py +++ b/libsigrokdecode4DSL/decoders/st25r39xx_spi/pd.py @@ -2,7 +2,7 @@ ## This file is part of the libsigrokdecode project. ## ## Copyright (C) 2019-2020 Benjamin Vernoux -## Copyright (C) 2024 DreamSourceLab +## Copyright (C) 2022 DreamSourceLab ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by @@ -18,9 +18,9 @@ ## along with this program; if not, see . ## -# -# DreamSourceLab :Choose hex, dec, oct, bin, or ascii to display the decoding result -# +## +## 2022/07/05 DreamSourceLab : Support for different data output formats +## import sigrokdecode as srd from collections import namedtuple diff --git a/libsigrokdecode4DSL/decoders/wiegand/pd.py b/libsigrokdecode4DSL/decoders/wiegand/pd.py index f295b768..134c1fbb 100644 --- a/libsigrokdecode4DSL/decoders/wiegand/pd.py +++ b/libsigrokdecode4DSL/decoders/wiegand/pd.py @@ -123,7 +123,6 @@ class Decoder(srd.Decoder): bstart += 4 blen = len(bits) - #s1 = '%d bits {$}' % blen s1 = '%d bits %s' % (blen, accum_bits) s2 = '%d bits' % blen #s3 = '@%02X' % (bits2int(bits)) diff --git a/libsigrokdecode4DSL/decoders/x2444m/pd.py b/libsigrokdecode4DSL/decoders/x2444m/pd.py index 5bf820d3..3448b742 100644 --- a/libsigrokdecode4DSL/decoders/x2444m/pd.py +++ b/libsigrokdecode4DSL/decoders/x2444m/pd.py @@ -2,7 +2,7 @@ ## This file is part of the libsigrokdecode project. ## ## Copyright (C) 2018 Stefan Petersen -## Copyright (C) 2024 DreamSourceLab +## Copyright (C) 2022 DreamSourceLab ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by @@ -18,9 +18,9 @@ ## along with this program; if not, see . ## -# -# DreamSourceLab :Choose hex, dec, oct, bin, or ascii to display the decoding result -# +## +## 2022/07/05 DreamSourceLab : Support for different data output formats +## import re import sigrokdecode as srd