spiflash: Use SrdIntEnum for annotation classes.

Also, automate construction of the Ann SrdIntEnum.
This avoids having to remember to manually keep two lists in sync.

diff --git a/decoders/spiflash/lists.py b/decoders/spiflash/lists.py
index c6e07bfdfe1c2ffcad9a048c9bd1e3a99ca79dc7..80ca27d7abf1111b31071a386a06a6c719ac1b5d 100644 (file)
--- a/decoders/spiflash/lists.py
+++ b/decoders/spiflash/lists.py
@@ -1,7 +1,7 @@
 ##
 ## This file is part of the libsigrokdecode project.
 ##
-## Copyright (C) 2015 Uwe Hermann <uwe@hermann-uwe.de>
+## Copyright (C) 2015-2020 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
@@ -21,7 +21,6 @@ from collections import OrderedDict
 
 # OrderedDict which maps command IDs to their names and descriptions.
 # Please keep this sorted by command ID.
-# Don't forget to update 'Ann' in pd.py if you add/remove items here.
 cmds = OrderedDict([
     (0x01, ('WRSR', 'Write status register')),
     (0x02, ('PP', 'Page program')),

diff --git a/decoders/spiflash/pd.py b/decoders/spiflash/pd.py
index 33fe2298040740af3b8812d983c6d2644176ea9b..26f3a24c3105f67c67d44ee40d42dbaf926e34b1 100644 (file)
--- a/decoders/spiflash/pd.py
+++ b/decoders/spiflash/pd.py
@@ -1,7 +1,7 @@
 ##
 ## This file is part of the libsigrokdecode project.
 ##
-## Copyright (C) 2011-2016 Uwe Hermann <uwe@hermann-uwe.de>
+## Copyright (C) 2011-2020 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
@@ -18,16 +18,14 @@
 ##
 
 import sigrokdecode as srd
+import re
+from common.srdhelper import SrdIntEnum
 from .lists import *
 
 L = len(cmds)
 
-# Don't forget to keep this in sync with 'cmds' in lists.py.
-class Ann:
-    WRSR, PP, READ, WRDI, RDSR, WREN, FAST_READ, SE, RDSCUR, WRSCUR, \
-    RDSR2, CE, ESRY, DSRY, WRITE1, WRITE2, REMS, RDID, RDP_RES, CP, ENSO, DP, \
-    READ2X, EXSO, CE2, STATUS, BE, REMS2, \
-    BIT, FIELD, WARN = range(L + 3)
+a = [re.sub('\/', '_', c[0]).replace('2READ', 'READ2X') for c in cmds.values()] + ['BIT', 'FIELD', 'WARN']
+Ann = SrdIntEnum.from_list('Ann', a)
 
 def cmd_annotation_classes():
     return tuple([tuple([cmd[0].lower(), cmd[1]]) for cmd in cmds.values()])