diff options
-rw-r--r-- | src/systemc/ext/tlm | 14 | ||||
-rw-r--r-- | src/systemc/ext/tlm_core/1/README.txt (renamed from src/systemc/ext/tlm_core/tlm_1/README.txt) | 62 | ||||
-rw-r--r-- | src/systemc/ext/tlm_core/1/analysis/analysis.h | 29 | ||||
-rw-r--r-- | src/systemc/ext/tlm_core/1/analysis/analysis_fifo.h (renamed from src/systemc/ext/tlm_core/tlm_1/tlm_analysis/tlm_analysis_fifo.h) | 12 | ||||
-rw-r--r-- | src/systemc/ext/tlm_core/1/analysis/analysis_if.h (renamed from src/systemc/ext/tlm_core/tlm_1/tlm_analysis/tlm_analysis_if.h) | 8 | ||||
-rw-r--r-- | src/systemc/ext/tlm_core/1/analysis/analysis_port.h (renamed from src/systemc/ext/tlm_core/tlm_1/tlm_analysis/tlm_analysis_port.h) | 8 | ||||
-rw-r--r-- | src/systemc/ext/tlm_core/1/analysis/analysis_triple.h (renamed from src/systemc/ext/tlm_core/tlm_1/tlm_analysis/tlm_analysis_triple.h) | 6 | ||||
-rw-r--r-- | src/systemc/ext/tlm_core/1/analysis/write_if.h (renamed from src/systemc/ext/tlm_core/tlm_1/tlm_analysis/tlm_write_if.h) | 6 | ||||
-rw-r--r-- | src/systemc/ext/tlm_core/1/req_rsp/adapters/adapters.h (renamed from src/systemc/ext/tlm_core/tlm_1/tlm_req_rsp/tlm_adapters/tlm_adapters.h) | 8 | ||||
-rw-r--r-- | src/systemc/ext/tlm_core/1/req_rsp/channels/fifo/circular_buffer.h (renamed from src/systemc/ext/tlm_core/tlm_1/tlm_req_rsp/tlm_channels/tlm_fifo/circular_buffer.h) | 9 | ||||
-rw-r--r-- | src/systemc/ext/tlm_core/1/req_rsp/channels/fifo/fifo.h (renamed from src/systemc/ext/tlm_core/tlm_1/tlm_req_rsp/tlm_channels/tlm_fifo/tlm_fifo.h) | 19 | ||||
-rw-r--r-- | src/systemc/ext/tlm_core/1/req_rsp/channels/fifo/fifo_peek.h (renamed from src/systemc/ext/tlm_core/tlm_1/tlm_req_rsp/tlm_channels/tlm_fifo/tlm_fifo_peek.h) | 9 | ||||
-rw-r--r-- | src/systemc/ext/tlm_core/1/req_rsp/channels/fifo/fifo_put_get.h (renamed from src/systemc/ext/tlm_core/tlm_1/tlm_req_rsp/tlm_channels/tlm_fifo/tlm_fifo_put_get.h) | 9 | ||||
-rw-r--r-- | src/systemc/ext/tlm_core/1/req_rsp/channels/fifo/fifo_resize.h (renamed from src/systemc/ext/tlm_core/tlm_1/tlm_req_rsp/tlm_channels/tlm_fifo/tlm_fifo_resize.h) | 9 | ||||
-rw-r--r-- | src/systemc/ext/tlm_core/1/req_rsp/channels/req_rsp_channels/put_get_imp.h (renamed from src/systemc/ext/tlm_core/tlm_1/tlm_req_rsp/tlm_channels/tlm_req_rsp_channels/tlm_put_get_imp.h) | 8 | ||||
-rw-r--r-- | src/systemc/ext/tlm_core/1/req_rsp/channels/req_rsp_channels/req_rsp_channels.h (renamed from src/systemc/ext/tlm_core/tlm_1/tlm_req_rsp/tlm_channels/tlm_req_rsp_channels/tlm_req_rsp_channels.h) | 14 | ||||
-rw-r--r-- | src/systemc/ext/tlm_core/1/req_rsp/interfaces/core_ifs.h (renamed from src/systemc/ext/tlm_core/tlm_1/tlm_req_rsp/tlm_1_interfaces/tlm_core_ifs.h) | 11 | ||||
-rw-r--r-- | src/systemc/ext/tlm_core/1/req_rsp/interfaces/fifo_ifs.h (renamed from src/systemc/ext/tlm_core/tlm_1/tlm_req_rsp/tlm_1_interfaces/tlm_fifo_ifs.h) | 11 | ||||
-rw-r--r-- | src/systemc/ext/tlm_core/1/req_rsp/interfaces/master_slave_ifs.h (renamed from src/systemc/ext/tlm_core/tlm_1/tlm_req_rsp/tlm_1_interfaces/tlm_master_slave_ifs.h) | 11 | ||||
-rw-r--r-- | src/systemc/ext/tlm_core/1/req_rsp/interfaces/tag.h (renamed from src/systemc/ext/tlm_core/tlm_1/tlm_req_rsp/tlm_1_interfaces/tlm_tag.h) | 7 | ||||
-rw-r--r-- | src/systemc/ext/tlm_core/1/req_rsp/ports/event_finder.h (renamed from src/systemc/ext/tlm_core/tlm_1/tlm_req_rsp/tlm_ports/tlm_event_finder.h) | 9 | ||||
-rw-r--r-- | src/systemc/ext/tlm_core/1/req_rsp/ports/nonblocking_port.h (renamed from src/systemc/ext/tlm_core/tlm_1/tlm_req_rsp/tlm_ports/tlm_nonblocking_port.h) | 13 | ||||
-rw-r--r-- | src/systemc/ext/tlm_core/1/req_rsp/req_rsp.h (renamed from src/systemc/ext/tlm_core/tlm_1/tlm_req_rsp/tlm_req_rsp.h) | 15 | ||||
-rw-r--r-- | src/systemc/ext/tlm_core/2/README.txt (renamed from src/systemc/ext/tlm_core/tlm_2/README.txt) | 48 | ||||
-rw-r--r-- | src/systemc/ext/tlm_core/2/generic_payload/array.h (renamed from src/systemc/ext/tlm_core/tlm_2/tlm_generic_payload/tlm_array.h) | 6 | ||||
-rw-r--r-- | src/systemc/ext/tlm_core/2/generic_payload/endian_conv.h (renamed from src/systemc/ext/tlm_core/tlm_2/tlm_generic_payload/tlm_endian_conv.h) | 11 | ||||
-rw-r--r-- | src/systemc/ext/tlm_core/2/generic_payload/generic_payload.h | 28 | ||||
-rw-r--r-- | src/systemc/ext/tlm_core/2/generic_payload/gp.h (renamed from src/systemc/ext/tlm_core/tlm_2/tlm_generic_payload/tlm_gp.h) | 8 | ||||
-rw-r--r-- | src/systemc/ext/tlm_core/2/generic_payload/helpers.h (renamed from src/systemc/ext/tlm_core/tlm_2/tlm_generic_payload/tlm_helpers.h) | 6 | ||||
-rw-r--r-- | src/systemc/ext/tlm_core/2/generic_payload/phase.h (renamed from src/systemc/ext/tlm_core/tlm_2/tlm_generic_payload/tlm_phase.h) | 6 | ||||
-rw-r--r-- | src/systemc/ext/tlm_core/2/interfaces/dmi.h (renamed from src/systemc/ext/tlm_core/tlm_2/tlm_2_interfaces/tlm_dmi.h) | 6 | ||||
-rw-r--r-- | src/systemc/ext/tlm_core/2/interfaces/fw_bw_ifs.h (renamed from src/systemc/ext/tlm_core/tlm_2/tlm_2_interfaces/tlm_fw_bw_ifs.h) | 10 | ||||
-rw-r--r-- | src/systemc/ext/tlm_core/2/interfaces/interfaces.h (renamed from src/systemc/ext/tlm_core/tlm_2/tlm_sockets/tlm_sockets.h) | 10 | ||||
-rw-r--r-- | src/systemc/ext/tlm_core/2/quantum/global_quantum.h (renamed from src/systemc/ext/tlm_core/tlm_2/tlm_quantum/tlm_global_quantum.h) | 6 | ||||
-rw-r--r-- | src/systemc/ext/tlm_core/2/quantum/quantum.h (renamed from src/systemc/ext/tlm_core/tlm_2/tlm_quantum/tlm_quantum.h) | 8 | ||||
-rw-r--r-- | src/systemc/ext/tlm_core/2/sockets/base_socket_if.h (renamed from src/systemc/ext/tlm_core/tlm_2/tlm_sockets/tlm_base_socket_if.h) | 6 | ||||
-rw-r--r-- | src/systemc/ext/tlm_core/2/sockets/initiator_socket.h (renamed from src/systemc/ext/tlm_core/tlm_2/tlm_sockets/tlm_initiator_socket.h) | 10 | ||||
-rw-r--r-- | src/systemc/ext/tlm_core/2/sockets/sockets.h (renamed from src/systemc/ext/tlm_core/tlm_2/tlm_2_interfaces/tlm_2_interfaces.h) | 10 | ||||
-rw-r--r-- | src/systemc/ext/tlm_core/2/sockets/target_socket.h (renamed from src/systemc/ext/tlm_core/tlm_2/tlm_sockets/tlm_target_socket.h) | 10 | ||||
-rw-r--r-- | src/systemc/ext/tlm_core/2/version.h (renamed from src/systemc/ext/tlm_core/tlm_2/tlm_version.h) | 6 | ||||
-rw-r--r-- | src/systemc/ext/tlm_core/tlm_1/tlm_analysis/tlm_analysis.h | 29 | ||||
-rw-r--r-- | src/systemc/ext/tlm_core/tlm_2/tlm_generic_payload/tlm_generic_payload.h | 28 | ||||
-rw-r--r-- | src/systemc/ext/tlm_utils/tlm_quantumkeeper.h | 2 | ||||
-rw-r--r-- | src/systemc/tlm_core/2/generic_payload/SConscript (renamed from src/systemc/tlm_core/tlm_2/tlm_generic_payload/SConscript) | 4 | ||||
-rw-r--r-- | src/systemc/tlm_core/2/generic_payload/gp.cc (renamed from src/systemc/tlm_core/tlm_2/tlm_generic_payload/tlm_gp.cc) | 0 | ||||
-rw-r--r-- | src/systemc/tlm_core/2/generic_payload/phase.cc (renamed from src/systemc/tlm_core/tlm_2/tlm_generic_payload/tlm_phase.cc) | 0 | ||||
-rw-r--r-- | src/systemc/tlm_core/2/quantum/SConscript (renamed from src/systemc/tlm_core/tlm_2/tlm_quantum/SConscript) | 2 | ||||
-rw-r--r-- | src/systemc/tlm_core/2/quantum/global_quantum.cc (renamed from src/systemc/tlm_core/tlm_2/tlm_quantum/tlm_global_quantum.cc) | 0 |
48 files changed, 267 insertions, 300 deletions
diff --git a/src/systemc/ext/tlm b/src/systemc/ext/tlm index 5ba3e4fc3..3e671f737 100644 --- a/src/systemc/ext/tlm +++ b/src/systemc/ext/tlm @@ -22,12 +22,12 @@ #include <systemc> // main SystemC header -#include "tlm_core/tlm_2/tlm_version.h" -#include "tlm_core/tlm_1/tlm_analysis/tlm_analysis.h" -#include "tlm_core/tlm_1/tlm_req_rsp/tlm_req_rsp.h" -#include "tlm_core/tlm_2/tlm_2_interfaces/tlm_2_interfaces.h" -#include "tlm_core/tlm_2/tlm_generic_payload/tlm_generic_payload.h" -#include "tlm_core/tlm_2/tlm_sockets/tlm_sockets.h" -#include "tlm_core/tlm_2/tlm_quantum/tlm_quantum.h" +#include "tlm_core/2/version.h" +#include "tlm_core/1/analysis/analysis.h" +#include "tlm_core/1/req_rsp/req_rsp.h" +#include "tlm_core/2/interfaces/interfaces.h" +#include "tlm_core/2/generic_payload/generic_payload.h" +#include "tlm_core/2/sockets/sockets.h" +#include "tlm_core/2/quantum/quantum.h" #endif /* __SYSTEMC_EXT_TLM__ */ diff --git a/src/systemc/ext/tlm_core/tlm_1/README.txt b/src/systemc/ext/tlm_core/1/README.txt index c7e1c5e1f..7963e4544 100644 --- a/src/systemc/ext/tlm_core/tlm_1/README.txt +++ b/src/systemc/ext/tlm_core/1/README.txt @@ -1,10 +1,10 @@ TLM-1.0 header files ==================== -Dir: include/tlm_core/tlm_1/ +Dir: include/tlm_core/1/ -SubDirs: tlm_analysis/ - tlm_req_rsp/ +SubDirs: analysis/ + req_rsp/ Files: README.txt @@ -27,15 +27,15 @@ part of the original TLM-1.0 release, but have been grouped with TLM-1.0 in this release of TLM-2.0 Files: - tlm_analysis.h (includes the other header files in this directory ) - tlm_analysis_fifo.h (defines tlm_analysis_fifo ) - tlm_analysis_if.h (defines tlm_analysis_if and tlm_delayed_analysis_if ) - tlm_analysis_port.h (defines tlm_analysis_port ) - tlm_analysis_triple.h (defines tlm_analysis_triple ) - tlm_write_if.h (defines tlm_write_if and tlm_delayed_write_if ) + analysis.h (includes the other header files in this directory ) + analysis_fifo.h (defines tlm_analysis_fifo ) + analysis_if.h (defines tlm_analysis_if and tlm_delayed_analysis_if ) + analysis_port.h (defines tlm_analysis_port ) + analysis_triple.h (defines tlm_analysis_triple ) + write_if.h (defines tlm_write_if and tlm_delayed_write_if ) -tlm_req_rsp/ +req_rsp/ ------------ This provides support for TLM modeling based on a request/response pair that @@ -43,10 +43,10 @@ are passed by value. This is the original TLM 1.0 standard, with the addition of an overloading of the blocking transport method with pass-by-reference arguments. Files: - tlm_req_rsp.h (includes the key header files from the other directories) + req_rsp.h (includes the key header files from the other directories) - tlm_1_interfaces/ - tlm_core_ifs.h (defines the TLM 1.0 core interfaces: + interfaces/ + core_ifs.h (defines the TLM 1.0 core interfaces: tlm_transport_if tlm_blocking_get_if tlm_blocking_put_if @@ -60,38 +60,38 @@ Files: tlm_blocking_get_peek_if tlm_nonblocking_get_peek_if tlm_get_peek_if ) - tlm_fifo_ifs.h ( defines the TLM1.0 fifo interfaces: + fifo_ifs.h ( defines the TLM1.0 fifo interfaces: tlm_fifo_debug_if tlm_fifo_put_if tlm_fifo_get_if tlm_fifo_config_size_if ) - tlm_master_slave_ifs.h ( defines the TLM1.0 master slave interfaces: + master_slave_ifs.h ( defines the TLM1.0 master slave interfaces: tlm_blocking_master_if tlm_blocking_slave_if tlm_nonblocking_master_if tlm_nonblocking_slave_if tlm_master_if tlm_slave_if ) - tlm_tag.h ( defines tlm_tag ) + tag.h ( defines tlm_tag ) - tlm_ports/ - tlm_nonblocking_port.h (defines tlm_nonblocking_put_port, + ports/ + nonblocking_port.h (defines tlm_nonblocking_put_port, tlm_nonblocking_get_port and tlm_nonblocking_peek_port ) - tlm_event_finder.h (defines tlm_event_finder_t ) - - tlm_channels/ - tlm_fifo/ - tlm_fifo.h (defines tlm_fifo, includes the other files ) - tlm_fifo_peek.h (defines peek and poke interfaces for tlm_fifo ) - tlm_fifo_put_get.h (defines put and get interfaces for tlm_fifo ) - tlm_fifo_resize.h (defines expand, reduce, bound and unbound + event_finder.h (defines tlm_event_finder_t ) + + channels/ + fifo/ + fifo.h (defines tlm_fifo, includes the other files ) + fifo_peek.h (defines peek and poke interfaces for tlm_fifo ) + fifo_put_get.h (defines put and get interfaces for tlm_fifo ) + fifo_resize.h (defines expand, reduce, bound and unbound interfaces for tlm_fifo ) circular_buffer.h (defines circular buffer used by tlm_fifo ) - tlm_req_rsp_channels/ - tlm_req_rsp_channels.h (defines tlm_req_rsp_channel and + req_rsp_channels/ + req_rsp_channels.h (defines tlm_req_rsp_channel and tlm_transport_channel ) - tlm_put_get_imp.h (contains implementatins used by the channels) + put_get_imp.h (contains implementatins used by the channels) - tlm_adapters/ - tlm_adapters.h (defines transport_to_master and tlm_slave_to_transport) + adapters/ + adapters.h (defines transport_to_master and tlm_slave_to_transport) diff --git a/src/systemc/ext/tlm_core/1/analysis/analysis.h b/src/systemc/ext/tlm_core/1/analysis/analysis.h new file mode 100644 index 000000000..7e8b7e4b4 --- /dev/null +++ b/src/systemc/ext/tlm_core/1/analysis/analysis.h @@ -0,0 +1,29 @@ +/***************************************************************************** + + Licensed to Accellera Systems Initiative Inc. (Accellera) under one or + more contributor license agreements. See the NOTICE file distributed + with this work for additional information regarding copyright ownership. + Accellera licenses this file to you under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with the + License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied. See the License for the specific language governing + permissions and limitations under the License. + + *****************************************************************************/ + +#ifndef __SYSTEMC_EXT_TLM_CORE_1_ANALYSIS_ANALYSIS_H__ +#define __SYSTEMC_EXT_TLM_CORE_1_ANALYSIS_ANALYSIS_H__ + +#include "tlm_core/1/analysis/analysis_fifo.h" +#include "tlm_core/1/analysis/analysis_if.h" +#include "tlm_core/1/analysis/analysis_port.h" +#include "tlm_core/1/analysis/analysis_triple.h" +#include "tlm_core/1/analysis/write_if.h" + +#endif /* __SYSTEMC_EXT_TLM_CORE_1_ANALYSIS_ANALYSIS_H__ */ diff --git a/src/systemc/ext/tlm_core/tlm_1/tlm_analysis/tlm_analysis_fifo.h b/src/systemc/ext/tlm_core/1/analysis/analysis_fifo.h index 84807031f..ce3a27f84 100644 --- a/src/systemc/ext/tlm_core/tlm_1/tlm_analysis/tlm_analysis_fifo.h +++ b/src/systemc/ext/tlm_core/1/analysis/analysis_fifo.h @@ -17,12 +17,12 @@ *****************************************************************************/ -#ifndef __SYSTEMC_EXT_TLM_CORE_TLM_1_TLM_ANALYSIS_TLM_ANALYSIS_FIFO_H__ -#define __SYSTEMC_EXT_TLM_CORE_TLM_1_TLM_ANALYSIS_TLM_ANALYSIS_FIFO_H__ +#ifndef __SYSTEMC_EXT_TLM_CORE_1_ANALYSIS_ANALYSIS_FIFO_H__ +#define __SYSTEMC_EXT_TLM_CORE_1_ANALYSIS_ANALYSIS_FIFO_H__ -#include "tlm_core/tlm_1/tlm_analysis/tlm_analysis_if.h" -#include "tlm_core/tlm_1/tlm_analysis/tlm_analysis_triple.h" -#include "tlm_core/tlm_1/tlm_req_rsp/tlm_channels/tlm_fifo/tlm_fifo.h" +#include "tlm_core/1/analysis/analysis_if.h" +#include "tlm_core/1/analysis/analysis_triple.h" +#include "tlm_core/1/req_rsp/channels/fifo/fifo.h" namespace tlm { @@ -43,4 +43,4 @@ class tlm_analysis_fifo : public tlm_fifo<T>, } // namespace tlm -#endif /* __SYSTEMC_EXT_TLM_CORE_TLM_1_TLM_ANALYSIS_TLM_ANALYSIS_FIFO_H__ */ +#endif /* __SYSTEMC_EXT_TLM_CORE_1_ANALYSIS_ANALYSIS_FIFO_H__ */ diff --git a/src/systemc/ext/tlm_core/tlm_1/tlm_analysis/tlm_analysis_if.h b/src/systemc/ext/tlm_core/1/analysis/analysis_if.h index d1b91effc..7602c6350 100644 --- a/src/systemc/ext/tlm_core/tlm_1/tlm_analysis/tlm_analysis_if.h +++ b/src/systemc/ext/tlm_core/1/analysis/analysis_if.h @@ -17,10 +17,10 @@ *****************************************************************************/ -#ifndef __SYSTEMC_EXT_TLM_CORE_TLM_1_TLM_ANALYSIS_TLM_ANALYSIS_IF_H__ -#define __SYSTEMC_EXT_TLM_CORE_TLM_1_TLM_ANALYSIS_TLM_ANALYSIS_IF_H__ +#ifndef __SYSTEMC_EXT_TLM_CORE_1_ANALYSIS_ANALYSIS_IF_H__ +#define __SYSTEMC_EXT_TLM_CORE_1_ANALYSIS_ANALYSIS_IF_H__ -#include "tlm_core/tlm_1/tlm_analysis/tlm_write_if.h" +#include "tlm_core/1/analysis/write_if.h" namespace tlm { @@ -35,4 +35,4 @@ class tlm_delayed_analysis_if : public virtual tlm_delayed_write_if<T> } // namespace tlm -#endif /* __SYSTEMC_EXT_TLM_CORE_TLM_1_TLM_ANALYSIS_TLM_ANALYSIS_IF_H__ */ +#endif /* __SYSTEMC_EXT_TLM_CORE_1_ANALYSIS_ANALYSIS_IF_H__ */ diff --git a/src/systemc/ext/tlm_core/tlm_1/tlm_analysis/tlm_analysis_port.h b/src/systemc/ext/tlm_core/1/analysis/analysis_port.h index 5195417a8..4d9df6d9c 100644 --- a/src/systemc/ext/tlm_core/tlm_1/tlm_analysis/tlm_analysis_port.h +++ b/src/systemc/ext/tlm_core/1/analysis/analysis_port.h @@ -17,13 +17,13 @@ *****************************************************************************/ -#ifndef __SYSTEMC_EXT_TLM_CORE_TLM_1_TLM_ANALYSIS_TLM_ANALYSIS_PORT_H__ -#define __SYSTEMC_EXT_TLM_CORE_TLM_1_TLM_ANALYSIS_TLM_ANALYSIS_PORT_H__ +#ifndef __SYSTEMC_EXT_TLM_CORE_1_ANALYSIS_ANALYSIS_PORT_H__ +#define __SYSTEMC_EXT_TLM_CORE_1_ANALYSIS_ANALYSIS_PORT_H__ #include <algorithm> #include <deque> -#include "tlm_core/tlm_1/tlm_analysis/tlm_analysis_if.h" +#include "tlm_core/1/analysis/analysis_if.h" namespace tlm { @@ -75,4 +75,4 @@ class tlm_analysis_port : public sc_core::sc_object, } // namespace tlm -#endif /* __SYSTEMC_EXT_TLM_CORE_TLM_1_TLM_ANALYSIS_TLM_ANALYSIS_PORT_H__ */ +#endif /* __SYSTEMC_EXT_TLM_CORE_1_ANALYSIS_ANALYSIS_PORT_H__ */ diff --git a/src/systemc/ext/tlm_core/tlm_1/tlm_analysis/tlm_analysis_triple.h b/src/systemc/ext/tlm_core/1/analysis/analysis_triple.h index 9727f23e5..033b738b2 100644 --- a/src/systemc/ext/tlm_core/tlm_1/tlm_analysis/tlm_analysis_triple.h +++ b/src/systemc/ext/tlm_core/1/analysis/analysis_triple.h @@ -17,8 +17,8 @@ *****************************************************************************/ -#ifndef __SYSTEMC_EXT_TLM_CORE_TLM_1_TLM_ANALYSIS_TLM_ANALYSIS_TRIPLE_H__ -#define __SYSTEMC_EXT_TLM_CORE_TLM_1_TLM_ANALYSIS_TLM_ANALYSIS_TRIPLE_H__ +#ifndef __SYSTEMC_EXT_TLM_CORE_1_ANALYSIS_ANALYSIS_TRIPLE_H__ +#define __SYSTEMC_EXT_TLM_CORE_1_ANALYSIS_ANALYSIS_TRIPLE_H__ namespace tlm { @@ -50,4 +50,4 @@ struct tlm_analysis_triple } // namespace tlm -#endif /* __SYSTEMC_EXT_TLM_CORE_TLM_1_TLM_ANALYSIS_TLM_ANALYSIS_TRIPLE_H__ */ +#endif /* __SYSTEMC_EXT_TLM_CORE_1_ANALYSIS_ANALYSIS_TRIPLE_H__ */ diff --git a/src/systemc/ext/tlm_core/tlm_1/tlm_analysis/tlm_write_if.h b/src/systemc/ext/tlm_core/1/analysis/write_if.h index 3d77f880d..f4ee68d5b 100644 --- a/src/systemc/ext/tlm_core/tlm_1/tlm_analysis/tlm_write_if.h +++ b/src/systemc/ext/tlm_core/1/analysis/write_if.h @@ -17,8 +17,8 @@ *****************************************************************************/ -#ifndef __SYSTEMC_EXT_TLM_CORE_TLM_1_TLM_ANALYSIS_TLM_WRITE_IF_H__ -#define __SYSTEMC_EXT_TLM_CORE_TLM_1_TLM_ANALYSIS_TLM_WRITE_IF_H__ +#ifndef __SYSTEMC_EXT_TLM_CORE_1_ANALYSIS_WRITE_IF_H__ +#define __SYSTEMC_EXT_TLM_CORE_1_ANALYSIS_WRITE_IF_H__ #include <systemc> @@ -41,4 +41,4 @@ class tlm_delayed_write_if : public virtual sc_core::sc_interface } // namespace tlm -#endif /* __SYSTEMC_EXT_TLM_CORE_TLM_1_TLM_ANALYSIS_TLM_WRITE_IF_H__ */ +#endif /* __SYSTEMC_EXT_TLM_CORE_1_ANALYSIS_WRITE_IF_H__ */ diff --git a/src/systemc/ext/tlm_core/tlm_1/tlm_req_rsp/tlm_adapters/tlm_adapters.h b/src/systemc/ext/tlm_core/1/req_rsp/adapters/adapters.h index c81df4b15..4aee66bea 100644 --- a/src/systemc/ext/tlm_core/tlm_1/tlm_req_rsp/tlm_adapters/tlm_adapters.h +++ b/src/systemc/ext/tlm_core/1/req_rsp/adapters/adapters.h @@ -17,10 +17,10 @@ *****************************************************************************/ -#ifndef __SYSTEMC_EXT_TLM_CORE_TLM_1_TLM_REQ_RSP_TLM_ADAPTERS_H__ -#define __SYSTEMC_EXT_TLM_CORE_TLM_1_TLM_REQ_RSP_TLM_ADAPTERS_H__ +#ifndef __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_ADAPTERS_H__ +#define __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_ADAPTERS_H__ -#include "tlm_core/tlm_1/tlm_req_rsp/tlm_1_interfaces/tlm_master_slave_ifs.h" +#include "tlm_core/1/req_rsp/interfaces/master_slave_ifs.h" namespace tlm { @@ -97,4 +97,4 @@ class tlm_slave_to_transport : public sc_core::sc_module } // namespace tlm -#endif /* __SYSTEMC_EXT_TLM_CORE_TLM_1_TLM_REQ_RSP_TLM_ADAPTERS_H__*/ +#endif /* __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_ADAPTERS_H__ */ diff --git a/src/systemc/ext/tlm_core/tlm_1/tlm_req_rsp/tlm_channels/tlm_fifo/circular_buffer.h b/src/systemc/ext/tlm_core/1/req_rsp/channels/fifo/circular_buffer.h index c00fe4881..7625d712c 100644 --- a/src/systemc/ext/tlm_core/tlm_1/tlm_req_rsp/tlm_channels/tlm_fifo/circular_buffer.h +++ b/src/systemc/ext/tlm_core/1/req_rsp/channels/fifo/circular_buffer.h @@ -17,10 +17,8 @@ *****************************************************************************/ -#ifndef \ - __TLM_CORE_TLM_1_TLM_REQ_RSP_TLM_CHANNELS_TLM_FIFO_CIRCULAR_BUFFER_H__ -#define \ - __TLM_CORE_TLM_1_TLM_REQ_RSP_TLM_CHANNELS_TLM_FIFO_CIRCULAR_BUFFER_H__ +#ifndef __TLM_CORE_1_REQ_RSP_CHANNELS_FIFO_CIRCULAR_BUFFER_H__ +#define __TLM_CORE_1_REQ_RSP_CHANNELS_FIFO_CIRCULAR_BUFFER_H__ #include <iostream> @@ -251,5 +249,4 @@ circular_buffer<T>::buf_clear(void *buf, int n) } // namespace tlm -#endif -/* __TLM_CORE_TLM_1_TLM_REQ_RSP_TLM_CHANNELS_TLM_FIFO_CIRCULAR_BUFFER_H__ */ +#endif /* __TLM_CORE_1_REQ_RSP_CHANNELS_FIFO_CIRCULAR_BUFFER_H__ */ diff --git a/src/systemc/ext/tlm_core/tlm_1/tlm_req_rsp/tlm_channels/tlm_fifo/tlm_fifo.h b/src/systemc/ext/tlm_core/1/req_rsp/channels/fifo/fifo.h index 25a183459..a85c89045 100644 --- a/src/systemc/ext/tlm_core/tlm_1/tlm_req_rsp/tlm_channels/tlm_fifo/tlm_fifo.h +++ b/src/systemc/ext/tlm_core/1/req_rsp/channels/fifo/fifo.h @@ -17,10 +17,8 @@ *****************************************************************************/ -#ifndef \ - __SYSTEMC_EXT_TLM_CORE_TLM_1_TLM_REQ_RSP_TLM_CHANNELS_TLM_FIFO_TLM_FIFO_H__ -#define \ - __SYSTEMC_EXT_TLM_CORE_TLM_1_TLM_REQ_RSP_TLM_CHANNELS_TLM_FIFO_TLM_FIFO_H__ +#ifndef __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_CHANNELS_FIFO_FIFO_H__ +#define __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_CHANNELS_FIFO_FIFO_H__ // // This implements put, get and peek @@ -36,8 +34,8 @@ // actual physical buffer. // -#include "tlm_core/tlm_1/tlm_req_rsp/tlm_1_interfaces/tlm_fifo_ifs.h" -#include "tlm_core/tlm_1/tlm_req_rsp/tlm_channels/tlm_fifo/circular_buffer.h" +#include "tlm_core/1/req_rsp/channels/fifo/circular_buffer.h" +#include "tlm_core/1/req_rsp/interfaces/fifo_ifs.h" namespace tlm { @@ -225,9 +223,8 @@ tlm_fifo<T>::update() } // namespace tlm -#include "tlm_core/tlm_1/tlm_req_rsp/tlm_channels/tlm_fifo/tlm_fifo_put_get.h" -#include "tlm_core/tlm_1/tlm_req_rsp/tlm_channels/tlm_fifo/tlm_fifo_peek.h" -#include "tlm_core/tlm_1/tlm_req_rsp/tlm_channels/tlm_fifo/tlm_fifo_resize.h" +#include "tlm_core/1/req_rsp/channels/fifo/fifo_peek.h" +#include "tlm_core/1/req_rsp/channels/fifo/fifo_put_get.h" +#include "tlm_core/1/req_rsp/channels/fifo/fifo_resize.h" -#endif -/*__SYSTEMC_EXT_TLM_CORE_TLM_1_TLM_REQ_RSP_TLM_CHANNELS_TLM_FIFO_TLM_FIFO_H__*/ +#endif /* __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_CHANNELS_FIFO_FIFO_H__ */ diff --git a/src/systemc/ext/tlm_core/tlm_1/tlm_req_rsp/tlm_channels/tlm_fifo/tlm_fifo_peek.h b/src/systemc/ext/tlm_core/1/req_rsp/channels/fifo/fifo_peek.h index 540f72de6..c132852f9 100644 --- a/src/systemc/ext/tlm_core/tlm_1/tlm_req_rsp/tlm_channels/tlm_fifo/tlm_fifo_peek.h +++ b/src/systemc/ext/tlm_core/1/req_rsp/channels/fifo/fifo_peek.h @@ -17,10 +17,8 @@ *****************************************************************************/ -#ifndef \ - __TLM_CORE_TLM_1_TLM_REQ_RSP_TLM_CHANNELS_TLM_FIFO_TLM_FIFO_PEEK_H__ -#define \ - __TLM_CORE_TLM_1_TLM_REQ_RSP_TLM_CHANNELS_TLM_FIFO_TLM_FIFO_PEEK_H__ +#ifndef __TLM_CORE_1_REQ_RSP_CHANNELS_FIFO_FIFO_PEEK_H__ +#define __TLM_CORE_1_REQ_RSP_CHANNELS_FIFO_FIFO_PEEK_H__ namespace tlm { @@ -86,5 +84,4 @@ tlm_fifo<T>::nb_poke(const T &t, int n) } // namespace tlm -#endif -/* __TLM_CORE_TLM_1_TLM_REQ_RSP_TLM_CHANNELS_TLM_FIFO_TLM_FIFO_PEEK_H__ */ +#endif /* __TLM_CORE_1_REQ_RSP_CHANNELS_FIFO_FIFO_PEEK_H__ */ diff --git a/src/systemc/ext/tlm_core/tlm_1/tlm_req_rsp/tlm_channels/tlm_fifo/tlm_fifo_put_get.h b/src/systemc/ext/tlm_core/1/req_rsp/channels/fifo/fifo_put_get.h index a9a8ee3f4..8d34d2a56 100644 --- a/src/systemc/ext/tlm_core/tlm_1/tlm_req_rsp/tlm_channels/tlm_fifo/tlm_fifo_put_get.h +++ b/src/systemc/ext/tlm_core/1/req_rsp/channels/fifo/fifo_put_get.h @@ -17,10 +17,8 @@ *****************************************************************************/ -#ifndef \ - __TLM_CORE_TLM_1_TLM_REQ_RSP_TLM_CHANNELS_TLM_FIFO_TLM_FIFO_PUT_GET_H__ -#define \ - __TLM_CORE_TLM_1_TLM_REQ_RSP_TLM_CHANNELS_TLM_FIFO_TLM_FIFO_PUT_GET_H__ +#ifndef __TLM_CORE_1_REQ_RSP_CHANNELS_FIFO_FIFO_PUT_GET_H__ +#define __TLM_CORE_1_REQ_RSP_CHANNELS_FIFO_FIFO_PUT_GET_H__ namespace tlm { @@ -112,5 +110,4 @@ tlm_fifo<T>::nb_can_put(tlm_tag<T> *) const } // namespace tlm -#endif -/* __TLM_CORE_TLM_1_TLM_REQ_RSP_TLM_CHANNELS_TLM_FIFO_TLM_FIFO_PUT_GET_H__ */ +#endif /* __TLM_CORE_1_REQ_RSP_CHANNELS_FIFO_FIFO_PUT_GET_H__ */ diff --git a/src/systemc/ext/tlm_core/tlm_1/tlm_req_rsp/tlm_channels/tlm_fifo/tlm_fifo_resize.h b/src/systemc/ext/tlm_core/1/req_rsp/channels/fifo/fifo_resize.h index 79292fd78..3f936fb9c 100644 --- a/src/systemc/ext/tlm_core/tlm_1/tlm_req_rsp/tlm_channels/tlm_fifo/tlm_fifo_resize.h +++ b/src/systemc/ext/tlm_core/1/req_rsp/channels/fifo/fifo_resize.h @@ -17,10 +17,8 @@ *****************************************************************************/ -#ifndef \ - __TLM_CORE_TLM_1_TLM_REQ_RSP_TLM_CHANNELS_TLM_FIFO_TLM_FIFO_RESIZE_H__ -#define \ - __TLM_CORE_TLM_1_TLM_REQ_RSP_TLM_CHANNELS_TLM_FIFO_TLM_FIFO_RESIZE_H__ +#ifndef __TLM_CORE_1_REQ_RSP_CHANNELS_FIFO_FIFO_RESIZE_H__ +#define __TLM_CORE_1_REQ_RSP_CHANNELS_FIFO_FIFO_RESIZE_H__ // Resize interface. namespace tlm @@ -79,5 +77,4 @@ tlm_fifo<T>::nb_bound(unsigned int new_size) } // namespace tlm -#endif -/* __TLM_CORE_TLM_1_TLM_REQ_RSP_TLM_CHANNELS_TLM_FIFO_TLM_FIFO_RESIZE_H__ */ +#endif /* __TLM_CORE_1_REQ_RSP_CHANNELS_FIFO_FIFO_RESIZE_H__ */ diff --git a/src/systemc/ext/tlm_core/tlm_1/tlm_req_rsp/tlm_channels/tlm_req_rsp_channels/tlm_put_get_imp.h b/src/systemc/ext/tlm_core/1/req_rsp/channels/req_rsp_channels/put_get_imp.h index 8335cc85c..e821573b9 100644 --- a/src/systemc/ext/tlm_core/tlm_1/tlm_req_rsp/tlm_channels/tlm_req_rsp_channels/tlm_put_get_imp.h +++ b/src/systemc/ext/tlm_core/1/req_rsp/channels/req_rsp_channels/put_get_imp.h @@ -18,11 +18,11 @@ *****************************************************************************/ #ifndef \ - __TLM_1_TLM_REQ_RSP_TLM_CHANNELS_TLM_REQ_RSP_CHANNELS_TLM_PUT_GET_IMP_H__ + __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_CHANNELS_REQ_RSP_CHANNELS_PUT_GET_IMP_H__ #define \ - __TLM_1_TLM_REQ_RSP_TLM_CHANNELS_TLM_REQ_RSP_CHANNELS_TLM_PUT_GET_IMP_H__ + __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_CHANNELS_REQ_RSP_CHANNELS_PUT_GET_IMP_H__ -#include "tlm_core/tlm_1/tlm_req_rsp/tlm_1_interfaces/tlm_master_slave_ifs.h" +#include "tlm_core/1/req_rsp/interfaces/master_slave_ifs.h" namespace tlm { @@ -112,4 +112,4 @@ class tlm_slave_imp : private tlm_put_get_imp<RSP, REQ>, } // namespace tlm #endif -/* __TLM_1_TLM_REQ_RSP_TLM_CHANNELS_TLM_REQ_RSP_CHANNELS_TLM_PUT_GET_IMP_H__ */ +/* __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_CHANNELS_REQ_RSP_CHANNELS_PUT_GET_IMP_H__*/ diff --git a/src/systemc/ext/tlm_core/tlm_1/tlm_req_rsp/tlm_channels/tlm_req_rsp_channels/tlm_req_rsp_channels.h b/src/systemc/ext/tlm_core/1/req_rsp/channels/req_rsp_channels/req_rsp_channels.h index 1548e0852..321d947ea 100644 --- a/src/systemc/ext/tlm_core/tlm_1/tlm_req_rsp/tlm_channels/tlm_req_rsp_channels/tlm_req_rsp_channels.h +++ b/src/systemc/ext/tlm_core/1/req_rsp/channels/req_rsp_channels/req_rsp_channels.h @@ -17,14 +17,12 @@ *****************************************************************************/ -#ifndef \ - __TLM_REQ_RSP_TLM_CHANNELS_TLM_REQ_RSP_CHANNELS_TLM_REQ_RSP_CHANNELS_H__ -#define \ - __TLM_REQ_RSP_TLM_CHANNELS_TLM_REQ_RSP_CHANNELS_TLM_REQ_RSP_CHANNELS_H__ +#ifndef __EXT_TLM_CORE_1_REQ_RSP_CHANNELS_REQ_RSP_CHANNELS_REQ_RSP_CHANNELS_H__ +#define __EXT_TLM_CORE_1_REQ_RSP_CHANNELS_REQ_RSP_CHANNELS_REQ_RSP_CHANNELS_H__ -#include "tlm_core/tlm_1/tlm_req_rsp/tlm_adapters/tlm_adapters.h" -#include "tlm_core/tlm_1/tlm_req_rsp/tlm_channels/tlm_fifo/tlm_fifo.h" -#include "tlm_core/tlm_1/tlm_req_rsp/tlm_channels/tlm_req_rsp_channels/tlm_put_get_imp.h" +#include "tlm_core/1/req_rsp/adapters/adapters.h" +#include "tlm_core/1/req_rsp/channels/fifo/fifo.h" +#include "tlm_core/1/req_rsp/channels/req_rsp_channels/put_get_imp.h" namespace tlm { @@ -137,4 +135,4 @@ class tlm_transport_channel : public sc_core::sc_module } // namespace tlm #endif -/* __TLM_REQ_RSP_TLM_CHANNELS_TLM_REQ_RSP_CHANNELS_TLM_REQ_RSP_CHANNELS_H__ */ +/* __EXT_TLM_CORE_1_REQ_RSP_CHANNELS_REQ_RSP_CHANNELS_REQ_RSP_CHANNELS_H__ */ diff --git a/src/systemc/ext/tlm_core/tlm_1/tlm_req_rsp/tlm_1_interfaces/tlm_core_ifs.h b/src/systemc/ext/tlm_core/1/req_rsp/interfaces/core_ifs.h index 2cd919bd2..2a5778784 100644 --- a/src/systemc/ext/tlm_core/tlm_1/tlm_req_rsp/tlm_1_interfaces/tlm_core_ifs.h +++ b/src/systemc/ext/tlm_core/1/req_rsp/interfaces/core_ifs.h @@ -17,12 +17,10 @@ *****************************************************************************/ -#ifndef \ - __SYSTEMC_EXT_TLM_CORE_TLM_1_TLM_REQ_RSP_TLM1_INTERFACES_TLM_CORE_IFS_H__ -#define \ - __SYSTEMC_EXT_TLM_CORE_TLM_1_TLM_REQ_RSP_TLM1_INTERFACES_TLM_CORE_IFS_H__ +#ifndef __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_INTERFACES_CORE_IFS_H__ +#define __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_INTERFACES_CORE_IFS_H__ -#include "tlm_core/tlm_1/tlm_req_rsp/tlm_1_interfaces/tlm_tag.h" +#include "tlm_core/1/req_rsp/interfaces/tag.h" namespace tlm { @@ -134,5 +132,4 @@ class tlm_get_peek_if : public virtual tlm_get_if<T>, } // namespace tlm -#endif -/* __SYSTEMC_EXT_TLM_CORE_TLM_1_TLM_REQ_RSP_TLM1_INTERFACES_TLM_CORE_IFS_H__ */ +#endif /* __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_INTERFACES_CORE_IFS_H__ */ diff --git a/src/systemc/ext/tlm_core/tlm_1/tlm_req_rsp/tlm_1_interfaces/tlm_fifo_ifs.h b/src/systemc/ext/tlm_core/1/req_rsp/interfaces/fifo_ifs.h index 57418ae92..20d3b7e08 100644 --- a/src/systemc/ext/tlm_core/tlm_1/tlm_req_rsp/tlm_1_interfaces/tlm_fifo_ifs.h +++ b/src/systemc/ext/tlm_core/1/req_rsp/interfaces/fifo_ifs.h @@ -17,12 +17,10 @@ *****************************************************************************/ -#ifndef \ - __SYSTEMC_EXT_TLM_CORE_TLM_1_TLM_REQ_RSP_TLM_1_INTERFACES_TLM_FIFO_IFS_H__ -#define \ - __SYSTEMC_EXT_TLM_CORE_TLM_1_TLM_REQ_RSP_TLM_1_INTERFACES_TLM_FIFO_IFS_H__ +#ifndef __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_INTERFACES_FIFO_IFS_H__ +#define __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_INTERFACES_FIFO_IFS_H__ -#include "tlm_core/tlm_1/tlm_req_rsp/tlm_1_interfaces/tlm_core_ifs.h" +#include "tlm_core/1/req_rsp/interfaces/core_ifs.h" namespace tlm { @@ -78,5 +76,4 @@ class tlm_fifo_config_size_if : public virtual sc_core::sc_interface } // namespace tlm -#endif -/* __SYSTEMC_EXT_TLM_CORE_TLM_1_TLM_REQ_RSP_TLM_1_INTERFACES_TLM_FIFO_IFS_H__*/ +#endif /* __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_INTERFACES_FIFO_IFS_H__ */ diff --git a/src/systemc/ext/tlm_core/tlm_1/tlm_req_rsp/tlm_1_interfaces/tlm_master_slave_ifs.h b/src/systemc/ext/tlm_core/1/req_rsp/interfaces/master_slave_ifs.h index 29a89de47..a1411c9ee 100644 --- a/src/systemc/ext/tlm_core/tlm_1/tlm_req_rsp/tlm_1_interfaces/tlm_master_slave_ifs.h +++ b/src/systemc/ext/tlm_core/1/req_rsp/interfaces/master_slave_ifs.h @@ -17,12 +17,10 @@ *****************************************************************************/ -#ifndef \ - __TLM_CORE_TLM_1_TLM_REQ_RSP_TLM_1_INTERFACES_TLM_MASTER_SLAVE_IFS_H__ -#define \ - __TLM_CORE_TLM_1_TLM_REQ_RSP_TLM_1_INTERFACES_TLM_MASTER_SLAVE_IFS_H__ +#ifndef __TLM_CORE_1_REQ_RSP_INTERFACES_MASTER_SLAVE_IFS_H__ +#define __TLM_CORE_1_REQ_RSP_INTERFACES_MASTER_SLAVE_IFS_H__ -#include "tlm_core/tlm_1/tlm_req_rsp/tlm_1_interfaces/tlm_core_ifs.h" +#include "tlm_core/1/req_rsp/interfaces/core_ifs.h" namespace tlm { @@ -74,5 +72,4 @@ class tlm_slave_if : public virtual tlm_put_if<RSP>, } // namespace tlm -#endif -/* __TLM_CORE_TLM_1_TLM_REQ_RSP_TLM_1_INTERFACES_TLM_MASTER_SLAVE_IFS_H__ */ +#endif /* __TLM_CORE_1_REQ_RSP_INTERFACES_MASTER_SLAVE_IFS_H__ */ diff --git a/src/systemc/ext/tlm_core/tlm_1/tlm_req_rsp/tlm_1_interfaces/tlm_tag.h b/src/systemc/ext/tlm_core/1/req_rsp/interfaces/tag.h index b19c904fb..7aa7581c8 100644 --- a/src/systemc/ext/tlm_core/tlm_1/tlm_req_rsp/tlm_1_interfaces/tlm_tag.h +++ b/src/systemc/ext/tlm_core/1/req_rsp/interfaces/tag.h @@ -17,8 +17,8 @@ *****************************************************************************/ -#ifndef __SYSTEMC_EXT_TLM_CORE_TLM_1_TLM_REQ_RSP_TLM_1_INTERFACES_TLM_TAG_H__ -#define __SYSTEMC_EXT_TLM_CORE_TLM_1_TLM_REQ_RSP_TLM_1_INTERFACES_TLM_TAG_H__ +#ifndef __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_INTERFACES_TAG_H__ +#define __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_INTERFACES_TAG_H__ namespace tlm { @@ -29,5 +29,4 @@ class tlm_tag } -#endif -/* __SYSTEMC_EXT_TLM_CORE_TLM_1_TLM_REQ_RSP_TLM_1_INTERFACES_TLM_TAG_H__ */ +#endif /* __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_INTERFACES_TAG_H__ */ diff --git a/src/systemc/ext/tlm_core/tlm_1/tlm_req_rsp/tlm_ports/tlm_event_finder.h b/src/systemc/ext/tlm_core/1/req_rsp/ports/event_finder.h index 0f88d3f4e..61ac88664 100644 --- a/src/systemc/ext/tlm_core/tlm_1/tlm_req_rsp/tlm_ports/tlm_event_finder.h +++ b/src/systemc/ext/tlm_core/1/req_rsp/ports/event_finder.h @@ -17,10 +17,10 @@ *****************************************************************************/ -#ifndef __SYSTEMC_EXT_TLM_CORE_TLM_1_TLM_REQ_RSP_TLM_PORTS_TLM_EVENT_FINDER_H__ -#define __SYSTEMC_EXT_TLM_CORE_TLM_1_TLM_REQ_RSP_TLM_PORTS_TLM_EVENT_FINDER_H__ +#ifndef __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_PORTS_EVENT_FINDER_H__ +#define __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_PORTS_EVENT_FINDER_H__ -#include "tlm_core/tlm_1/tlm_req_rsp/tlm_1_interfaces/tlm_tag.h" +#include "tlm_core/1/req_rsp/interfaces/tag.h" namespace tlm { @@ -65,5 +65,4 @@ tlm_event_finder_t<IF, T>::find_event(sc_core::sc_interface *if_p) const } // namespace tlm -// __SYSTEMC_EXT_TLM_CORE_TLM_1_TLM_REQ_RSP_TLM_PORTS_TLM_EVENT_FINDER_H__ -#endif +#endif /* __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_PORTS_EVENT_FINDER_H__ */ diff --git a/src/systemc/ext/tlm_core/tlm_1/tlm_req_rsp/tlm_ports/tlm_nonblocking_port.h b/src/systemc/ext/tlm_core/1/req_rsp/ports/nonblocking_port.h index 370b2cae0..099d2fe7c 100644 --- a/src/systemc/ext/tlm_core/tlm_1/tlm_req_rsp/tlm_ports/tlm_nonblocking_port.h +++ b/src/systemc/ext/tlm_core/1/req_rsp/ports/nonblocking_port.h @@ -17,13 +17,11 @@ *****************************************************************************/ -#ifndef \ - __SYSTEMC_EXT_TLM_CORE_TLM_1_TLM_REQ_RSP_TLM_PORTS_TLM_NONBLOCKING_PORT_H__ -#define \ - __SYSTEMC_EXT_TLM_CORE_TLM_1_TLM_REQ_RSP_TLM_PORTS_TLM_NONBLOCKING_PORT_H__ +#ifndef __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_PORTS_NONBLOCKING_PORT_H__ +#define __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_PORTS_NONBLOCKING_PORT_H__ -#include "tlm_core/tlm_1/tlm_req_rsp/tlm_1_interfaces/tlm_core_ifs.h" -#include "tlm_core/tlm_1/tlm_req_rsp/tlm_ports/tlm_event_finder.h" +#include "tlm_core/1/req_rsp/interfaces/core_ifs.h" +#include "tlm_core/1/req_rsp/ports/event_finder.h" namespace tlm { @@ -87,5 +85,4 @@ class tlm_nonblocking_put_port : } // namespace tlm -#endif -/*__SYSTEMC_EXT_TLM_CORE_TLM_1_TLM_REQ_RSP_TLM_PORTS_TLM_NONBLOCKING_PORT_H__*/ +#endif /* __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_PORTS_NONBLOCKING_PORT_H__ */ diff --git a/src/systemc/ext/tlm_core/tlm_1/tlm_req_rsp/tlm_req_rsp.h b/src/systemc/ext/tlm_core/1/req_rsp/req_rsp.h index 0d4d0b966..746a8598a 100644 --- a/src/systemc/ext/tlm_core/tlm_1/tlm_req_rsp/tlm_req_rsp.h +++ b/src/systemc/ext/tlm_core/1/req_rsp/req_rsp.h @@ -17,21 +17,20 @@ *****************************************************************************/ -#ifndef __SYsTEMC_EXT_TLM_CORE_TLM_1_TLM_REQ_RSP_TLM_REQ_RSP_H__ -#define __SYsTEMC_EXT_TLM_CORE_TLM_1_TLM_REQ_RSP_TLM_REQ_RSP_H__ +#ifndef __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_REQ_RSP_H__ +#define __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_REQ_RSP_H__ // The unannotated TLM interfaces. -#include "tlm_core/tlm_1/tlm_req_rsp/tlm_1_interfaces/tlm_core_ifs.h" -#include "tlm_core/tlm_1/tlm_req_rsp/tlm_1_interfaces/tlm_master_slave_ifs.h" +#include "tlm_core/1/req_rsp/interfaces/core_ifs.h" +#include "tlm_core/1/req_rsp/interfaces/master_slave_ifs.h" // The channels : tlm_fifo, tlm_transport_channel and tlm_req_rsp_channel. -#include "tlm_core/tlm_1/tlm_req_rsp/tlm_channels/tlm_req_rsp_channels/tlm_req_rsp_channels.h" +#include "tlm_core/1/req_rsp/channels/req_rsp_channels/req_rsp_channels.h" // Some non blocking ports to provide static sensitivity. -#include "tlm_core/tlm_1/tlm_req_rsp/tlm_ports/tlm_nonblocking_port.h" +#include "tlm_core/1/req_rsp/ports/nonblocking_port.h" - -#endif /*__SYsTEMC_EXT_TLM_CORE_TLM_1_TLM_REQ_RSP_TLM_REQ_RSP_H__ */ +#endif /* __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_REQ_RSP_H__ */ diff --git a/src/systemc/ext/tlm_core/tlm_2/README.txt b/src/systemc/ext/tlm_core/2/README.txt index cb02af2d8..e3074dea7 100644 --- a/src/systemc/ext/tlm_core/tlm_2/README.txt +++ b/src/systemc/ext/tlm_core/2/README.txt @@ -1,15 +1,15 @@ TLM-2.0 interoperability layer header files =========================================== -Dir: include/tlm_core/tlm_2/ +Dir: include/tlm_core/2/ -SubDirs: tlm_2_interfaces/ - tlm_generic_payload/ - tlm_quantum/ - tlm_sockets +SubDirs: interfaces/ + generic_payload/ + quantum/ + sockets Files: README.txt - tlm_version.h + version.h Comments @@ -24,14 +24,14 @@ tlm_version.h contains the definitions for the version string and integer values The header files are organizated, by subdirectory, as follows: -tlm_2_interfaces/ +interfaces/ ----------------- Contains the TLM-2.0 core interfaces Files: - tlm_2_interfaces.h (includes the other header files in this directory ) - tlm_fw_bw_ifs.h (defines the TLM 2.0 interface API's: + interfaces.h (includes the other header files in this directory ) + fw_bw_ifs.h (defines the TLM 2.0 interface API's: tlm_fw_nonblocking_transport_if tlm_bw_nonblocking_transport_if tlm_blocking_transport_if @@ -43,17 +43,17 @@ Files: and the TLM 2.0 standard interfaces using the API's tlm_fw_transport_if tlm_bw_transport_if ) - tlm_dmi.h (defines tlm_dmi) + dmi.h (defines tlm_dmi) -tlm_generic_payload/ +generic_payload/ -------------------- Contains the TLM-2.0 generic payload and associated classes and helper functions Files: - tlm_generic_payload.h ( includes the other header files in this directory) - tlm_gp.h (defines the TLM 2.0 generic payload classes: + generic_payload.h ( includes the other header files in this directory) + gp.h (defines the TLM 2.0 generic payload classes: tlm_generic_payload tlm_extension tlm_extension_base @@ -61,9 +61,9 @@ Files: and the enumeration types tlm_command tlm_response_status ) - tlm_array.h (defines array class used by the extention + array.h (defines array class used by the extention mechanism ) - tlm_endian_conv.h (defines the implementation for the endianness + endian_conv.h (defines the implementation for the endianness helper functions: tlm_to_hostendian_generic() tlm_from_hostendian_generic() @@ -74,38 +74,38 @@ Files: tlm_to_hostendian_single() tlm_from_hostendian_single() ) - tlm_helpers.h (defines the helper functions to determine the + helpers.h (defines the helper functions to determine the hostendianness: get_host_endianness() host_has_little_endianness() has_host_endianness() and defines the enumeration type: tlm_endianness - tlm_phase.h (defines tlm_phase as an extendable enum type) + phase.h (defines tlm_phase as an extendable enum type) -tlm_sockets/ +sockets/ ------------ Contains the standard TLM-2.0 initiator and target sockets (which are used as the base classes for the convenience sockets in tlm_utils) Files: - tlm_sockets.h (includes the other header files in this directory) - tlm_initiator_socket.h (defines the initiator sockets: + sockets.h (includes the other header files in this directory) + initiator_socket.h (defines the initiator sockets: tlm_initiator_socket_base tlm_initiator_socket_b tlm_initiator_socket - tlm_target_socket.h (defines the target sockets: + target_socket.h (defines the target sockets: tlm_target_socket_base tlm_target_socket_b tlm_target_socket -tlm_quantum/ +quantum/ ------------ This contains the global quantum. (The quantum keeper is in tlm_utils) Files: - tlm_quantum.h ( includes the other header file in this directory ) - tlm_global_quantum.h ( defines tlm_global_quantum ) + quantum.h ( includes the other header file in this directory ) + global_quantum.h ( defines tlm_global_quantum ) diff --git a/src/systemc/ext/tlm_core/tlm_2/tlm_generic_payload/tlm_array.h b/src/systemc/ext/tlm_core/2/generic_payload/array.h index 9890a2a2c..1c6c724a4 100644 --- a/src/systemc/ext/tlm_core/tlm_2/tlm_generic_payload/tlm_array.h +++ b/src/systemc/ext/tlm_core/2/generic_payload/array.h @@ -17,8 +17,8 @@ *****************************************************************************/ -#ifndef __SYSTEMC_EXT_TLM_CORE_TLM_2_TLM_GENERIC_PAYLOADS_TLM_ARRAY_H__ -#define __SYSTEMC_EXT_TLM_CORE_TLM_2_TLM_GENERIC_PAYLOADS_TLM_ARRAY_H__ +#ifndef __SYSTEMC_EXT_TLM_CORE_2_GENERIC_PAYLOADS_ARRAY_H__ +#define __SYSTEMC_EXT_TLM_CORE_2_GENERIC_PAYLOADS_ARRAY_H__ #include <vector> @@ -95,4 +95,4 @@ const char *const tlm_array<T>::kind_string = "tlm_array"; } // namespace tlm -#endif /* __SYSTEMC_EXT_TLM_CORE_TLM_2_TLM_GENERIC_PAYLOADS_TLM_ARRAY_H__ */ +#endif /* __SYSTEMC_EXT_TLM_CORE_2_GENERIC_PAYLOADS_ARRAY_H__ */ diff --git a/src/systemc/ext/tlm_core/tlm_2/tlm_generic_payload/tlm_endian_conv.h b/src/systemc/ext/tlm_core/2/generic_payload/endian_conv.h index 7eb86fa68..50d5e6873 100644 --- a/src/systemc/ext/tlm_core/tlm_2/tlm_generic_payload/tlm_endian_conv.h +++ b/src/systemc/ext/tlm_core/2/generic_payload/endian_conv.h @@ -18,13 +18,13 @@ *****************************************************************************/ -#ifndef __SYSTEMC_EXT_TLM_CORE_TLM_2_TLM_GENERIC_PAYLOAD_TLM_ENDIAN_CONV_H__ -#define __SYSTEMC_EXT_TLM_CORE_TLM_2_TLM_GENERIC_PAYLOAD_TLM_ENDIAN_CONV_H__ - -#include "tlm_core/tlm_2/tlm_generic_payload/tlm_gp.h" +#ifndef __SYSTEMC_EXT_TLM_CORE_2_GENERIC_PAYLOAD_ENDIAN_CONV_H__ +#define __SYSTEMC_EXT_TLM_CORE_2_GENERIC_PAYLOAD_ENDIAN_CONV_H__ #include <cstring> // std::memset +#include "tlm_core/2/generic_payload/gp.h" + namespace tlm { @@ -938,5 +938,4 @@ tlm_from_hostendian(tlm_generic_payload *txn) } // namespace tlm -#endif -/* __SYSTEMC_EXT_TLM_CORE_TLM_2_TLM_GENERIC_PAYLOAD_TLM_ENDIAN_CONV_H__ */ +#endif /* __SYSTEMC_EXT_TLM_CORE_2_GENERIC_PAYLOAD_ENDIAN_CONV_H__ */ diff --git a/src/systemc/ext/tlm_core/2/generic_payload/generic_payload.h b/src/systemc/ext/tlm_core/2/generic_payload/generic_payload.h new file mode 100644 index 000000000..fb10b8809 --- /dev/null +++ b/src/systemc/ext/tlm_core/2/generic_payload/generic_payload.h @@ -0,0 +1,28 @@ +/***************************************************************************** + + Licensed to Accellera Systems Initiative Inc. (Accellera) under one or + more contributor license agreements. See the NOTICE file distributed + with this work for additional information regarding copyright ownership. + Accellera licenses this file to you under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with the + License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied. See the License for the specific language governing + permissions and limitations under the License. + + *****************************************************************************/ + +#ifndef __SYSTEMC_EXT_TLM_CORE_2_GENERIC_GENERIC_PAYLOAD_H__ +#define __SYSTEMC_EXT_TLM_CORE_2_GENERIC_GENERIC_PAYLOAD_H__ + +#include "tlm_core/2/generic_payload/endian_conv.h" +#include "tlm_core/2/generic_payload/gp.h" +#include "tlm_core/2/generic_payload/helpers.h" +#include "tlm_core/2/generic_payload/phase.h" + +#endif /* __SYSTEMC_EXT_TLM_CORE_2_GENERIC_GENERIC_PAYLOAD_H__ */ diff --git a/src/systemc/ext/tlm_core/tlm_2/tlm_generic_payload/tlm_gp.h b/src/systemc/ext/tlm_core/2/generic_payload/gp.h index 0204aed76..84bc25a01 100644 --- a/src/systemc/ext/tlm_core/tlm_2/tlm_generic_payload/tlm_gp.h +++ b/src/systemc/ext/tlm_core/2/generic_payload/gp.h @@ -17,13 +17,13 @@ *****************************************************************************/ -#ifndef __SYSTEMC_EXT_TLM_CORE_TLM_2_TLM_GENERIC_PAYLOAD_TLM_GP_H__ -#define __SYSTEMC_EXT_TLM_CORE_TLM_2_TLM_GENERIC_PAYLOAD_TLM_GP_H__ +#ifndef __SYSTEMC_EXT_TLM_CORE_2_GENERIC_PAYLOAD_GP_H__ +#define __SYSTEMC_EXT_TLM_CORE_2_GENERIC_PAYLOAD_GP_H__ #include <systemc> #include <typeinfo> // std::type_info -#include "tlm_core/tlm_2/tlm_generic_payload/tlm_array.h" +#include "tlm_core/2/generic_payload/array.h" namespace tlm { @@ -425,4 +425,4 @@ class tlm_generic_payload } // namespace tlm -#endif /* __SYSTEMC_EXT_TLM_CORE_TLM_2_TLM_GENERIC_PAYLOAD_TLM_GP_H__ */ +#endif /* __SYSTEMC_EXT_TLM_CORE_2_GENERIC_PAYLOAD_GP_H__ */ diff --git a/src/systemc/ext/tlm_core/tlm_2/tlm_generic_payload/tlm_helpers.h b/src/systemc/ext/tlm_core/2/generic_payload/helpers.h index 74c6d935f..4ec4faeeb 100644 --- a/src/systemc/ext/tlm_core/tlm_2/tlm_generic_payload/tlm_helpers.h +++ b/src/systemc/ext/tlm_core/2/generic_payload/helpers.h @@ -17,8 +17,8 @@ *****************************************************************************/ -#ifndef __SYSTEMC_EXT_TLM_CORE_TLM_2_TLM_GENERIC_PAYLOAD_TLM_HELPERS_H__ -#define __SYSTEMC_EXT_TLM_CORE_TLM_2_TLM_GENERIC_PAYLOAD_TLM_HELPERS_H__ +#ifndef __SYSTEMC_EXT_TLM_CORE_2_GENERIC_PAYLOAD_HELPERS_H__ +#define __SYSTEMC_EXT_TLM_CORE_2_GENERIC_PAYLOAD_HELPERS_H__ namespace tlm { @@ -67,4 +67,4 @@ has_host_endianness(tlm_endianness endianness) } // namespace tlm -#endif /* __SYSTEMC_EXT_TLM_CORE_TLM_2_TLM_GENERIC_PAYLOAD_TLM_HELPERS_H__ */ +#endif /* __SYSTEMC_EXT_TLM_CORE_2_GENERIC_PAYLOAD_HELPERS_H__ */ diff --git a/src/systemc/ext/tlm_core/tlm_2/tlm_generic_payload/tlm_phase.h b/src/systemc/ext/tlm_core/2/generic_payload/phase.h index 767cb886c..ca58b2f9d 100644 --- a/src/systemc/ext/tlm_core/tlm_2/tlm_generic_payload/tlm_phase.h +++ b/src/systemc/ext/tlm_core/2/generic_payload/phase.h @@ -17,8 +17,8 @@ *****************************************************************************/ -#ifndef __SYSTEMC_EXT_TLM_CORE_TLM_2_TLM_GENERIC_PAYLOAD_TLM_PHASE_H__ -#define __SYSTEMC_EXT_TLM_CORE_TLM_2_TLM_GENERIC_PAYLOAD_TLM_PHASE_H__ +#ifndef __SYSTEMC_EXT_TLM_CORE_2_GENERIC_PAYLOAD_PHASE_H__ +#define __SYSTEMC_EXT_TLM_CORE_2_GENERIC_PAYLOAD_PHASE_H__ #include <iostream> #include <typeinfo> @@ -114,4 +114,4 @@ static class SC_CONCAT_HELPER_(tlm_phase_, name_arg) : \ #undef SC_STRINGIFY_HELPER_DEFERRED_ #undef SC_STRINGIFY_HELPER_MORE_DEFERRED_ -#endif /* __SYSTEMC_EXT_TLM_CORE_TLM_2_TLM_GENERIC_PAYLOAD_TLM_PHASE_H__ */ +#endif /* __SYSTEMC_EXT_TLM_CORE_2_GENERIC_PAYLOAD_PHASE_H__ */ diff --git a/src/systemc/ext/tlm_core/tlm_2/tlm_2_interfaces/tlm_dmi.h b/src/systemc/ext/tlm_core/2/interfaces/dmi.h index 573744d28..1e019e0b6 100644 --- a/src/systemc/ext/tlm_core/tlm_2/tlm_2_interfaces/tlm_dmi.h +++ b/src/systemc/ext/tlm_core/2/interfaces/dmi.h @@ -17,8 +17,8 @@ *****************************************************************************/ -#ifndef __SYSTEMC_EXT_TLM_CORE_TLM_2_TLM_2_INTERFACES_TLM_DMI_H__ -#define __SYSTEMC_EXT_TLM_CORE_TLM_2_TLM_2_INTERFACES_TLM_DMI_H__ +#ifndef __SYSTEMC_EXT_TLM_CORE_2_INTERFACES_DMI_H__ +#define __SYSTEMC_EXT_TLM_CORE_2_INTERFACES_DMI_H__ #include <systemc> @@ -121,4 +121,4 @@ class tlm_dmi } // namespace tlm -#endif /* __SYSTEMC_EXT_TLM_CORE_TLM_2_TLM_2_INTERFACES_TLM_DMI_H__ */ +#endif /* __SYSTEMC_EXT_TLM_CORE_2_INTERFACES_DMI_H__ */ diff --git a/src/systemc/ext/tlm_core/tlm_2/tlm_2_interfaces/tlm_fw_bw_ifs.h b/src/systemc/ext/tlm_core/2/interfaces/fw_bw_ifs.h index 3c21ca01e..032ca3982 100644 --- a/src/systemc/ext/tlm_core/tlm_2/tlm_2_interfaces/tlm_fw_bw_ifs.h +++ b/src/systemc/ext/tlm_core/2/interfaces/fw_bw_ifs.h @@ -17,13 +17,13 @@ *****************************************************************************/ -#ifndef __SYSTEMC_EXT_TLM_CORE_TLM_2_TLM_2_INTERFACES_TLM_FW_BW_IFS_H__ -#define __SYSTEMC_EXT_TLM_CORE_TLM_2_TLM_2_INTERFACES_TLM_FW_BW_IFS_H__ +#ifndef __SYSTEMC_EXT_TLM_CORE_2_INTERFACES_FW_BW_IFS_H__ +#define __SYSTEMC_EXT_TLM_CORE_2_INTERFACES_FW_BW_IFS_H__ #include <systemc> -#include "tlm_core/tlm_2/tlm_2_interfaces/tlm_dmi.h" -#include "tlm_core/tlm_2/tlm_generic_payload/tlm_generic_payload.h" +#include "tlm_core/2/generic_payload/generic_payload.h" +#include "tlm_core/2/interfaces/dmi.h" namespace tlm { @@ -219,4 +219,4 @@ class tlm_bw_transport_if : } // namespace tlm -#endif /* __SYSTEMC_EXT_TLM_CORE_TLM_2_TLM_2_INTERFACES_TLM_FW_BW_IFS_H__ */ +#endif /* __SYSTEMC_EXT_TLM_CORE_2_INTERFACES_FW_BW_IFS_H__ */ diff --git a/src/systemc/ext/tlm_core/tlm_2/tlm_sockets/tlm_sockets.h b/src/systemc/ext/tlm_core/2/interfaces/interfaces.h index 75697292b..bab1536ad 100644 --- a/src/systemc/ext/tlm_core/tlm_2/tlm_sockets/tlm_sockets.h +++ b/src/systemc/ext/tlm_core/2/interfaces/interfaces.h @@ -17,10 +17,10 @@ *****************************************************************************/ -#ifndef __SYSTEMC_EXT_TLM_CORE_TLM_2_TLM_SOCKETS_TLM_SOCKETS_H__ -#define __SYSTEMC_EXT_TLM_CORE_TLM_2_TLM_SOCKETS_TLM_SOCKETS_H__ +#ifndef __SYSTEMC_EXT_TLM_CORE_2_INTERFACES_INTERFACES_H__ +#define __SYSTEMC_EXT_TLM_CORE_2_INTERFACES_INTERFACES_H__ -#include "tlm_core/tlm_2/tlm_sockets/tlm_initiator_socket.h" -#include "tlm_core/tlm_2/tlm_sockets/tlm_target_socket.h" +#include "tlm_core/2/interfaces/dmi.h" +#include "tlm_core/2/interfaces/fw_bw_ifs.h" -#endif /* __SYSTEMC_EXT_TLM_CORE_TLM_2_TLM_SOCKETS_TLM_SOCKETS_H__ */ +#endif /* __SYSTEMC_EXT_TLM_CORE_2_INTERFACES_INTERFACES_H__ */ diff --git a/src/systemc/ext/tlm_core/tlm_2/tlm_quantum/tlm_global_quantum.h b/src/systemc/ext/tlm_core/2/quantum/global_quantum.h index 74ae57aa5..54fcd5c2c 100644 --- a/src/systemc/ext/tlm_core/tlm_2/tlm_quantum/tlm_global_quantum.h +++ b/src/systemc/ext/tlm_core/2/quantum/global_quantum.h @@ -17,8 +17,8 @@ *****************************************************************************/ -#ifndef __SYSTEMC_EXT_TLM_CORE_TLM_2_TLM_QUANTUM_TLM_GLOBAL_QUANTUM_H__ -#define __SYSTEMC_EXT_TLM_CORE_TLM_2_TLM_QUANTUM_TLM_GLOBAL_QUANTUM_H__ +#ifndef __SYSTEMC_EXT_TLM_CORE_2_QUANTUM_GLOBAL_QUANTUM_H__ +#define __SYSTEMC_EXT_TLM_CORE_2_QUANTUM_GLOBAL_QUANTUM_H__ #include <systemc> @@ -73,4 +73,4 @@ class tlm_global_quantum } // namespace tlm -#endif /* __SYSTEMC_EXT_TLM_CORE_TLM_2_TLM_QUANTUM_TLM_GLOBAL_QUANTUM_H__ */ +#endif /* __SYSTEMC_EXT_TLM_CORE_2_QUANTUM_GLOBAL_QUANTUM_H__ */ diff --git a/src/systemc/ext/tlm_core/tlm_2/tlm_quantum/tlm_quantum.h b/src/systemc/ext/tlm_core/2/quantum/quantum.h index dc7fdc296..6639d42fb 100644 --- a/src/systemc/ext/tlm_core/tlm_2/tlm_quantum/tlm_quantum.h +++ b/src/systemc/ext/tlm_core/2/quantum/quantum.h @@ -17,9 +17,9 @@ *****************************************************************************/ -#ifndef ____SYSTEMC_EXT_TLM_CORE_TLM_2_TLM_QUANTUM_TLM_QUANTUM_H__ -#define ____SYSTEMC_EXT_TLM_CORE_TLM_2_TLM_QUANTUM_TLM_QUANTUM_H__ +#ifndef ____SYSTEMC_EXT_TLM_CORE_2_QUANTUM_QUANTUM_H__ +#define ____SYSTEMC_EXT_TLM_CORE_2_QUANTUM_QUANTUM_H__ -#include "tlm_core/tlm_2/tlm_quantum/tlm_global_quantum.h" +#include "tlm_core/2/quantum/global_quantum.h" -#endif /* ____SYSTEMC_EXT_TLM_CORE_TLM_2_TLM_QUANTUM_TLM_QUANTUM_H__ */ +#endif /* ____SYSTEMC_EXT_TLM_CORE_2_QUANTUM_QUANTUM_H__ */ diff --git a/src/systemc/ext/tlm_core/tlm_2/tlm_sockets/tlm_base_socket_if.h b/src/systemc/ext/tlm_core/2/sockets/base_socket_if.h index 5dcd40129..29f3397b9 100644 --- a/src/systemc/ext/tlm_core/tlm_2/tlm_sockets/tlm_base_socket_if.h +++ b/src/systemc/ext/tlm_core/2/sockets/base_socket_if.h @@ -17,8 +17,8 @@ *****************************************************************************/ -#ifndef __SYSTEMC_EXT_TLM_CORE_TLM_2_TLM_SOCKETS_TLM_BASE_SOCKET_IF_H__ -#define __SYSTEMC_EXT_TLM_CORE_TLM_2_TLM_SOCKETS_TLM_BASE_SOCKET_IF_H__ +#ifndef __SYSTEMC_EXT_TLM_CORE_2_SOCKETS_BASE_SOCKET_IF_H__ +#define __SYSTEMC_EXT_TLM_CORE_2_SOCKETS_BASE_SOCKET_IF_H__ #include <systemc> @@ -54,4 +54,4 @@ class tlm_base_socket_if } // namespace tlm -#endif // __SYSTEMC_EXT_TLM_CORE_TLM_2_TLM_SOCKETS_TLM_BASE_SOCKET_IF_H__ +#endif // __SYSTEMC_EXT_TLM_CORE_2_SOCKETS_BASE_SOCKET_IF_H__ diff --git a/src/systemc/ext/tlm_core/tlm_2/tlm_sockets/tlm_initiator_socket.h b/src/systemc/ext/tlm_core/2/sockets/initiator_socket.h index 93ed2fddb..686f930c4 100644 --- a/src/systemc/ext/tlm_core/tlm_2/tlm_sockets/tlm_initiator_socket.h +++ b/src/systemc/ext/tlm_core/2/sockets/initiator_socket.h @@ -17,11 +17,11 @@ *****************************************************************************/ -#ifndef __SYSTEMC_EXT_TLM_CORE_TLM_2_TLM_SOCKETS_TLM_INITIATOR_SOCKET_H__ -#define __SYSTEMC_EXT_TLM_CORE_TLM_2_TLM_SOCKETS_TLM_INITIATOR_SOCKET_H__ +#ifndef __SYSTEMC_EXT_TLM_CORE_2_SOCKETS_INITIATOR_SOCKET_H__ +#define __SYSTEMC_EXT_TLM_CORE_2_SOCKETS_INITIATOR_SOCKET_H__ -#include "tlm_core/tlm_2/tlm_sockets/tlm_base_socket_if.h" -#include "tlm_core/tlm_2/tlm_2_interfaces/tlm_fw_bw_ifs.h" +#include "tlm_core/2/interfaces/fw_bw_ifs.h" +#include "tlm_core/2/sockets/base_socket_if.h" namespace tlm { @@ -201,4 +201,4 @@ class tlm_initiator_socket : public tlm_base_initiator_socket< } // namespace tlm -#endif /* __SYSTEMC_EXT_TLM_CORE_TLM_2_TLM_SOCKETS_TLM_INITIATOR_SOCKET_H__ */ +#endif /* __SYSTEMC_EXT_TLM_CORE_2_SOCKETS_INITIATOR_SOCKET_H__ */ diff --git a/src/systemc/ext/tlm_core/tlm_2/tlm_2_interfaces/tlm_2_interfaces.h b/src/systemc/ext/tlm_core/2/sockets/sockets.h index 386f7cb75..53d1819a7 100644 --- a/src/systemc/ext/tlm_core/tlm_2/tlm_2_interfaces/tlm_2_interfaces.h +++ b/src/systemc/ext/tlm_core/2/sockets/sockets.h @@ -17,10 +17,10 @@ *****************************************************************************/ -#ifndef __SYSTEMC_EXT_TLM_CORE_TLM_2_INTERFACES_TLM_2_INTERFACES_H__ -#define __SYSTEMC_EXT_TLM_CORE_TLM_2_INTERFACES_TLM_2_INTERFACES_H__ +#ifndef __SYSTEMC_EXT_TLM_CORE_2_SOCKETS_SOCKETS_H__ +#define __SYSTEMC_EXT_TLM_CORE_2_SOCKETS_SOCKETS_H__ -#include "tlm_core/tlm_2/tlm_2_interfaces/tlm_dmi.h" -#include "tlm_core/tlm_2/tlm_2_interfaces/tlm_fw_bw_ifs.h" +#include "tlm_core/2/sockets/initiator_socket.h" +#include "tlm_core/2/sockets/target_socket.h" -#endif /* __SYSTEMC_EXT_TLM_CORE_TLM_2_INTERFACES_TLM_2_INTERFACES_H__ */ +#endif /* __SYSTEMC_EXT_TLM_CORE_2_SOCKETS_SOCKETS_H__ */ diff --git a/src/systemc/ext/tlm_core/tlm_2/tlm_sockets/tlm_target_socket.h b/src/systemc/ext/tlm_core/2/sockets/target_socket.h index ba0fcc207..7493c97dc 100644 --- a/src/systemc/ext/tlm_core/tlm_2/tlm_sockets/tlm_target_socket.h +++ b/src/systemc/ext/tlm_core/2/sockets/target_socket.h @@ -17,11 +17,11 @@ *****************************************************************************/ -#ifndef __SYSTEMC_EXT_TLM_CORE_TLM_2_TLM_SOCKETS_TLM_TARGET_SOCKET_H__ -#define __SYSTEMC_EXT_TLM_CORE_TLM_2_TLM_SOCKETS_TLM_TARGET_SOCKET_H__ +#ifndef __SYSTEMC_EXT_TLM_CORE_2_SOCKETS_TARGET_SOCKET_H__ +#define __SYSTEMC_EXT_TLM_CORE_2_SOCKETS_TARGET_SOCKET_H__ -#include "tlm_core/tlm_2/tlm_sockets/tlm_base_socket_if.h" -#include "tlm_core/tlm_2/tlm_2_interfaces/tlm_fw_bw_ifs.h" +#include "tlm_core/2/interfaces/fw_bw_ifs.h" +#include "tlm_core/2/sockets/base_socket_if.h" namespace tlm { @@ -220,4 +220,4 @@ class tlm_target_socket : } // namespace tlm -#endif /* __SYSTEMC_EXT_TLM_CORE_TLM_2_TLM_SOCKETS_TLM_TARGET_SOCKET_H__ */ +#endif /* __SYSTEMC_EXT_TLM_CORE_2_SOCKETS_TARGET_SOCKET_H__ */ diff --git a/src/systemc/ext/tlm_core/tlm_2/tlm_version.h b/src/systemc/ext/tlm_core/2/version.h index 36c36debe..b7bca36ac 100644 --- a/src/systemc/ext/tlm_core/tlm_2/tlm_version.h +++ b/src/systemc/ext/tlm_core/2/version.h @@ -52,8 +52,8 @@ inline const char* tlm_copyright (void) --------------------------------------------------------------------------- */ -#ifndef __SYSTEMC_EXT_TLM_CORE_TLM_2_TLM_VERSION_H__ -#define __SYSTEMC_EXT_TLM_CORE_TLM_2_TLM_VERSION_H__ +#ifndef __SYSTEMC_EXT_TLM_CORE_2_VERSION_H__ +#define __SYSTEMC_EXT_TLM_CORE_2_VERSION_H__ namespace tlm { @@ -152,4 +152,4 @@ inline const char *tlm_copyright() { return tlm_copyright_string.c_str(); } } // namespace tlm -#endif /* __SYSTEMC_EXT_TLM_CORE_TLM_2_TLM_VERSION_H__ */ +#endif /* __SYSTEMC_EXT_TLM_CORE_2_VERSION_H__ */ diff --git a/src/systemc/ext/tlm_core/tlm_1/tlm_analysis/tlm_analysis.h b/src/systemc/ext/tlm_core/tlm_1/tlm_analysis/tlm_analysis.h deleted file mode 100644 index 661399c60..000000000 --- a/src/systemc/ext/tlm_core/tlm_1/tlm_analysis/tlm_analysis.h +++ /dev/null @@ -1,29 +0,0 @@ -/***************************************************************************** - - Licensed to Accellera Systems Initiative Inc. (Accellera) under one or - more contributor license agreements. See the NOTICE file distributed - with this work for additional information regarding copyright ownership. - Accellera licenses this file to you under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with the - License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied. See the License for the specific language governing - permissions and limitations under the License. - - *****************************************************************************/ - -#ifndef __SYSTEMC_EXT_TLM_CORE_TLM_1_TLM_ANALYSIS_TLM_ANALYSIS_H__ -#define __SYSTEMC_EXT_TLM_CORE_TLM_1_TLM_ANALYSIS_TLM_ANALYSIS_H__ - -#include "tlm_core/tlm_1/tlm_analysis/tlm_analysis_fifo.h" -#include "tlm_core/tlm_1/tlm_analysis/tlm_analysis_if.h" -#include "tlm_core/tlm_1/tlm_analysis/tlm_analysis_port.h" -#include "tlm_core/tlm_1/tlm_analysis/tlm_analysis_triple.h" -#include "tlm_core/tlm_1/tlm_analysis/tlm_write_if.h" - -#endif /* __SYSTEMC_EXT_TLM_CORE_TLM_1_TLM_ANALYSIS_TLM_ANALYSIS_H__ */ diff --git a/src/systemc/ext/tlm_core/tlm_2/tlm_generic_payload/tlm_generic_payload.h b/src/systemc/ext/tlm_core/tlm_2/tlm_generic_payload/tlm_generic_payload.h deleted file mode 100644 index c3b6b6bb0..000000000 --- a/src/systemc/ext/tlm_core/tlm_2/tlm_generic_payload/tlm_generic_payload.h +++ /dev/null @@ -1,28 +0,0 @@ -/***************************************************************************** - - Licensed to Accellera Systems Initiative Inc. (Accellera) under one or - more contributor license agreements. See the NOTICE file distributed - with this work for additional information regarding copyright ownership. - Accellera licenses this file to you under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with the - License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied. See the License for the specific language governing - permissions and limitations under the License. - - *****************************************************************************/ - -#ifndef __SYSTEMC_EXT_TLM_CORE_TLM_2_TLM_GENERIC_TLM_GENERIC_PAYLOAD_H__ -#define __SYSTEMC_EXT_TLM_CORE_TLM_2_TLM_GENERIC_TLM_GENERIC_PAYLOAD_H__ - -#include "tlm_core/tlm_2/tlm_generic_payload/tlm_endian_conv.h" -#include "tlm_core/tlm_2/tlm_generic_payload/tlm_gp.h" -#include "tlm_core/tlm_2/tlm_generic_payload/tlm_helpers.h" -#include "tlm_core/tlm_2/tlm_generic_payload/tlm_phase.h" - -#endif /* __SYSTEMC_EXT_TLM_CORE_TLM_2_TLM_GENERIC_TLM_GENERIC_PAYLOAD_H__ */ diff --git a/src/systemc/ext/tlm_utils/tlm_quantumkeeper.h b/src/systemc/ext/tlm_utils/tlm_quantumkeeper.h index 6403fd8a4..bad46ad11 100644 --- a/src/systemc/ext/tlm_utils/tlm_quantumkeeper.h +++ b/src/systemc/ext/tlm_utils/tlm_quantumkeeper.h @@ -20,7 +20,7 @@ #ifndef __SYSTEMC_EXT_TLM_UTILS_TLM_QUANTUMKEEPER_H__ #define __SYSTEMC_EXT_TLM_UTILS_TLM_QUANTUMKEEPER_H__ -#include "tlm_core/tlm_2/tlm_quantum/tlm_global_quantum.h" +#include <tlm> namespace tlm_utils { diff --git a/src/systemc/tlm_core/tlm_2/tlm_generic_payload/SConscript b/src/systemc/tlm_core/2/generic_payload/SConscript index 0d6557931..bea993450 100644 --- a/src/systemc/tlm_core/tlm_2/tlm_generic_payload/SConscript +++ b/src/systemc/tlm_core/2/generic_payload/SConscript @@ -28,5 +28,5 @@ Import('*') if env['USE_SYSTEMC']: - Source('tlm_gp.cc') - Source('tlm_phase.cc') + Source('gp.cc') + Source('phase.cc') diff --git a/src/systemc/tlm_core/tlm_2/tlm_generic_payload/tlm_gp.cc b/src/systemc/tlm_core/2/generic_payload/gp.cc index ff3c92bd9..ff3c92bd9 100644 --- a/src/systemc/tlm_core/tlm_2/tlm_generic_payload/tlm_gp.cc +++ b/src/systemc/tlm_core/2/generic_payload/gp.cc diff --git a/src/systemc/tlm_core/tlm_2/tlm_generic_payload/tlm_phase.cc b/src/systemc/tlm_core/2/generic_payload/phase.cc index 2c8b1e1a0..2c8b1e1a0 100644 --- a/src/systemc/tlm_core/tlm_2/tlm_generic_payload/tlm_phase.cc +++ b/src/systemc/tlm_core/2/generic_payload/phase.cc diff --git a/src/systemc/tlm_core/tlm_2/tlm_quantum/SConscript b/src/systemc/tlm_core/2/quantum/SConscript index bdfc2a034..a1580471f 100644 --- a/src/systemc/tlm_core/tlm_2/tlm_quantum/SConscript +++ b/src/systemc/tlm_core/2/quantum/SConscript @@ -28,4 +28,4 @@ Import('*') if env['USE_SYSTEMC']: - Source('tlm_global_quantum.cc') + Source('global_quantum.cc') diff --git a/src/systemc/tlm_core/tlm_2/tlm_quantum/tlm_global_quantum.cc b/src/systemc/tlm_core/2/quantum/global_quantum.cc index 7ba44e3cb..7ba44e3cb 100644 --- a/src/systemc/tlm_core/tlm_2/tlm_quantum/tlm_global_quantum.cc +++ b/src/systemc/tlm_core/2/quantum/global_quantum.cc |