summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--decoders/spiflash/__init__.py (renamed from decoders/mx25lxx05d/__init__.py)8
-rw-r--r--decoders/spiflash/pd.py (renamed from decoders/mx25lxx05d/pd.py)12
2 files changed, 10 insertions, 10 deletions
diff --git a/decoders/mx25lxx05d/__init__.py b/decoders/spiflash/__init__.py
index 8ce72f6..6ffb4da 100644
--- a/decoders/mx25lxx05d/__init__.py
+++ b/decoders/spiflash/__init__.py
@@ -1,7 +1,7 @@
##
## This file is part of the libsigrokdecode project.
##
-## Copyright (C) 2012 Uwe Hermann <uwe@hermann-uwe.de>
+## Copyright (C) 2012-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
@@ -19,10 +19,10 @@
##
'''
-This decoder stacks on top of the 'spi' PD and decodes the Macronix
-MX25Lxx05D SPI (NOR) flash chip protocol.
+This decoder stacks on top of the 'spi' PD and decodes the xx25 series
+SPI (NOR) flash chip protocol.
-It works for the MX25L1605D/MX25L3205D/MX25L6405D.
+It currently supports the MX25L1605D/MX25L3205D/MX25L6405D.
Details:
http://www.macronix.com/QuickPlace/hq/PageLibrary4825740B00298A3B.nsf/h_Index/3F21BAC2E121E17848257639003A3146/$File/MX25L1605D-3205D-6405D-1.5.pdf
diff --git a/decoders/mx25lxx05d/pd.py b/decoders/spiflash/pd.py
index b5ccee0..6b46ad1 100644
--- a/decoders/mx25lxx05d/pd.py
+++ b/decoders/spiflash/pd.py
@@ -1,7 +1,7 @@
##
## This file is part of the libsigrokdecode project.
##
-## Copyright (C) 2011-2014 Uwe Hermann <uwe@hermann-uwe.de>
+## Copyright (C) 2011-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
@@ -84,13 +84,13 @@ def decode_status_reg(data):
class Decoder(srd.Decoder):
api_version = 2
- id = 'mx25lxx05d'
- name = 'MX25Lxx05D'
- longname = 'Macronix MX25Lxx05D'
- desc = 'SPI (NOR) flash chip protocol.'
+ id = 'spiflash'
+ name = 'SPI flash'
+ longname = 'SPI flash chips'
+ desc = 'xx25 series SPI (NOR) flash chip protocol.'
license = 'gplv2+'
inputs = ['logic']
- outputs = ['mx25lxx05d']
+ outputs = ['spiflash']
annotations = cmd_annotation_classes() + (
('bits', 'Bits'),
('bits2', 'Bits2'),