From 5bcd3a152f2591ec692fcc101aadb1cdfc7596de Mon Sep 17 00:00:00 2001 From: Henrik Wahlqvist Date: Mon, 9 Dec 2024 10:21:52 +0100 Subject: [PATCH] Add scheduler prefix to NVM functions Change-Id: I5a378b7bbff744b8c47e4c19452305e7cdff9cb2 --- NOTICE | 53 ++++++++----------------------------- powertrain_build/nvm_def.py | 4 +-- 2 files changed, 13 insertions(+), 44 deletions(-) diff --git a/NOTICE b/NOTICE index 054d0ff..d546003 100644 --- a/NOTICE +++ b/NOTICE @@ -12,7 +12,7 @@ Notices Report Content Components: -Coverage 7.6.8: http://nedbatchelder.com/code/modules/coverage.html : Apache License 2.0 +Coverage 7.6.9: http://nedbatchelder.com/code/modules/coverage.html : Apache License 2.0 exceptiongroup 1.2.2: https://github.com/python-trio/exceptiongroup : MIT License flake8 7.1.1: https://gitlab.com/pycqa/flake8 : MIT License gitdb 4.0.11: http://github.com/gitpython-developers/gitdb : BSD 3-clause "New" or "Revised" License @@ -22,11 +22,10 @@ mccabe 0.7.0: http://pypi.python.org/pypi/mccabe : Expat License NumPy 1.24.4: https://numpy.org/ : BSD 3-clause "New" or "Revised" License Packaging 24.2: https://github.com/pypa/packaging : (BSD 2-clause "Simplified" License OR Apache License 2.0) pbr 6.1.0: http://openstack.org : Apache License 2.0 -powertrain-build 1.0.5.dev3: https://opendev.org/volvocars/powertrain-build : Apache License 2.0 psf-requests 2.32.3: http://docs.python-requests.org : Apache License 2.0 pycodestyle 2.12.1: https://pypi.python.org/pypi/pycodestyle : MIT License Pyflakes 3.2.0: https://github.com/pyflakes/pyflakes : MIT License -pytest 8.3.3: http://pytest.org : MIT License +pytest 8.3.4: http://pytest.org : MIT License python3-charset-normalizer 3.4.0: https://github.com/ousret/charset_normalizer : MIT License python-certifi 2024.7.4: https://certifiio.readthedocs.io/en/latest/ : Mozilla Public License 2.0 python-pluggy 1.5.0: https://pypi.python.org/pypi/pluggy : MIT License @@ -41,7 +40,7 @@ voluptuous 0.15.2: http://pypi.python.org/pypi/voluptuous : BSD 3-clause "New" o Copyright Text: -Coverage 7.6.8 pypi:coverage/7.6.8: http://nedbatchelder.com/code/modules/coverage.html +Coverage 7.6.9 pypi:coverage/7.6.9: http://nedbatchelder.com/code/modules/coverage.html No Copyrights found exceptiongroup 1.2.2 pypi:exceptiongroup/1.2.2: https://github.com/python-trio/exceptiongroup Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, @@ -2656,8 +2655,6 @@ add_function_parentheses = True # If true, '()' will be appended to :func: etc. cross-reference text. add_function_parentheses = True -powertrain-build 1.0.5.dev3 pypi:powertrain-build/1.0.5.dev3: https://opendev.org/volvocars/powertrain-build - No Copyrights found psf-requests 2.32.3 pypi:requests/2.32.3: http://docs.python-requests.org (c) return c @@ -2695,39 +2692,8 @@ try: Copyright 2013-2014 Florent Xicluna -pytest 8.3.3 pypi:pytest/8.3.3: http://pytest.org - (c) - - # ASCII fast path. - if 0x20 <= o < 0x07F: - - (c) - - # Control characters. - if category == "Cc": - - (C) - - assert all_marks == - - assert get_unpacked_marks(C, consider_mro=False) == [xfail("c").mark] - - (c) - if wc < 0: - return -1 - width += wc - - (c) in ("F", "W"): - return 2 - - return 1 - - Copyright (c) 2004 Holger Krekel and others - - Copyright (c) 2014, Gregory Boissinot - - Copyright Holger Krekel and others, 2004. - +pytest 8.3.4 pypi:pytest/8.3.4: http://pytest.org + No Copyrights found python-certifi 2024.7.4 pypi:certifi/2024.7.4: https://certifiio.readthedocs.io/en/latest/ No Copyrights found python-pluggy 1.5.0 pypi:pluggy/1.5.0: https://pypi.python.org/pypi/pluggy @@ -13593,7 +13559,10 @@ from this software without specific prior written permission. tomli 2.2.1 pypi:tomli/2.2.1: https://github.com/hukkin/tomli - No Copyrights found + Copyright (c) 2021 Taneli Hukkinen + + Copyright (c) 2021 Taneli Hukkinen + urllib3 2.2.3 pypi:urllib3/2.2.3 Copyright (c) 2008-2020 Andrey Petrov and contributors. @@ -13625,7 +13594,7 @@ modification, are permitted provided that the following conditions are met: Licenses: Apache License 2.0 -(Coverage 7.6.8, Packaging 24.2, pbr 6.1.0, powertrain-build 1.0.5.dev3, psf-requests 2.32.3) +(Coverage 7.6.9, Packaging 24.2, pbr 6.1.0, psf-requests 2.32.3) Apache License Version 2.0, January 2004 @@ -13904,7 +13873,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. --- MIT License -(exceptiongroup 1.2.2, flake8 7.1.1, pycodestyle 2.12.1, Pyflakes 3.2.0, pytest 8.3.3, python-pluggy 1.5.0, python3-charset-normalizer 3.4.0, RonnyPfannschmidt/iniconfig 2.0.0, ruamel-yaml 0.18.6, ruamel.yaml.clib 0.2.12, tomli 2.2.1, urllib3 2.2.3) +(exceptiongroup 1.2.2, flake8 7.1.1, pycodestyle 2.12.1, Pyflakes 3.2.0, pytest 8.3.4, python-pluggy 1.5.0, python3-charset-normalizer 3.4.0, RonnyPfannschmidt/iniconfig 2.0.0, ruamel-yaml 0.18.6, ruamel.yaml.clib 0.2.12, tomli 2.2.1, urllib3 2.2.3) The MIT License =============== diff --git a/powertrain_build/nvm_def.py b/powertrain_build/nvm_def.py index 103bc65..7d90c98 100644 --- a/powertrain_build/nvm_def.py +++ b/powertrain_build/nvm_def.py @@ -577,8 +577,8 @@ class ZCNVMDef(NVMDef): } self._predecl_start = bd.PREDECL_NVM_START self._predecl_end = bd.PREDECL_NVM_END - self.init_function = "void VcNvmInit(void)" - self.main_function = "void VcNvm(void)" + self.init_function = f"void {prefix}VcNvmInit(void)" + self.main_function = f"void {prefix}VcNvm(void)" @property def valid_nvm_definitions(self):