From c10d6ffa0d98bac0c779de31a5ee67fcee611234 Mon Sep 17 00:00:00 2001 From: Przemyslaw Plutecki Date: Mon, 16 Dec 2019 13:40:28 +0100 Subject: [PATCH 1/2] Remove semantic-mem-map-version, ident-code, and map-version from x-cern-info (x-gena) and replace with x-map-info --- proto/cheby/gen_gena_memmap.py | 19 +++---------------- proto/cheby/gena2cheby.py | 7 ++++++- proto/cheby/layout.py | 16 +++++----------- proto/cheby/parser.py | 4 ++-- proto/cheby/pprint.py | 2 +- proto/cheby/schemas_version.py | 5 +++-- 6 files changed, 20 insertions(+), 33 deletions(-) diff --git a/proto/cheby/gen_gena_memmap.py b/proto/cheby/gen_gena_memmap.py index d29a4c8..aeab703 100644 --- a/proto/cheby/gen_gena_memmap.py +++ b/proto/cheby/gen_gena_memmap.py @@ -8,29 +8,16 @@ def get_gena(n, name, default=None): return n.get_extension('x_gena', name, default) -def get_cern_info(root, name, default=None): - return root.get_extension('x_cern_info', name, default) - - -def get_version(root, name): - # Versions info have moved from x-cern-info to x-gena. - gena = get_gena(root, name) - if gena is not None: - return gena - cern_info = get_cern_info(root, name) - return cern_info - - def gen_header(root, decls): cpfx = 'C_{}'.format(root.name) - ident_code = get_version(root, 'ident-code') + ident_code = root.ident if ident_code is not None: width = root.c_word_size * tree.BYTE_SIZE decls.append(HDLComment('Ident Code')) decls.append(HDLConstant(cpfx + '_IdentCode', width, value=HDLHexConst(ident_code, width))) - version = get_version(root, 'map-version') + version = get_gena(root, 'map-version') if version is not None: decls.append(HDLComment('Memory Map Version')) cst = HDLConstant(cpfx + '_MemMapVersion', 32, @@ -38,7 +25,7 @@ def gen_header(root, decls): cst.eol_comment = '{}'.format(version) decls.append(cst) - sem_version = get_version(root, 'semantic-mem-map-version') + sem_version = root.memmap_version if sem_version is not None: # TODO: check format ? vers = [int(x) for x in sem_version.split('.')] diff --git a/proto/cheby/gena2cheby.py b/proto/cheby/gena2cheby.py index f5f056f..807993a 100755 --- a/proto/cheby/gena2cheby.py +++ b/proto/cheby/gena2cheby.py @@ -788,6 +788,7 @@ def conv_root(root, filename): res.x_fesa = {} res.x_driver_edge = {} res.x_enums = [] + res.x_map_info = {} acc_mode = None size_val = None size_str = None @@ -805,8 +806,12 @@ def conv_root(root, filename): elif k == 'area-depth': size_str = v size_val = conv_depth(v) - elif k in ('map-version', 'ident-code', 'semantic-mem-map-version'): + elif k == 'map-version': res.x_gena[k] = v + elif k == 'ident-code': + res.x_map_info['ident'] = v + elif k == 'semantic-mem-map-version': + res.x_map_info['memmap-version'] = v elif k == 'gen': xg = {} for e in [g.strip() for g in v.split(',')]: diff --git a/proto/cheby/layout.py b/proto/cheby/layout.py index 99b0851..e7e7908 100644 --- a/proto/cheby/layout.py +++ b/proto/cheby/layout.py @@ -268,11 +268,12 @@ def layout_reg(lo, n): n.get_path())) v = lo.root.c_version f.c_preset = (v[0] << 16) | (v[1] << 8) | v[2] - elif n.constant == 'ident': + elif n.constant == 'ident' or n.constant == 'ident-code': v = lo.root.ident if v is None: raise LayoutException( - n, "cannot use 'constant: ident' for register {} without x-map-info:ident".format( + n, "cannot use 'constant: {}' for register {} without x-map-info:ident".format( + n.constant, n.get_path())) f.c_preset = v elif n.constant == 'memmap-version': @@ -283,17 +284,10 @@ def layout_reg(lo, n): n.get_path())) f.c_preset = (v[0] << 16) | (v[1] << 8) | v[2] elif n.constant == 'map-version': - v = lo.root.get_extension('x_cern_info', 'map-version', None) + v = lo.root.get_extension('x_gena', 'map-version', None) if v is None: raise LayoutException( - n, "cannot use 'constant: map-version' for register {} without x-cern-info:map-version".format( - n.get_path())) - f.c_preset = v - elif n.constant == 'ident-code': - v = lo.root.get_extension('x_cern_info', 'ident-code', None) - if v is None: - raise LayoutException( - n, "cannot use 'constant: ident-code' for register {} without x-cern-info:ident-code".format( + n, "cannot use 'constant: map-version' for register {} without x-gena:map-version".format( n.get_path())) f.c_preset = v else: diff --git a/proto/cheby/parser.py b/proto/cheby/parser.py index 3b5306a..fd58b64 100644 --- a/proto/cheby/parser.py +++ b/proto/cheby/parser.py @@ -93,8 +93,8 @@ def parse_named(node, key, val): node.x_fesa = val elif key == 'x-driver-edge': node.x_driver_edge = val - elif key == 'x-cern-info': - node.x_cern_info = val + elif key == 'x-map-info': + node.x_map_info = val elif key == 'x-devicetree': node.x_devicetree = val elif key == 'x-interrupts': diff --git a/proto/cheby/pprint.py b/proto/cheby/pprint.py index 244074f..cce97e8 100644 --- a/proto/cheby/pprint.py +++ b/proto/cheby/pprint.py @@ -93,7 +93,7 @@ def pprint_extensions(pp, n): 'x-fesa', 'x-driver-edge', 'x-conversions', - 'x-cern-info']: + 'x-map-info']: attr = name.replace('-', '_') if hasattr(n, attr): pprint_extension(pp, name, getattr(n, attr)) diff --git a/proto/cheby/schemas_version.py b/proto/cheby/schemas_version.py index e5635d7..8a1b6cd 100644 --- a/proto/cheby/schemas_version.py +++ b/proto/cheby/schemas_version.py @@ -5,5 +5,6 @@ VERSIONS = { 'x-fesa': "1.0.0", 'x-driver-edge': "1.0.0", 'x-conversions': "1.0.0", - "x-wbgen": "1.0.0" -} \ No newline at end of file + "x-wbgen": "1.0.0", + "x-map-info": "1.0.0" +} -- GitLab From 3b94a94ddffe0bfa2130509fab2c8bbe416213ed Mon Sep 17 00:00:00 2001 From: Przemyslaw Plutecki Date: Mon, 16 Dec 2019 13:40:54 +0100 Subject: [PATCH 2/2] update test maps --- testfiles/bug-unit/rfLimiter.cheby | 5 +++-- testfiles/bug-xml/acqCore.cheby | 5 +++-- testfiles/err_gena/Muxed_code.cheby | 3 ++- testfiles/err_gena/Muxed_name.cheby | 3 ++- testfiles/features/cern_info.cheby | 5 +++-- testfiles/gena/Area_CRegs.cheby | 3 ++- testfiles/gena/Area_CRegs_Regs_Mems.cheby | 3 ++- testfiles/gena/Area_CRegs_Regs_Mems_EmptyRoot.cheby | 3 ++- testfiles/gena/Area_Mems.cheby | 3 ++- testfiles/gena/Area_extarea.cheby | 3 ++- testfiles/gena/Area_extarea_error.cheby | 3 ++- testfiles/gena/Area_reserved.cheby | 3 ++- testfiles/gena/CRegs.cheby | 3 ++- testfiles/gena/CRegs_Address.cheby | 3 ++- testfiles/gena/CRegs_Mems.cheby | 3 ++- testfiles/gena/CRegs_NoRMW.cheby | 3 ++- testfiles/gena/CRegs_Preset.cheby | 3 ++- testfiles/gena/CRegs_Regs.cheby | 3 ++- testfiles/gena/CRegs_Regs_Mems.cheby | 3 ++- testfiles/gena/CRegs_Regs_NoRMW.cheby | 3 ++- testfiles/gena/CRegs_busout.cheby | 3 ++- testfiles/gena/CRegs_d8.cheby | 3 ++- testfiles/gena/CRegs_extacm.cheby | 3 ++- testfiles/gena/CRegs_extcreg.cheby | 3 ++- testfiles/gena/CRegs_ignore.cheby | 3 ++- testfiles/gena/CRegs_internal.cheby | 3 ++- testfiles/gena/CRegs_library.cheby | 3 ++- testfiles/gena/CRegs_nodff.cheby | 3 ++- testfiles/gena/CRegs_nosplit.cheby | 3 ++- testfiles/gena/CRegs_resize.cheby | 3 ++- testfiles/gena/CRegs_resize_nosplit.cheby | 3 ++- testfiles/gena/CRegs_resize_signed.cheby | 3 ++- testfiles/gena/CRegs_splitaddr.cheby | 3 ++- testfiles/gena/CRegs_srff.cheby | 3 ++- testfiles/gena/CRegs_wrstrobe.cheby | 3 ++- testfiles/gena/Consts.cheby | 5 +++-- testfiles/gena/Inc_CRegs.cheby | 5 +++-- testfiles/gena/Mems.cheby | 3 ++- testfiles/gena/Mems2.cheby | 3 ++- testfiles/gena/Mems_RO.cheby | 3 ++- testfiles/gena/Mems_WO.cheby | 3 ++- testfiles/gena/Mems_nodff.cheby | 3 ++- testfiles/gena/Mems_splitaddr.cheby | 3 ++- testfiles/gena/Muxed.cheby | 3 ++- testfiles/gena/Muxed2.cheby | 3 ++- testfiles/gena/Regs.cheby | 3 ++- testfiles/gena/Regs_Mems.cheby | 3 ++- testfiles/gena/Regs_cross_words.cheby | 3 ++- testfiles/gena/Regs_nodff.cheby | 3 ++- testfiles/gena/Regs_rdstrobe.cheby | 3 ++- testfiles/gena/Regs_small.cheby | 3 ++- testfiles/gena/Semver.cheby | 5 +++-- testfiles/gena/Submap.cheby | 3 ++- testfiles/gena/Submap_internal.cheby | 3 ++- testfiles/gena/sub_reg_one.cheby | 3 ++- testfiles/gena/sub_reg_preset.cheby | 3 ++- testfiles/gena/sub_reg_preset2.cheby | 3 ++- testfiles/gena/sub_reg_swap.cheby | 3 ++- testfiles/gena2cheby/Inc_CRegs.cheby | 5 +++-- testfiles/gena2cheby/submap_noinc.cheby | 3 ++- testfiles/issue24/map_arrays.cheby | 5 +++-- testfiles/issue32/memmap.cheby | 5 +++-- testfiles/issue33/testmap.cheby | 5 +++-- testfiles/issue33b/testmap.cheby | 5 +++-- testfiles/issue33c/adf4002.cheby | 5 +++-- testfiles/issue33c/fractDivider.cheby | 7 ++++--- testfiles/issue33d/preset1-preset-always.cheby | 3 ++- testfiles/issue33d/preset1-preset-no.cheby | 3 ++- testfiles/issue33d/preset1-preset-nosplit.cheby | 3 ++- testfiles/issue33d/preset2-preset-nosplit.cheby | 3 ++- testfiles/issue39/addressingMemory.cheby | 7 ++++--- testfiles/issue40/bugConstraints.cheby | 5 +++-- testfiles/issue41/bugBlockFields.cheby | 5 +++-- testfiles/issue49/mainMap.cheby | 5 +++-- testfiles/issue49/ssmap.cheby | 5 +++-- testfiles/issue51/map.cheby | 5 +++-- testfiles/issue7/code_fields.cheby | 5 +++-- testfiles/issue_gena_rst/CRegs.cheby | 3 ++- testfiles/issue_gena_rst/CRegs_srff.cheby | 3 ++- 79 files changed, 180 insertions(+), 101 deletions(-) diff --git a/testfiles/bug-unit/rfLimiter.cheby b/testfiles/bug-unit/rfLimiter.cheby index 3c4bff1..50c9f5c 100644 --- a/testfiles/bug-unit/rfLimiter.cheby +++ b/testfiles/bug-unit/rfLimiter.cheby @@ -3,11 +3,12 @@ memory-map: bus: cern-be-vme-err-32 size: 1k x-gena: - ident-code: 0xff map-version: 20191111 - semantic-mem-map-version: 0.0.3 x-driver-edge: equipment-code: SP-ALCCA + x-map-info: + ident: 0xff + memmap-version: 0.0.3 children: - submap: name: ipInfo diff --git a/testfiles/bug-xml/acqCore.cheby b/testfiles/bug-xml/acqCore.cheby index abf9c1e..c5718b4 100644 --- a/testfiles/bug-xml/acqCore.cheby +++ b/testfiles/bug-xml/acqCore.cheby @@ -4,11 +4,12 @@ memory-map: bus: cern-be-vme-err-32 size: 1k x-gena: - ident-code: 0xff map-version: 20191120 - semantic-mem-map-version: 0.0.1 x-driver-edge: equipment-code: SP-ALCCA + x-map-info: + ident: 0xff + memmap-version: 0.0.1 children: - submap: name: ipInfo diff --git a/testfiles/err_gena/Muxed_code.cheby b/testfiles/err_gena/Muxed_code.cheby index f9051b4..2acfcce 100644 --- a/testfiles/err_gena/Muxed_code.cheby +++ b/testfiles/err_gena/Muxed_code.cheby @@ -4,8 +4,9 @@ memory-map: bus: cern-be-vme-16 size: 1M x-gena: - ident-code: 0x00 map-version: 20180513 + x-map-info: + ident: 0x00 children: - reg: name: muxedRegRO diff --git a/testfiles/err_gena/Muxed_name.cheby b/testfiles/err_gena/Muxed_name.cheby index 0051066..bf6c5ed 100644 --- a/testfiles/err_gena/Muxed_name.cheby +++ b/testfiles/err_gena/Muxed_name.cheby @@ -4,8 +4,9 @@ memory-map: bus: cern-be-vme-16 size: 1M x-gena: - ident-code: 0x00 map-version: 20180513 + x-map-info: + ident: 0x00 children: - reg: name: muxedRegRO diff --git a/testfiles/features/cern_info.cheby b/testfiles/features/cern_info.cheby index 8d8109e..fe047c0 100644 --- a/testfiles/features/cern_info.cheby +++ b/testfiles/features/cern_info.cheby @@ -2,8 +2,9 @@ memory-map: name: cregs bus: cern-be-vme-err-32 size: 1024k - x-cern-info: - ident-code: 0x11 + x-map-info: + ident: 0x11 + x-gena: map-version: 20161031 children: - reg: diff --git a/testfiles/gena/Area_CRegs.cheby b/testfiles/gena/Area_CRegs.cheby index 8391f92..8af29d4 100644 --- a/testfiles/gena/Area_CRegs.cheby +++ b/testfiles/gena/Area_CRegs.cheby @@ -3,8 +3,9 @@ memory-map: bus: cern-be-vme-err-16 size: 1024k x-gena: - ident-code: 0xff map-version: 20161031 + x-map-info: + ident: 0xff children: - reg: name: test3 diff --git a/testfiles/gena/Area_CRegs_Regs_Mems.cheby b/testfiles/gena/Area_CRegs_Regs_Mems.cheby index f1d4a5a..8e8777e 100644 --- a/testfiles/gena/Area_CRegs_Regs_Mems.cheby +++ b/testfiles/gena/Area_CRegs_Regs_Mems.cheby @@ -3,8 +3,9 @@ memory-map: bus: cern-be-vme-16 size: 1024k x-gena: - ident-code: 0xff map-version: 20161031 + x-map-info: + ident: 0xff children: - reg: name: test1 diff --git a/testfiles/gena/Area_CRegs_Regs_Mems_EmptyRoot.cheby b/testfiles/gena/Area_CRegs_Regs_Mems_EmptyRoot.cheby index 79cc9eb..71af502 100644 --- a/testfiles/gena/Area_CRegs_Regs_Mems_EmptyRoot.cheby +++ b/testfiles/gena/Area_CRegs_Regs_Mems_EmptyRoot.cheby @@ -3,8 +3,9 @@ memory-map: bus: cern-be-vme-16 size: 1024k x-gena: - ident-code: 0xff map-version: 20161031 + x-map-info: + ident: 0xff children: - block: name: area diff --git a/testfiles/gena/Area_Mems.cheby b/testfiles/gena/Area_Mems.cheby index 07e03d3..a7af009 100644 --- a/testfiles/gena/Area_Mems.cheby +++ b/testfiles/gena/Area_Mems.cheby @@ -3,8 +3,9 @@ memory-map: bus: cern-be-vme-err-32 size: 1024k x-gena: - ident-code: 0xff map-version: 20161031 + x-map-info: + ident: 0xff children: - block: name: area diff --git a/testfiles/gena/Area_extarea.cheby b/testfiles/gena/Area_extarea.cheby index fac6d74..29a4df9 100644 --- a/testfiles/gena/Area_extarea.cheby +++ b/testfiles/gena/Area_extarea.cheby @@ -3,8 +3,9 @@ memory-map: bus: cern-be-vme-16 size: 1024k x-gena: - ident-code: 0xff map-version: 20161031 + x-map-info: + ident: 0xff children: - reg: name: test1 diff --git a/testfiles/gena/Area_extarea_error.cheby b/testfiles/gena/Area_extarea_error.cheby index 77ff7a6..ef90934 100644 --- a/testfiles/gena/Area_extarea_error.cheby +++ b/testfiles/gena/Area_extarea_error.cheby @@ -3,8 +3,9 @@ memory-map: bus: cern-be-vme-err-16 size: 1024k x-gena: - ident-code: 0xff map-version: 20161031 + x-map-info: + ident: 0xff children: - reg: name: test1 diff --git a/testfiles/gena/Area_reserved.cheby b/testfiles/gena/Area_reserved.cheby index feffe3c..3aee2fe 100644 --- a/testfiles/gena/Area_reserved.cheby +++ b/testfiles/gena/Area_reserved.cheby @@ -3,8 +3,9 @@ memory-map: bus: cern-be-vme-err-32 size: 1024k x-gena: - ident-code: 0xff map-version: 20161031 + x-map-info: + ident: 0xff children: - reg: name: test1 diff --git a/testfiles/gena/CRegs.cheby b/testfiles/gena/CRegs.cheby index 7f38058..dff63a4 100644 --- a/testfiles/gena/CRegs.cheby +++ b/testfiles/gena/CRegs.cheby @@ -3,8 +3,9 @@ memory-map: bus: cern-be-vme-err-32 size: 1024k x-gena: - ident-code: 0xff map-version: 20161031 + x-map-info: + ident: 0xff children: - reg: name: test1 diff --git a/testfiles/gena/CRegs_Address.cheby b/testfiles/gena/CRegs_Address.cheby index 2f58d7c..a8a4888 100644 --- a/testfiles/gena/CRegs_Address.cheby +++ b/testfiles/gena/CRegs_Address.cheby @@ -3,8 +3,9 @@ memory-map: bus: cern-be-vme-err-32 size: 1024k x-gena: - ident-code: 0xff map-version: 20161031 + x-map-info: + ident: 0xff children: - reg: name: test1 diff --git a/testfiles/gena/CRegs_Mems.cheby b/testfiles/gena/CRegs_Mems.cheby index f17cba6..e0a44c1 100644 --- a/testfiles/gena/CRegs_Mems.cheby +++ b/testfiles/gena/CRegs_Mems.cheby @@ -3,8 +3,9 @@ memory-map: bus: cern-be-vme-16 size: 1024k x-gena: - ident-code: 0xff map-version: 20161031 + x-map-info: + ident: 0xff children: - reg: name: test1 diff --git a/testfiles/gena/CRegs_NoRMW.cheby b/testfiles/gena/CRegs_NoRMW.cheby index 3fb7336..cb526e7 100644 --- a/testfiles/gena/CRegs_NoRMW.cheby +++ b/testfiles/gena/CRegs_NoRMW.cheby @@ -3,8 +3,9 @@ memory-map: bus: cern-be-vme-16 size: 1024k x-gena: - ident-code: 0xff map-version: 20161031 + x-map-info: + ident: 0xff children: - reg: name: test1 diff --git a/testfiles/gena/CRegs_Preset.cheby b/testfiles/gena/CRegs_Preset.cheby index 3d88a91..53df7a5 100644 --- a/testfiles/gena/CRegs_Preset.cheby +++ b/testfiles/gena/CRegs_Preset.cheby @@ -3,8 +3,9 @@ memory-map: bus: cern-be-vme-err-32 size: 1024k x-gena: - ident-code: 0xff map-version: 20161031 + x-map-info: + ident: 0xff children: - reg: name: test1 diff --git a/testfiles/gena/CRegs_Regs.cheby b/testfiles/gena/CRegs_Regs.cheby index 4561073..c556801 100644 --- a/testfiles/gena/CRegs_Regs.cheby +++ b/testfiles/gena/CRegs_Regs.cheby @@ -3,8 +3,9 @@ memory-map: bus: cern-be-vme-16 size: 1024k x-gena: - ident-code: 0xff map-version: 20161031 + x-map-info: + ident: 0xff children: - reg: name: test1 diff --git a/testfiles/gena/CRegs_Regs_Mems.cheby b/testfiles/gena/CRegs_Regs_Mems.cheby index af82652..edcd1e4 100644 --- a/testfiles/gena/CRegs_Regs_Mems.cheby +++ b/testfiles/gena/CRegs_Regs_Mems.cheby @@ -3,8 +3,9 @@ memory-map: bus: cern-be-vme-16 size: 1024k x-gena: - ident-code: 0xff map-version: 20161101 + x-map-info: + ident: 0xff children: - reg: name: test1 diff --git a/testfiles/gena/CRegs_Regs_NoRMW.cheby b/testfiles/gena/CRegs_Regs_NoRMW.cheby index 70b6c5f..0c3a5da 100644 --- a/testfiles/gena/CRegs_Regs_NoRMW.cheby +++ b/testfiles/gena/CRegs_Regs_NoRMW.cheby @@ -3,8 +3,9 @@ memory-map: bus: cern-be-vme-16 size: 1024k x-gena: - ident-code: 0xff map-version: 20161101 + x-map-info: + ident: 0xff children: - reg: name: test1 diff --git a/testfiles/gena/CRegs_busout.cheby b/testfiles/gena/CRegs_busout.cheby index 1935984..320e775 100644 --- a/testfiles/gena/CRegs_busout.cheby +++ b/testfiles/gena/CRegs_busout.cheby @@ -3,8 +3,9 @@ memory-map: bus: cern-be-vme-err-32 size: 1024k x-gena: - ident-code: 0xff map-version: 20161031 + x-map-info: + ident: 0xff children: - reg: name: test1 diff --git a/testfiles/gena/CRegs_d8.cheby b/testfiles/gena/CRegs_d8.cheby index 9924da6..298c432 100644 --- a/testfiles/gena/CRegs_d8.cheby +++ b/testfiles/gena/CRegs_d8.cheby @@ -3,8 +3,9 @@ memory-map: bus: cern-be-vme-8 size: 1024k x-gena: - ident-code: 0xff map-version: 20161031 + x-map-info: + ident: 0xff children: - reg: name: test1 diff --git a/testfiles/gena/CRegs_extacm.cheby b/testfiles/gena/CRegs_extacm.cheby index 529902c..6475c43 100644 --- a/testfiles/gena/CRegs_extacm.cheby +++ b/testfiles/gena/CRegs_extacm.cheby @@ -3,8 +3,9 @@ memory-map: bus: cern-be-vme-err-32 size: 1024k x-gena: - ident-code: 0xff map-version: 20161031 + x-map-info: + ident: 0xff children: - reg: name: test1 diff --git a/testfiles/gena/CRegs_extcreg.cheby b/testfiles/gena/CRegs_extcreg.cheby index f209130..b38d315 100644 --- a/testfiles/gena/CRegs_extcreg.cheby +++ b/testfiles/gena/CRegs_extcreg.cheby @@ -3,8 +3,9 @@ memory-map: bus: cern-be-vme-err-32 size: 1024k x-gena: - ident-code: 0xff map-version: 20161031 + x-map-info: + ident: 0xff children: - reg: name: test1 diff --git a/testfiles/gena/CRegs_ignore.cheby b/testfiles/gena/CRegs_ignore.cheby index ad7e661..02435d3 100644 --- a/testfiles/gena/CRegs_ignore.cheby +++ b/testfiles/gena/CRegs_ignore.cheby @@ -3,8 +3,9 @@ memory-map: bus: cern-be-vme-err-32 size: 1024k x-gena: - ident-code: 0xff map-version: 20161031 + x-map-info: + ident: 0xff children: - reg: name: test1 diff --git a/testfiles/gena/CRegs_internal.cheby b/testfiles/gena/CRegs_internal.cheby index 493c6b1..24dfb09 100644 --- a/testfiles/gena/CRegs_internal.cheby +++ b/testfiles/gena/CRegs_internal.cheby @@ -3,8 +3,9 @@ memory-map: bus: cern-be-vme-err-32 size: 1024k x-gena: - ident-code: 0xff map-version: 20161031 + x-map-info: + ident: 0xff children: - reg: name: test1 diff --git a/testfiles/gena/CRegs_library.cheby b/testfiles/gena/CRegs_library.cheby index d54b886..ba4ee79 100644 --- a/testfiles/gena/CRegs_library.cheby +++ b/testfiles/gena/CRegs_library.cheby @@ -5,8 +5,9 @@ memory-map: x-gena: gen: vhdl-library: mylib - ident-code: 0xff map-version: 20161031 + x-map-info: + ident: 0xff children: - reg: name: test1 diff --git a/testfiles/gena/CRegs_nodff.cheby b/testfiles/gena/CRegs_nodff.cheby index 0672b96..255e784 100644 --- a/testfiles/gena/CRegs_nodff.cheby +++ b/testfiles/gena/CRegs_nodff.cheby @@ -5,8 +5,9 @@ memory-map: x-gena: gen: no-creg-mux-dff: True - ident-code: 0xff map-version: 20161031 + x-map-info: + ident: 0xff children: - reg: name: test1 diff --git a/testfiles/gena/CRegs_nosplit.cheby b/testfiles/gena/CRegs_nosplit.cheby index 76e58ee..dcd6988 100644 --- a/testfiles/gena/CRegs_nosplit.cheby +++ b/testfiles/gena/CRegs_nosplit.cheby @@ -3,8 +3,9 @@ memory-map: bus: cern-be-vme-err-32 size: 1024k x-gena: - ident-code: 0xff map-version: 20161031 + x-map-info: + ident: 0xff children: - reg: name: test1 diff --git a/testfiles/gena/CRegs_resize.cheby b/testfiles/gena/CRegs_resize.cheby index 7c2853a..fa0d060 100644 --- a/testfiles/gena/CRegs_resize.cheby +++ b/testfiles/gena/CRegs_resize.cheby @@ -3,8 +3,9 @@ memory-map: bus: cern-be-vme-err-32 size: 1024k x-gena: - ident-code: 0xff map-version: 20161031 + x-map-info: + ident: 0xff children: - reg: name: test1 diff --git a/testfiles/gena/CRegs_resize_nosplit.cheby b/testfiles/gena/CRegs_resize_nosplit.cheby index 1848741..2a9617a 100644 --- a/testfiles/gena/CRegs_resize_nosplit.cheby +++ b/testfiles/gena/CRegs_resize_nosplit.cheby @@ -3,8 +3,9 @@ memory-map: bus: cern-be-vme-err-32 size: 1024k x-gena: - ident-code: 0xff map-version: 20161031 + x-map-info: + ident: 0xff children: - reg: name: test1 diff --git a/testfiles/gena/CRegs_resize_signed.cheby b/testfiles/gena/CRegs_resize_signed.cheby index 2dadf19..221fc45 100644 --- a/testfiles/gena/CRegs_resize_signed.cheby +++ b/testfiles/gena/CRegs_resize_signed.cheby @@ -3,8 +3,9 @@ memory-map: bus: cern-be-vme-err-32 size: 1024k x-gena: - ident-code: 0xff map-version: 20161031 + x-map-info: + ident: 0xff children: - reg: name: test1 diff --git a/testfiles/gena/CRegs_splitaddr.cheby b/testfiles/gena/CRegs_splitaddr.cheby index b6ef3cd..29c2b5e 100644 --- a/testfiles/gena/CRegs_splitaddr.cheby +++ b/testfiles/gena/CRegs_splitaddr.cheby @@ -3,8 +3,9 @@ memory-map: bus: cern-be-vme-err-split-32 size: 1024k x-gena: - ident-code: 0xff map-version: 20161031 + x-map-info: + ident: 0xff children: - reg: name: test1 diff --git a/testfiles/gena/CRegs_srff.cheby b/testfiles/gena/CRegs_srff.cheby index 5fc9add..6db1ddd 100644 --- a/testfiles/gena/CRegs_srff.cheby +++ b/testfiles/gena/CRegs_srff.cheby @@ -3,8 +3,9 @@ memory-map: bus: cern-be-vme-err-32 size: 1024k x-gena: - ident-code: 0xff map-version: 20161031 + x-map-info: + ident: 0xff children: - reg: name: test3 diff --git a/testfiles/gena/CRegs_wrstrobe.cheby b/testfiles/gena/CRegs_wrstrobe.cheby index 141eb74..4df3ada 100644 --- a/testfiles/gena/CRegs_wrstrobe.cheby +++ b/testfiles/gena/CRegs_wrstrobe.cheby @@ -3,8 +3,9 @@ memory-map: bus: cern-be-vme-err-32 size: 1024k x-gena: - ident-code: 0xff map-version: 20161031 + x-map-info: + ident: 0xff children: - reg: name: test1 diff --git a/testfiles/gena/Consts.cheby b/testfiles/gena/Consts.cheby index 17ddb82..6fc0113 100644 --- a/testfiles/gena/Consts.cheby +++ b/testfiles/gena/Consts.cheby @@ -8,14 +8,15 @@ memory-map: gen: packages: - package: my_lib.my_pkg - ident-code: 0x00300010 map-version: 20190607 - semantic-mem-map-version: 1.1.0 x-driver-edge: equipment-code: PX-ALGCA module-type: RF_VXS_MAIN name: RFVXSMAIN vme-base-addr: 0xb0000000 + x-map-info: + ident: 0x00300010 + memmap-version: 1.1.0 children: - reg: name: firmwareVersion diff --git a/testfiles/gena/Inc_CRegs.cheby b/testfiles/gena/Inc_CRegs.cheby index 82b605b..ea23c5c 100644 --- a/testfiles/gena/Inc_CRegs.cheby +++ b/testfiles/gena/Inc_CRegs.cheby @@ -2,8 +2,9 @@ memory-map: name: incCRegs bus: cern-be-vme-err-32 size: 1024 - x-cern-info: - ident-code: 0xff + x-map-info: + ident: 0xff + x-gena: map-version: 20161031 children: - reg: diff --git a/testfiles/gena/Mems.cheby b/testfiles/gena/Mems.cheby index 73b149d..88bd520 100644 --- a/testfiles/gena/Mems.cheby +++ b/testfiles/gena/Mems.cheby @@ -3,8 +3,9 @@ memory-map: bus: cern-be-vme-16 size: 1024k x-gena: - ident-code: 0xff map-version: 20161101 + x-map-info: + ident: 0xff children: - memory: name: mem1 diff --git a/testfiles/gena/Mems2.cheby b/testfiles/gena/Mems2.cheby index 6e3110e..ddd8af0 100644 --- a/testfiles/gena/Mems2.cheby +++ b/testfiles/gena/Mems2.cheby @@ -3,8 +3,9 @@ memory-map: bus: cern-be-vme-16 size: 1024k x-gena: - ident-code: 0xff map-version: 20161101 + x-map-info: + ident: 0xff children: - memory: name: mem1 diff --git a/testfiles/gena/Mems_RO.cheby b/testfiles/gena/Mems_RO.cheby index c5d9002..f1b95e3 100644 --- a/testfiles/gena/Mems_RO.cheby +++ b/testfiles/gena/Mems_RO.cheby @@ -3,8 +3,9 @@ memory-map: bus: cern-be-vme-16 size: 1024k x-gena: - ident-code: 0xff map-version: 20161101 + x-map-info: + ident: 0xff children: - memory: name: mem1 diff --git a/testfiles/gena/Mems_WO.cheby b/testfiles/gena/Mems_WO.cheby index 686552d..2956d29 100644 --- a/testfiles/gena/Mems_WO.cheby +++ b/testfiles/gena/Mems_WO.cheby @@ -3,8 +3,9 @@ memory-map: bus: cern-be-vme-16 size: 1024k x-gena: - ident-code: 0xff map-version: 20161101 + x-map-info: + ident: 0xff children: - memory: name: mem1 diff --git a/testfiles/gena/Mems_nodff.cheby b/testfiles/gena/Mems_nodff.cheby index fae1ade..64a0640 100644 --- a/testfiles/gena/Mems_nodff.cheby +++ b/testfiles/gena/Mems_nodff.cheby @@ -5,8 +5,9 @@ memory-map: x-gena: gen: no-mem-mux-dff: True - ident-code: 0xff map-version: 20161101 + x-map-info: + ident: 0xff children: - memory: name: mem1 diff --git a/testfiles/gena/Mems_splitaddr.cheby b/testfiles/gena/Mems_splitaddr.cheby index 63f2096..5f8ff6f 100644 --- a/testfiles/gena/Mems_splitaddr.cheby +++ b/testfiles/gena/Mems_splitaddr.cheby @@ -3,8 +3,9 @@ memory-map: bus: cern-be-vme-split-16 size: 1024k x-gena: - ident-code: 0xff map-version: 20161101 + x-map-info: + ident: 0xff children: - memory: name: mem1 diff --git a/testfiles/gena/Muxed.cheby b/testfiles/gena/Muxed.cheby index 21358c2..219c930 100644 --- a/testfiles/gena/Muxed.cheby +++ b/testfiles/gena/Muxed.cheby @@ -4,8 +4,9 @@ memory-map: bus: cern-be-vme-16 size: 1M x-gena: - ident-code: 0x00 map-version: 20180513 + x-map-info: + ident: 0x00 children: - reg: name: muxedRegRO diff --git a/testfiles/gena/Muxed2.cheby b/testfiles/gena/Muxed2.cheby index 2e8a70a..4f9794c 100644 --- a/testfiles/gena/Muxed2.cheby +++ b/testfiles/gena/Muxed2.cheby @@ -4,8 +4,9 @@ memory-map: bus: cern-be-vme-16 size: 1M x-gena: - ident-code: 0x00 map-version: 20180513 + x-map-info: + ident: 0x00 children: - reg: name: muxedRegRO diff --git a/testfiles/gena/Regs.cheby b/testfiles/gena/Regs.cheby index 4bd7a8e..8e6d200 100644 --- a/testfiles/gena/Regs.cheby +++ b/testfiles/gena/Regs.cheby @@ -3,8 +3,9 @@ memory-map: bus: cern-be-vme-16 size: 1024k x-gena: - ident-code: 0xff map-version: 20161101 + x-map-info: + ident: 0xff children: - reg: name: test1 diff --git a/testfiles/gena/Regs_Mems.cheby b/testfiles/gena/Regs_Mems.cheby index d58e467..61a3ce8 100644 --- a/testfiles/gena/Regs_Mems.cheby +++ b/testfiles/gena/Regs_Mems.cheby @@ -3,8 +3,9 @@ memory-map: bus: cern-be-vme-16 size: 1024k x-gena: - ident-code: 0xff map-version: 20161101 + x-map-info: + ident: 0xff children: - reg: name: test1 diff --git a/testfiles/gena/Regs_cross_words.cheby b/testfiles/gena/Regs_cross_words.cheby index dca6c52..aa8c4ce 100644 --- a/testfiles/gena/Regs_cross_words.cheby +++ b/testfiles/gena/Regs_cross_words.cheby @@ -3,8 +3,9 @@ memory-map: bus: cern-be-vme-16 size: 1024k x-gena: - ident-code: 0xff map-version: 20161101 + x-map-info: + ident: 0xff children: - reg: name: test2 diff --git a/testfiles/gena/Regs_nodff.cheby b/testfiles/gena/Regs_nodff.cheby index 3ad6f5b..a39e98d 100644 --- a/testfiles/gena/Regs_nodff.cheby +++ b/testfiles/gena/Regs_nodff.cheby @@ -5,8 +5,9 @@ memory-map: x-gena: gen: no-reg-mux-dff: True - ident-code: 0xff map-version: 20161101 + x-map-info: + ident: 0xff children: - reg: name: test1 diff --git a/testfiles/gena/Regs_rdstrobe.cheby b/testfiles/gena/Regs_rdstrobe.cheby index af291e7..68c73e6 100644 --- a/testfiles/gena/Regs_rdstrobe.cheby +++ b/testfiles/gena/Regs_rdstrobe.cheby @@ -3,8 +3,9 @@ memory-map: bus: cern-be-vme-16 size: 1024k x-gena: - ident-code: 0xff map-version: 20161101 + x-map-info: + ident: 0xff children: - reg: name: test1 diff --git a/testfiles/gena/Regs_small.cheby b/testfiles/gena/Regs_small.cheby index 5b24105..b6ab95b 100644 --- a/testfiles/gena/Regs_small.cheby +++ b/testfiles/gena/Regs_small.cheby @@ -3,8 +3,9 @@ memory-map: bus: cern-be-vme-16 size: 1024k x-gena: - ident-code: 0xff map-version: 20161101 + x-map-info: + ident: 0xff children: - reg: name: test2 diff --git a/testfiles/gena/Semver.cheby b/testfiles/gena/Semver.cheby index c6b525b..f7147d3 100644 --- a/testfiles/gena/Semver.cheby +++ b/testfiles/gena/Semver.cheby @@ -3,9 +3,10 @@ memory-map: bus: cern-be-vme-err-32 size: 1024k x-gena: - ident-code: 0xff map-version: 20161031 - semantic-mem-map-version: 1.2.3 + x-map-info: + ident: 0xff + memmap-version: 1.2.3 children: - reg: name: test3 diff --git a/testfiles/gena/Submap.cheby b/testfiles/gena/Submap.cheby index ce49d53..0d29b44 100644 --- a/testfiles/gena/Submap.cheby +++ b/testfiles/gena/Submap.cheby @@ -3,8 +3,9 @@ memory-map: bus: cern-be-vme-16 size: 1024k x-gena: - ident-code: 0xff map-version: 20161101 + x-map-info: + ident: 0xff children: - submap: name: submap1 diff --git a/testfiles/gena/Submap_internal.cheby b/testfiles/gena/Submap_internal.cheby index 0d2f3dd..a324c7e 100644 --- a/testfiles/gena/Submap_internal.cheby +++ b/testfiles/gena/Submap_internal.cheby @@ -3,8 +3,9 @@ memory-map: bus: cern-be-vme-err-32 size: 1024k x-gena: - ident-code: 0xff map-version: 20161101 + x-map-info: + ident: 0xff children: - submap: name: submap1 diff --git a/testfiles/gena/sub_reg_one.cheby b/testfiles/gena/sub_reg_one.cheby index 0f95e2c..dd44382 100644 --- a/testfiles/gena/sub_reg_one.cheby +++ b/testfiles/gena/sub_reg_one.cheby @@ -3,8 +3,9 @@ memory-map: bus: cern-be-vme-err-32 size: 1024k x-gena: - ident-code: 0xff map-version: 20161031 + x-map-info: + ident: 0xff children: - reg: name: test1 diff --git a/testfiles/gena/sub_reg_preset.cheby b/testfiles/gena/sub_reg_preset.cheby index c099b4c..fd18afb 100644 --- a/testfiles/gena/sub_reg_preset.cheby +++ b/testfiles/gena/sub_reg_preset.cheby @@ -3,8 +3,9 @@ memory-map: bus: cern-be-vme-err-32 size: 1024k x-gena: - ident-code: 0xff map-version: 20161031 + x-map-info: + ident: 0xff children: - reg: name: test1 diff --git a/testfiles/gena/sub_reg_preset2.cheby b/testfiles/gena/sub_reg_preset2.cheby index b915b91..1ce1789 100644 --- a/testfiles/gena/sub_reg_preset2.cheby +++ b/testfiles/gena/sub_reg_preset2.cheby @@ -3,8 +3,9 @@ memory-map: bus: cern-be-vme-err-32 size: 1024k x-gena: - ident-code: 0xff map-version: 20161031 + x-map-info: + ident: 0xff children: - reg: name: test1 diff --git a/testfiles/gena/sub_reg_swap.cheby b/testfiles/gena/sub_reg_swap.cheby index 584936b..eb0a76d 100644 --- a/testfiles/gena/sub_reg_swap.cheby +++ b/testfiles/gena/sub_reg_swap.cheby @@ -3,8 +3,9 @@ memory-map: bus: cern-be-vme-err-32 size: 1024k x-gena: - ident-code: 0xff map-version: 20161031 + x-map-info: + ident: 0xff children: - reg: name: test1 diff --git a/testfiles/gena2cheby/Inc_CRegs.cheby b/testfiles/gena2cheby/Inc_CRegs.cheby index 82b605b..ea23c5c 100644 --- a/testfiles/gena2cheby/Inc_CRegs.cheby +++ b/testfiles/gena2cheby/Inc_CRegs.cheby @@ -2,8 +2,9 @@ memory-map: name: incCRegs bus: cern-be-vme-err-32 size: 1024 - x-cern-info: - ident-code: 0xff + x-map-info: + ident: 0xff + x-gena: map-version: 20161031 children: - reg: diff --git a/testfiles/gena2cheby/submap_noinc.cheby b/testfiles/gena2cheby/submap_noinc.cheby index 4046918..06f832d 100644 --- a/testfiles/gena2cheby/submap_noinc.cheby +++ b/testfiles/gena2cheby/submap_noinc.cheby @@ -3,8 +3,9 @@ memory-map: bus: cern-be-vme-16 size: 1024k x-gena: - ident-code: 0xff map-version: 20161101 + x-map-info: + ident: 0xff children: - submap: name: submap1 diff --git a/testfiles/issue24/map_arrays.cheby b/testfiles/issue24/map_arrays.cheby index fcda3b5..9499dc3 100644 --- a/testfiles/issue24/map_arrays.cheby +++ b/testfiles/issue24/map_arrays.cheby @@ -1,9 +1,10 @@ memory-map: bus: axi4-lite-32 name: arraysTests - x-cern-info: + x-gena: map-version: 00000000 - ident-code: 0x0 + x-map-info: + ident: 0x0 children: - array: name: repeatBlock diff --git a/testfiles/issue32/memmap.cheby b/testfiles/issue32/memmap.cheby index 59ad2f1..b437c5f 100644 --- a/testfiles/issue32/memmap.cheby +++ b/testfiles/issue32/memmap.cheby @@ -1,9 +1,10 @@ memory-map: bus: cern-be-vme-16 name: memmap - x-cern-info: + x-gena: map-version: 00000000 - ident-code: 0x0 + x-map-info: + ident: 0x0 children: - reg: name: reg1 diff --git a/testfiles/issue33/testmap.cheby b/testfiles/issue33/testmap.cheby index 61180bc..cffd6ea 100644 --- a/testfiles/issue33/testmap.cheby +++ b/testfiles/issue33/testmap.cheby @@ -3,11 +3,12 @@ memory-map: bus: cern-be-vme-16 size: 1k x-gena: - ident-code: 0x1 map-version: 20190923 - semantic-mem-map-version: 0.0.1 x-driver-edge: equipment-code: PX-ALCOB + x-map-info: + ident: 0x1 + memmap-version: 0.0.1 children: - reg: name: reg1 diff --git a/testfiles/issue33b/testmap.cheby b/testfiles/issue33b/testmap.cheby index 881545f..b54f2df 100644 --- a/testfiles/issue33b/testmap.cheby +++ b/testfiles/issue33b/testmap.cheby @@ -3,11 +3,12 @@ memory-map: bus: cern-be-vme-16 size: 1k x-gena: - ident-code: 0x1 map-version: 20190923 - semantic-mem-map-version: 0.0.1 x-driver-edge: equipment-code: PX-ALCOB + x-map-info: + ident: 0x1 + memmap-version: 0.0.1 children: - reg: name: reg1 diff --git a/testfiles/issue33c/adf4002.cheby b/testfiles/issue33c/adf4002.cheby index dd8e22f..3b27b9e 100644 --- a/testfiles/issue33c/adf4002.cheby +++ b/testfiles/issue33c/adf4002.cheby @@ -4,8 +4,9 @@ memory-map: size: 512 x-driver-edge: equipment-code: PX-ALGSA - x-cern-info: - ident-code: 0x01 + x-map-info: + ident: 0x01 + x-gena: map-version: 20191108 semantic-mem-map-version: 1.0.0 children: diff --git a/testfiles/issue33c/fractDivider.cheby b/testfiles/issue33c/fractDivider.cheby index 5c57cc8..8bfa423 100644 --- a/testfiles/issue33c/fractDivider.cheby +++ b/testfiles/issue33c/fractDivider.cheby @@ -7,10 +7,11 @@ memory-map: equipment-code: SP-ALCPF module-type: RF_FRACTDIV name: RFFRACTDIV - x-cern-info: - ident-code: 0x50 + x-map-info: + ident: 0x50 + memmap-version: 1.0.0 + x-gena: map-version: 20191107 - semantic-mem-map-version: 1.0.0 children: - reg: name: status1 diff --git a/testfiles/issue33d/preset1-preset-always.cheby b/testfiles/issue33d/preset1-preset-always.cheby index 0e8972e..6b72121 100644 --- a/testfiles/issue33d/preset1-preset-always.cheby +++ b/testfiles/issue33d/preset1-preset-always.cheby @@ -3,8 +3,9 @@ memory-map: bus: cern-be-vme-err-32 size: 1024k x-gena: - ident-code: 0xff map-version: 20161031 + x-map-info: + ident: 0xff children: - reg: name: test1 diff --git a/testfiles/issue33d/preset1-preset-no.cheby b/testfiles/issue33d/preset1-preset-no.cheby index 4faf347..59c54f3 100644 --- a/testfiles/issue33d/preset1-preset-no.cheby +++ b/testfiles/issue33d/preset1-preset-no.cheby @@ -3,8 +3,9 @@ memory-map: bus: cern-be-vme-err-32 size: 1024k x-gena: - ident-code: 0xff map-version: 20161031 + x-map-info: + ident: 0xff children: - reg: name: test1 diff --git a/testfiles/issue33d/preset1-preset-nosplit.cheby b/testfiles/issue33d/preset1-preset-nosplit.cheby index 4faf347..59c54f3 100644 --- a/testfiles/issue33d/preset1-preset-nosplit.cheby +++ b/testfiles/issue33d/preset1-preset-nosplit.cheby @@ -3,8 +3,9 @@ memory-map: bus: cern-be-vme-err-32 size: 1024k x-gena: - ident-code: 0xff map-version: 20161031 + x-map-info: + ident: 0xff children: - reg: name: test1 diff --git a/testfiles/issue33d/preset2-preset-nosplit.cheby b/testfiles/issue33d/preset2-preset-nosplit.cheby index b7b7bee..ce4baaa 100644 --- a/testfiles/issue33d/preset2-preset-nosplit.cheby +++ b/testfiles/issue33d/preset2-preset-nosplit.cheby @@ -3,8 +3,9 @@ memory-map: bus: cern-be-vme-err-32 size: 1024k x-gena: - ident-code: 0xff map-version: 20161031 + x-map-info: + ident: 0xff children: - reg: name: test1 diff --git a/testfiles/issue39/addressingMemory.cheby b/testfiles/issue39/addressingMemory.cheby index bc65ee5..75d3c09 100644 --- a/testfiles/issue39/addressingMemory.cheby +++ b/testfiles/issue39/addressingMemory.cheby @@ -6,10 +6,11 @@ memory-map: size: 2M x-driver-edge: equipment-code: PX-ALCOB - x-cern-info: - ident-code: 0x1 + x-map-info: + ident: 0x1 + memmap-version: 0.0.1 + x-gena: map-version: 20190917 - semantic-mem-map-version: 0.0.1 children: - memory: name: acqVP diff --git a/testfiles/issue40/bugConstraints.cheby b/testfiles/issue40/bugConstraints.cheby index 2b1bca7..df7e8e5 100644 --- a/testfiles/issue40/bugConstraints.cheby +++ b/testfiles/issue40/bugConstraints.cheby @@ -1,9 +1,10 @@ memory-map: bus: cern-be-vme-32 name: bugConstraintFields - x-cern-info: + x-gena: map-version: 00000000 - ident-code: 0x0 + x-map-info: + ident: 0x0 children: - reg: name: r1 diff --git a/testfiles/issue41/bugBlockFields.cheby b/testfiles/issue41/bugBlockFields.cheby index 3f25169..9433731 100644 --- a/testfiles/issue41/bugBlockFields.cheby +++ b/testfiles/issue41/bugBlockFields.cheby @@ -1,9 +1,10 @@ memory-map: bus: cern-be-vme-32 name: bugBlockRegField - x-cern-info: + x-gena: map-version: 00000000 - ident-code: 0x0 + x-map-info: + ident: 0x0 children: - block: name: b1 diff --git a/testfiles/issue49/mainMap.cheby b/testfiles/issue49/mainMap.cheby index 40923f2..a7130b3 100644 --- a/testfiles/issue49/mainMap.cheby +++ b/testfiles/issue49/mainMap.cheby @@ -2,9 +2,10 @@ memory-map: bus: cern-be-vme-32 name: mainMap size: 1k - x-cern-info: + x-gena: map-version: 00000000 - ident-code: 0x0 + x-map-info: + ident: 0x0 children: - submap: name: ssmap2 diff --git a/testfiles/issue49/ssmap.cheby b/testfiles/issue49/ssmap.cheby index 987c4d5..abad339 100644 --- a/testfiles/issue49/ssmap.cheby +++ b/testfiles/issue49/ssmap.cheby @@ -1,9 +1,10 @@ memory-map: bus: cern-be-vme-32 name: ssmap - x-cern-info: + x-gena: map-version: 00000000 - ident-code: 0x0 + x-map-info: + ident: 0x0 children: - block: name: b1 diff --git a/testfiles/issue51/map.cheby b/testfiles/issue51/map.cheby index 4555282..15751a9 100644 --- a/testfiles/issue51/map.cheby +++ b/testfiles/issue51/map.cheby @@ -3,11 +3,12 @@ memory-map: bus: cern-be-vme-err-32 size: 10k x-gena: - ident-code: 0x1 map-version: 20190607 - semantic-mem-map-version: 0.0.1 x-driver-edge: equipment-code: PX-ALCOB + x-map-info: + ident: 0x1 + memmap-version: 0.0.1 children: - submap: name: submap diff --git a/testfiles/issue7/code_fields.cheby b/testfiles/issue7/code_fields.cheby index 9de505a..83d710a 100644 --- a/testfiles/issue7/code_fields.cheby +++ b/testfiles/issue7/code_fields.cheby @@ -3,11 +3,12 @@ memory-map: bus: cern-be-vme-16 size: 16k x-gena: - ident-code: 0x1 map-version: 20190204 - semantic-mem-map-version: 1.0.0 x-driver-edge: equipment-code: PX-ALCOB + x-map-info: + ident: 0x1 + memmap-version: 1.0.0 children: - block: name: area1 diff --git a/testfiles/issue_gena_rst/CRegs.cheby b/testfiles/issue_gena_rst/CRegs.cheby index 7f38058..dff63a4 100644 --- a/testfiles/issue_gena_rst/CRegs.cheby +++ b/testfiles/issue_gena_rst/CRegs.cheby @@ -3,8 +3,9 @@ memory-map: bus: cern-be-vme-err-32 size: 1024k x-gena: - ident-code: 0xff map-version: 20161031 + x-map-info: + ident: 0xff children: - reg: name: test1 diff --git a/testfiles/issue_gena_rst/CRegs_srff.cheby b/testfiles/issue_gena_rst/CRegs_srff.cheby index 5fc9add..6db1ddd 100644 --- a/testfiles/issue_gena_rst/CRegs_srff.cheby +++ b/testfiles/issue_gena_rst/CRegs_srff.cheby @@ -3,8 +3,9 @@ memory-map: bus: cern-be-vme-err-32 size: 1024k x-gena: - ident-code: 0xff map-version: 20161031 + x-map-info: + ident: 0xff children: - reg: name: test3 -- GitLab