From a525cd1f73760041f2d8c3dcc4f4e09eb024cff7 Mon Sep 17 00:00:00 2001 From: Patrick Lehmann Date: Tue, 27 Dec 2022 22:44:03 +0100 Subject: Fixed context and package names and their references in VHDL example code. --- testsuite/pyunit/dom/examples/StopWatch/Counter.vhdl | 2 +- testsuite/pyunit/dom/examples/StopWatch/Debouncer.vhdl | 2 +- testsuite/pyunit/dom/examples/StopWatch/StopWatch.ctx.vhdl | 2 +- testsuite/pyunit/dom/examples/StopWatch/StopWatch.vhdl | 4 +++- testsuite/pyunit/dom/examples/StopWatch/seg7_Display.vhdl | 4 +++- testsuite/pyunit/dom/examples/StopWatch/toplevel.Display.vhdl | 4 +++- testsuite/pyunit/dom/examples/StopWatch/toplevel.Encoder.vhdl | 2 +- testsuite/pyunit/dom/examples/StopWatch/toplevel.StopWatch.tb.vhdl | 7 ++++--- testsuite/pyunit/dom/examples/StopWatch/toplevel.StopWatch.vhdl | 4 +++- 9 files changed, 20 insertions(+), 11 deletions(-) diff --git a/testsuite/pyunit/dom/examples/StopWatch/Counter.vhdl b/testsuite/pyunit/dom/examples/StopWatch/Counter.vhdl index 3ef284b98..b26a0fa09 100644 --- a/testsuite/pyunit/dom/examples/StopWatch/Counter.vhdl +++ b/testsuite/pyunit/dom/examples/StopWatch/Counter.vhdl @@ -7,7 +7,7 @@ library IEEE; use IEEE.std_logic_1164.all; use IEEE.numeric_std.all; -use work.Utilities.all; +use work.Utilities_pkg.all; entity Counter is diff --git a/testsuite/pyunit/dom/examples/StopWatch/Debouncer.vhdl b/testsuite/pyunit/dom/examples/StopWatch/Debouncer.vhdl index 18207c7f1..4e687da0b 100644 --- a/testsuite/pyunit/dom/examples/StopWatch/Debouncer.vhdl +++ b/testsuite/pyunit/dom/examples/StopWatch/Debouncer.vhdl @@ -7,7 +7,7 @@ library IEEE; use IEEE.std_logic_1164.all; use IEEE.numeric_std.all; -use work.Utilities.all; +use work.Utilities_pkg.all; entity Debouncer is diff --git a/testsuite/pyunit/dom/examples/StopWatch/StopWatch.ctx.vhdl b/testsuite/pyunit/dom/examples/StopWatch/StopWatch.ctx.vhdl index ea66f7597..dc89d5b3b 100644 --- a/testsuite/pyunit/dom/examples/StopWatch/StopWatch.ctx.vhdl +++ b/testsuite/pyunit/dom/examples/StopWatch/StopWatch.ctx.vhdl @@ -5,7 +5,7 @@ -- context StopWatch_ctx is library lib_Utilities; - context lib_Utilities.Utilities_pkg; + context lib_Utilities.Utilities_ctx; use work.StopWatch_pkg.all; end context; diff --git a/testsuite/pyunit/dom/examples/StopWatch/StopWatch.vhdl b/testsuite/pyunit/dom/examples/StopWatch/StopWatch.vhdl index c7c9068ab..3d73fa0fa 100644 --- a/testsuite/pyunit/dom/examples/StopWatch/StopWatch.vhdl +++ b/testsuite/pyunit/dom/examples/StopWatch/StopWatch.vhdl @@ -7,7 +7,9 @@ library IEEE; use IEEE.std_logic_1164.all; use IEEE.numeric_std.all; -use work.Utilities.all; +library lib_Utilities; +use lib_Utilities.Utilities_pkg.all; + use work.StopWatch_pkg.all; diff --git a/testsuite/pyunit/dom/examples/StopWatch/seg7_Display.vhdl b/testsuite/pyunit/dom/examples/StopWatch/seg7_Display.vhdl index c3771ba68..12e8e55aa 100644 --- a/testsuite/pyunit/dom/examples/StopWatch/seg7_Display.vhdl +++ b/testsuite/pyunit/dom/examples/StopWatch/seg7_Display.vhdl @@ -7,7 +7,9 @@ library IEEE; use IEEE.std_logic_1164.all; use IEEE.numeric_std.all; -use work.Utilities.all; +library lib_Utilities; +use lib_Utilities.Utilities_pkg.all; + use work.StopWatch_pkg.all; diff --git a/testsuite/pyunit/dom/examples/StopWatch/toplevel.Display.vhdl b/testsuite/pyunit/dom/examples/StopWatch/toplevel.Display.vhdl index 67228a5ac..648ab81e4 100644 --- a/testsuite/pyunit/dom/examples/StopWatch/toplevel.Display.vhdl +++ b/testsuite/pyunit/dom/examples/StopWatch/toplevel.Display.vhdl @@ -7,7 +7,9 @@ library IEEE; use IEEE.std_logic_1164.all; use IEEE.numeric_std.all; -use work.Utilities.all; +library lib_Utilities; +use lib_Utilities.Utilities_pkg.all; + use work.StopWatch_pkg.all; diff --git a/testsuite/pyunit/dom/examples/StopWatch/toplevel.Encoder.vhdl b/testsuite/pyunit/dom/examples/StopWatch/toplevel.Encoder.vhdl index de18778a0..17f7c6b19 100644 --- a/testsuite/pyunit/dom/examples/StopWatch/toplevel.Encoder.vhdl +++ b/testsuite/pyunit/dom/examples/StopWatch/toplevel.Encoder.vhdl @@ -10,7 +10,7 @@ use IEEE.numeric_std.all; library lib_Utilities; use lib_Utilities.Utilities_pkg.all; -use lib_StopWatch.StopWatch_pkg.all; +use work.StopWatch_pkg.all; -- Toplevel module to demonstrate the translation of 4 slide-switches to 1 digit 7-segment display. diff --git a/testsuite/pyunit/dom/examples/StopWatch/toplevel.StopWatch.tb.vhdl b/testsuite/pyunit/dom/examples/StopWatch/toplevel.StopWatch.tb.vhdl index a334475c4..87cd75829 100644 --- a/testsuite/pyunit/dom/examples/StopWatch/toplevel.StopWatch.tb.vhdl +++ b/testsuite/pyunit/dom/examples/StopWatch/toplevel.StopWatch.tb.vhdl @@ -7,9 +7,10 @@ library IEEE; use IEEE.std_logic_1164.all; use IEEE.numeric_std.all; -library lib_StopWatch; -use lib_StopWatch.Utilities.all; -use lib_StopWatch.StopWatch_pkg.all; +library lib_Utilities; +use lib_Utilities.Utilities_pkg.all; + +use work.StopWatch_pkg.all; entity toplevel_tb is diff --git a/testsuite/pyunit/dom/examples/StopWatch/toplevel.StopWatch.vhdl b/testsuite/pyunit/dom/examples/StopWatch/toplevel.StopWatch.vhdl index 1c8547446..7bb6e9cd9 100644 --- a/testsuite/pyunit/dom/examples/StopWatch/toplevel.StopWatch.vhdl +++ b/testsuite/pyunit/dom/examples/StopWatch/toplevel.StopWatch.vhdl @@ -7,7 +7,9 @@ library IEEE; use IEEE.std_logic_1164.all; use IEEE.numeric_std.all; -use work.Utilities.all; +library lib_Utilities; +use lib_Utilities.Utilities_pkg.all; + use work.StopWatch_pkg.all; -- cgit v1.2.3