diff options
| -rw-r--r-- | decoders/spiflash/lists.py | 90 | ||||
| -rw-r--r-- | decoders/spiflash/pd.py | 40 |
2 files changed, 96 insertions, 34 deletions
diff --git a/decoders/spiflash/lists.py b/decoders/spiflash/lists.py new file mode 100644 index 0000000..4ed6aaf --- /dev/null +++ b/decoders/spiflash/lists.py @@ -0,0 +1,90 @@ +## +## This file is part of the libsigrokdecode project. +## +## Copyright (C) 2015 Uwe Hermann <uwe@hermann-uwe.de> +## +## 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 +## the Free Software Foundation; either version 2 of the License, or +## (at your option) any later version. +## +## This program is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. +## +## You should have received a copy of the GNU General Public License +## along with this program; if not, write to the Free Software +## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +## + +# Dict which maps command IDs to their names and descriptions. +cmds = { + 0x06: ('WREN', 'Write enable'), + 0x04: ('WRDI', 'Write disable'), + 0x9f: ('RDID', 'Read identification'), + 0x05: ('RDSR', 'Read status register'), + 0x01: ('WRSR', 'Write status register'), + 0x03: ('READ', 'Read data'), + 0x0b: ('FAST/READ', 'Fast read data'), + 0xbb: ('2READ', '2x I/O read'), + 0x20: ('SE', 'Sector erase'), + 0xd8: ('BE', 'Block erase'), + 0x60: ('CE', 'Chip erase'), + 0xc7: ('CE2', 'Chip erase'), # Alternative command ID + 0x02: ('PP', 'Page program'), + 0xad: ('CP', 'Continuously program mode'), + 0xb9: ('DP', 'Deep power down'), + 0xab: ('RDP/RES', 'Release from deep powerdown / Read electronic ID'), + 0x90: ('REMS', 'Read electronic manufacturer & device ID'), + 0xef: ('REMS2', 'Read ID for 2x I/O mode'), + 0xb1: ('ENSO', 'Enter secured OTP'), + 0xc1: ('EXSO', 'Exit secured OTP'), + 0x2b: ('RDSCUR', 'Read security register'), + 0x2f: ('WRSCUR', 'Write security register'), + 0x70: ('ESRY', 'Enable SO to output RY/BY#'), + 0x80: ('DSRY', 'Disable SO to output RY/BY#'), +} + +device_name = { + 0x14: 'MX25L1605D', + 0x15: 'MX25L3205D', + 0x16: 'MX25L6405D', +} + +chips = { + # Macronix + 'macronix_mx25l1605d': { + 'vendor': 'Macronix', + 'model': 'MX25L1605D', + 'res_id': 0x14, + 'rems_id': 0xc214, + 'rems2_id': 0xc214, + 'rdid_id': 0xc22015, + 'page_size': 256, + 'sector_size': 4 * 1024, + 'block_size': 64 * 1024, + }, + 'macronix_mx25l3205d': { + 'vendor': 'Macronix', + 'model': 'MX25L3205D', + 'res_id': 0x15, + 'rems_id': 0xc215, + 'rems2_id': 0xc215, + 'rdid_id': 0xc22016, + 'page_size': 256, + 'sector_size': 4 * 1024, + 'block_size': 64 * 1024, + }, + 'macronix_mx25l6405d': { + 'vendor': 'Macronix', + 'model': 'MX25L6405D', + 'res_id': 0x16, + 'rems_id': 0xc216, + 'rems2_id': 0xc216, + 'rdid_id': 0xc22017, + 'page_size': 256, + 'sector_size': 4 * 1024, + 'block_size': 64 * 1024, + }, +} diff --git a/decoders/spiflash/pd.py b/decoders/spiflash/pd.py index 6b46ad1..0f4dd9b 100644 --- a/decoders/spiflash/pd.py +++ b/decoders/spiflash/pd.py @@ -19,40 +19,7 @@ ## import sigrokdecode as srd - -# Dict which maps command IDs to their names and descriptions. -cmds = { - 0x06: ('WREN', 'Write enable'), - 0x04: ('WRDI', 'Write disable'), - 0x9f: ('RDID', 'Read identification'), - 0x05: ('RDSR', 'Read status register'), - 0x01: ('WRSR', 'Write status register'), - 0x03: ('READ', 'Read data'), - 0x0b: ('FAST/READ', 'Fast read data'), - 0xbb: ('2READ', '2x I/O read'), - 0x20: ('SE', 'Sector erase'), - 0xd8: ('BE', 'Block erase'), - 0x60: ('CE', 'Chip erase'), - 0xc7: ('CE2', 'Chip erase'), # Alternative command ID - 0x02: ('PP', 'Page program'), - 0xad: ('CP', 'Continuously program mode'), - 0xb9: ('DP', 'Deep power down'), - 0xab: ('RDP/RES', 'Release from deep powerdown / Read electronic ID'), - 0x90: ('REMS', 'Read electronic manufacturer & device ID'), - 0xef: ('REMS2', 'Read ID for 2x I/O mode'), - 0xb1: ('ENSO', 'Enter secured OTP'), - 0xc1: ('EXSO', 'Exit secured OTP'), - 0x2b: ('RDSCUR', 'Read security register'), - 0x2f: ('WRSCUR', 'Write security register'), - 0x70: ('ESRY', 'Enable SO to output RY/BY#'), - 0x80: ('DSRY', 'Disable SO to output RY/BY#'), -} - -device_name = { - 0x14: 'MX25L1605D', - 0x15: 'MX25L3205D', - 0x16: 'MX25L6405D', -} +from .lists import * def cmd_annotation_classes(): return tuple([tuple([cmd[0].lower(), cmd[1]]) for cmd in cmds.values()]) @@ -101,6 +68,10 @@ class Decoder(srd.Decoder): ('commands', 'Commands', tuple(range(23 + 1))), ('warnings', 'Warnings', (26,)), ) + options = ( + {'id': 'chip', 'desc': 'Chip', 'default': tuple(chips.keys())[0], + 'values': tuple(chips.keys())}, + ) def __init__(self, **kwargs): self.state = None @@ -110,6 +81,7 @@ class Decoder(srd.Decoder): def start(self): self.out_ann = self.register(srd.OUTPUT_ANN) + self.chip = chips[self.options['chip']] def putx(self, data): # Simplification, most annotations span exactly one SPI byte/packet. |