From e345154b19939db37fb391111d4dad190c62e81c Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Wed, 12 Dec 2018 16:43:18 -0800 Subject: [PATCH] systemc: Rename tlm_core header files to have a .hh extentension. This makes those files more consistent with other headers in gem5. The top level headers (tlm and tlm.h) and the tlm_utils headers were left alone since the user might reasonably expect those to have a well known name. The tlm_core headers by comparison are an implementation detail, and users shouldn't include them directly by name. Change-Id: Ibc82e8159e47717c79d76f50ed96fdd619294a06 Reviewed-on: https://gem5-review.googlesource.com/c/15067 Reviewed-by: Anthony Gutierrez Maintainer: Anthony Gutierrez --- src/systemc/ext/tlm | 14 +++++++------- .../1/analysis/{analysis.h => analysis.hh} | 16 ++++++++-------- .../{analysis_fifo.h => analysis_fifo.hh} | 12 ++++++------ .../1/analysis/{analysis_if.h => analysis_if.hh} | 8 ++++---- .../{analysis_port.h => analysis_port.hh} | 8 ++++---- .../{analysis_triple.h => analysis_triple.hh} | 6 +++--- .../1/analysis/{write_if.h => write_if.hh} | 6 +++--- .../req_rsp/adapters/{adapters.h => adapters.hh} | 8 ++++---- .../{circular_buffer.h => circular_buffer.hh} | 6 +++--- .../1/req_rsp/channels/fifo/{fifo.h => fifo.hh} | 16 ++++++++-------- .../channels/fifo/{fifo_peek.h => fifo_peek.hh} | 6 +++--- .../fifo/{fifo_put_get.h => fifo_put_get.hh} | 6 +++--- .../fifo/{fifo_resize.h => fifo_resize.hh} | 6 +++--- .../{put_get_imp.h => put_get_imp.hh} | 8 ++++---- .../{req_rsp_channels.h => req_rsp_channels.hh} | 14 ++++++++------ .../interfaces/{core_ifs.h => core_ifs.hh} | 8 ++++---- .../interfaces/{fifo_ifs.h => fifo_ifs.hh} | 8 ++++---- .../{master_slave_ifs.h => master_slave_ifs.hh} | 8 ++++---- .../1/req_rsp/interfaces/{tag.h => tag.hh} | 6 +++--- .../ports/{event_finder.h => event_finder.hh} | 8 ++++---- .../{nonblocking_port.h => nonblocking_port.hh} | 10 +++++----- .../tlm_core/1/req_rsp/{req_rsp.h => req_rsp.hh} | 14 +++++++------- .../2/generic_payload/{array.h => array.hh} | 6 +++--- .../{endian_conv.h => endian_conv.hh} | 8 ++++---- .../{generic_payload.h => generic_payload.hh} | 14 +++++++------- .../tlm_core/2/generic_payload/{gp.h => gp.hh} | 8 ++++---- .../2/generic_payload/{helpers.h => helpers.hh} | 6 +++--- .../2/generic_payload/{phase.h => phase.hh} | 6 +++--- .../ext/tlm_core/2/interfaces/{dmi.h => dmi.hh} | 6 +++--- .../2/interfaces/{fw_bw_ifs.h => fw_bw_ifs.hh} | 10 +++++----- .../2/interfaces/{interfaces.h => interfaces.hh} | 10 +++++----- .../{global_quantum.h => global_quantum.hh} | 6 +++--- .../tlm_core/2/quantum/{quantum.h => quantum.hh} | 8 ++++---- .../{base_socket_if.h => base_socket_if.hh} | 0 .../{initiator_socket.h => initiator_socket.hh} | 10 +++++----- .../tlm_core/2/sockets/{sockets.h => sockets.hh} | 10 +++++----- .../{target_socket.h => target_socket.hh} | 10 +++++----- .../ext/tlm_core/2/{version.h => version.hh} | 6 +++--- 38 files changed, 164 insertions(+), 162 deletions(-) rename src/systemc/ext/tlm_core/1/analysis/{analysis.h => analysis.hh} (70%) rename src/systemc/ext/tlm_core/1/analysis/{analysis_fifo.h => analysis_fifo.hh} (81%) rename src/systemc/ext/tlm_core/1/analysis/{analysis_if.h => analysis_if.hh} (83%) rename src/systemc/ext/tlm_core/1/analysis/{analysis_port.h => analysis_port.hh} (90%) rename src/systemc/ext/tlm_core/1/analysis/{analysis_triple.h => analysis_triple.hh} (88%) rename src/systemc/ext/tlm_core/1/analysis/{write_if.h => write_if.hh} (88%) rename src/systemc/ext/tlm_core/1/req_rsp/adapters/{adapters.h => adapters.hh} (91%) rename src/systemc/ext/tlm_core/1/req_rsp/channels/fifo/{circular_buffer.h => circular_buffer.hh} (96%) rename src/systemc/ext/tlm_core/1/req_rsp/channels/fifo/{fifo.h => fifo.hh} (92%) rename src/systemc/ext/tlm_core/1/req_rsp/channels/fifo/{fifo_peek.h => fifo_peek.hh} (91%) rename src/systemc/ext/tlm_core/1/req_rsp/channels/fifo/{fifo_put_get.h => fifo_put_get.hh} (92%) rename src/systemc/ext/tlm_core/1/req_rsp/channels/fifo/{fifo_resize.h => fifo_resize.hh} (90%) rename src/systemc/ext/tlm_core/1/req_rsp/channels/req_rsp_channels/{put_get_imp.h => put_get_imp.hh} (95%) rename src/systemc/ext/tlm_core/1/req_rsp/channels/req_rsp_channels/{req_rsp_channels.h => req_rsp_channels.hh} (93%) rename src/systemc/ext/tlm_core/1/req_rsp/interfaces/{core_ifs.h => core_ifs.hh} (95%) rename src/systemc/ext/tlm_core/1/req_rsp/interfaces/{fifo_ifs.h => fifo_ifs.hh} (92%) rename src/systemc/ext/tlm_core/1/req_rsp/interfaces/{master_slave_ifs.h => master_slave_ifs.hh} (90%) rename src/systemc/ext/tlm_core/1/req_rsp/interfaces/{tag.h => tag.hh} (84%) rename src/systemc/ext/tlm_core/1/req_rsp/ports/{event_finder.h => event_finder.hh} (90%) rename src/systemc/ext/tlm_core/1/req_rsp/ports/{nonblocking_port.h => nonblocking_port.hh} (95%) rename src/systemc/ext/tlm_core/1/req_rsp/{req_rsp.h => req_rsp.hh} (77%) rename src/systemc/ext/tlm_core/2/generic_payload/{array.h => array.hh} (94%) rename src/systemc/ext/tlm_core/2/generic_payload/{endian_conv.h => endian_conv.hh} (99%) rename src/systemc/ext/tlm_core/2/generic_payload/{generic_payload.h => generic_payload.hh} (71%) rename src/systemc/ext/tlm_core/2/generic_payload/{gp.h => gp.hh} (98%) rename src/systemc/ext/tlm_core/2/generic_payload/{helpers.h => helpers.hh} (91%) rename src/systemc/ext/tlm_core/2/generic_payload/{phase.h => phase.hh} (94%) rename src/systemc/ext/tlm_core/2/interfaces/{dmi.h => dmi.hh} (96%) rename src/systemc/ext/tlm_core/2/interfaces/{fw_bw_ifs.h => fw_bw_ifs.hh} (97%) rename src/systemc/ext/tlm_core/2/interfaces/{interfaces.h => interfaces.hh} (77%) rename src/systemc/ext/tlm_core/2/quantum/{global_quantum.h => global_quantum.hh} (92%) rename src/systemc/ext/tlm_core/2/quantum/{quantum.h => quantum.hh} (81%) rename src/systemc/ext/tlm_core/2/sockets/{base_socket_if.h => base_socket_if.hh} (100%) rename src/systemc/ext/tlm_core/2/sockets/{initiator_socket.h => initiator_socket.hh} (95%) rename src/systemc/ext/tlm_core/2/sockets/{sockets.h => sockets.hh} (78%) rename src/systemc/ext/tlm_core/2/sockets/{target_socket.h => target_socket.hh} (96%) rename src/systemc/ext/tlm_core/2/{version.h => version.hh} (97%) diff --git a/src/systemc/ext/tlm b/src/systemc/ext/tlm index 151615103..1ba078caa 100644 --- a/src/systemc/ext/tlm +++ b/src/systemc/ext/tlm @@ -23,12 +23,12 @@ #include #include // main SystemC header -#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" +#include "tlm_core/2/version.hh" +#include "tlm_core/1/analysis/analysis.hh" +#include "tlm_core/1/req_rsp/req_rsp.hh" +#include "tlm_core/2/interfaces/interfaces.hh" +#include "tlm_core/2/generic_payload/generic_payload.hh" +#include "tlm_core/2/sockets/sockets.hh" +#include "tlm_core/2/quantum/quantum.hh" #endif /* __SYSTEMC_EXT_TLM__ */ diff --git a/src/systemc/ext/tlm_core/1/analysis/analysis.h b/src/systemc/ext/tlm_core/1/analysis/analysis.hh similarity index 70% rename from src/systemc/ext/tlm_core/1/analysis/analysis.h rename to src/systemc/ext/tlm_core/1/analysis/analysis.hh index 7e8b7e4b4..13858aca3 100644 --- a/src/systemc/ext/tlm_core/1/analysis/analysis.h +++ b/src/systemc/ext/tlm_core/1/analysis/analysis.hh @@ -17,13 +17,13 @@ *****************************************************************************/ -#ifndef __SYSTEMC_EXT_TLM_CORE_1_ANALYSIS_ANALYSIS_H__ -#define __SYSTEMC_EXT_TLM_CORE_1_ANALYSIS_ANALYSIS_H__ +#ifndef __SYSTEMC_EXT_TLM_CORE_1_ANALYSIS_ANALYSIS_HH__ +#define __SYSTEMC_EXT_TLM_CORE_1_ANALYSIS_ANALYSIS_HH__ -#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" +#include "tlm_core/1/analysis/analysis_fifo.hh" +#include "tlm_core/1/analysis/analysis_if.hh" +#include "tlm_core/1/analysis/analysis_port.hh" +#include "tlm_core/1/analysis/analysis_triple.hh" +#include "tlm_core/1/analysis/write_if.hh" -#endif /* __SYSTEMC_EXT_TLM_CORE_1_ANALYSIS_ANALYSIS_H__ */ +#endif /* __SYSTEMC_EXT_TLM_CORE_1_ANALYSIS_ANALYSIS_HH__ */ diff --git a/src/systemc/ext/tlm_core/1/analysis/analysis_fifo.h b/src/systemc/ext/tlm_core/1/analysis/analysis_fifo.hh similarity index 81% rename from src/systemc/ext/tlm_core/1/analysis/analysis_fifo.h rename to src/systemc/ext/tlm_core/1/analysis/analysis_fifo.hh index ce3a27f84..33cbc1179 100644 --- a/src/systemc/ext/tlm_core/1/analysis/analysis_fifo.h +++ b/src/systemc/ext/tlm_core/1/analysis/analysis_fifo.hh @@ -17,12 +17,12 @@ *****************************************************************************/ -#ifndef __SYSTEMC_EXT_TLM_CORE_1_ANALYSIS_ANALYSIS_FIFO_H__ -#define __SYSTEMC_EXT_TLM_CORE_1_ANALYSIS_ANALYSIS_FIFO_H__ +#ifndef __SYSTEMC_EXT_TLM_CORE_1_ANALYSIS_ANALYSIS_FIFO_HH__ +#define __SYSTEMC_EXT_TLM_CORE_1_ANALYSIS_ANALYSIS_FIFO_HH__ -#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" +#include "tlm_core/1/analysis/analysis_if.hh" +#include "tlm_core/1/analysis/analysis_triple.hh" +#include "tlm_core/1/req_rsp/channels/fifo/fifo.hh" namespace tlm { @@ -43,4 +43,4 @@ class tlm_analysis_fifo : public tlm_fifo, } // namespace tlm -#endif /* __SYSTEMC_EXT_TLM_CORE_1_ANALYSIS_ANALYSIS_FIFO_H__ */ +#endif /* __SYSTEMC_EXT_TLM_CORE_1_ANALYSIS_ANALYSIS_FIFO_HH__ */ diff --git a/src/systemc/ext/tlm_core/1/analysis/analysis_if.h b/src/systemc/ext/tlm_core/1/analysis/analysis_if.hh similarity index 83% rename from src/systemc/ext/tlm_core/1/analysis/analysis_if.h rename to src/systemc/ext/tlm_core/1/analysis/analysis_if.hh index 7602c6350..880f1c186 100644 --- a/src/systemc/ext/tlm_core/1/analysis/analysis_if.h +++ b/src/systemc/ext/tlm_core/1/analysis/analysis_if.hh @@ -17,10 +17,10 @@ *****************************************************************************/ -#ifndef __SYSTEMC_EXT_TLM_CORE_1_ANALYSIS_ANALYSIS_IF_H__ -#define __SYSTEMC_EXT_TLM_CORE_1_ANALYSIS_ANALYSIS_IF_H__ +#ifndef __SYSTEMC_EXT_TLM_CORE_1_ANALYSIS_ANALYSIS_IF_HH__ +#define __SYSTEMC_EXT_TLM_CORE_1_ANALYSIS_ANALYSIS_IF_HH__ -#include "tlm_core/1/analysis/write_if.h" +#include "tlm_core/1/analysis/write_if.hh" namespace tlm { @@ -35,4 +35,4 @@ class tlm_delayed_analysis_if : public virtual tlm_delayed_write_if } // namespace tlm -#endif /* __SYSTEMC_EXT_TLM_CORE_1_ANALYSIS_ANALYSIS_IF_H__ */ +#endif /* __SYSTEMC_EXT_TLM_CORE_1_ANALYSIS_ANALYSIS_IF_HH__ */ diff --git a/src/systemc/ext/tlm_core/1/analysis/analysis_port.h b/src/systemc/ext/tlm_core/1/analysis/analysis_port.hh similarity index 90% rename from src/systemc/ext/tlm_core/1/analysis/analysis_port.h rename to src/systemc/ext/tlm_core/1/analysis/analysis_port.hh index 4d9df6d9c..21ad261fa 100644 --- a/src/systemc/ext/tlm_core/1/analysis/analysis_port.h +++ b/src/systemc/ext/tlm_core/1/analysis/analysis_port.hh @@ -17,13 +17,13 @@ *****************************************************************************/ -#ifndef __SYSTEMC_EXT_TLM_CORE_1_ANALYSIS_ANALYSIS_PORT_H__ -#define __SYSTEMC_EXT_TLM_CORE_1_ANALYSIS_ANALYSIS_PORT_H__ +#ifndef __SYSTEMC_EXT_TLM_CORE_1_ANALYSIS_ANALYSIS_PORT_HH__ +#define __SYSTEMC_EXT_TLM_CORE_1_ANALYSIS_ANALYSIS_PORT_HH__ #include #include -#include "tlm_core/1/analysis/analysis_if.h" +#include "tlm_core/1/analysis/analysis_if.hh" namespace tlm { @@ -75,4 +75,4 @@ class tlm_analysis_port : public sc_core::sc_object, } // namespace tlm -#endif /* __SYSTEMC_EXT_TLM_CORE_1_ANALYSIS_ANALYSIS_PORT_H__ */ +#endif /* __SYSTEMC_EXT_TLM_CORE_1_ANALYSIS_ANALYSIS_PORT_HH__ */ diff --git a/src/systemc/ext/tlm_core/1/analysis/analysis_triple.h b/src/systemc/ext/tlm_core/1/analysis/analysis_triple.hh similarity index 88% rename from src/systemc/ext/tlm_core/1/analysis/analysis_triple.h rename to src/systemc/ext/tlm_core/1/analysis/analysis_triple.hh index 033b738b2..efdf1acbb 100644 --- a/src/systemc/ext/tlm_core/1/analysis/analysis_triple.h +++ b/src/systemc/ext/tlm_core/1/analysis/analysis_triple.hh @@ -17,8 +17,8 @@ *****************************************************************************/ -#ifndef __SYSTEMC_EXT_TLM_CORE_1_ANALYSIS_ANALYSIS_TRIPLE_H__ -#define __SYSTEMC_EXT_TLM_CORE_1_ANALYSIS_ANALYSIS_TRIPLE_H__ +#ifndef __SYSTEMC_EXT_TLM_CORE_1_ANALYSIS_ANALYSIS_TRIPLE_HH__ +#define __SYSTEMC_EXT_TLM_CORE_1_ANALYSIS_ANALYSIS_TRIPLE_HH__ namespace tlm { @@ -50,4 +50,4 @@ struct tlm_analysis_triple } // namespace tlm -#endif /* __SYSTEMC_EXT_TLM_CORE_1_ANALYSIS_ANALYSIS_TRIPLE_H__ */ +#endif /* __SYSTEMC_EXT_TLM_CORE_1_ANALYSIS_ANALYSIS_TRIPLE_HH__ */ diff --git a/src/systemc/ext/tlm_core/1/analysis/write_if.h b/src/systemc/ext/tlm_core/1/analysis/write_if.hh similarity index 88% rename from src/systemc/ext/tlm_core/1/analysis/write_if.h rename to src/systemc/ext/tlm_core/1/analysis/write_if.hh index f4ee68d5b..0461a3a2b 100644 --- a/src/systemc/ext/tlm_core/1/analysis/write_if.h +++ b/src/systemc/ext/tlm_core/1/analysis/write_if.hh @@ -17,8 +17,8 @@ *****************************************************************************/ -#ifndef __SYSTEMC_EXT_TLM_CORE_1_ANALYSIS_WRITE_IF_H__ -#define __SYSTEMC_EXT_TLM_CORE_1_ANALYSIS_WRITE_IF_H__ +#ifndef __SYSTEMC_EXT_TLM_CORE_1_ANALYSIS_WRITE_IF_HH__ +#define __SYSTEMC_EXT_TLM_CORE_1_ANALYSIS_WRITE_IF_HH__ #include @@ -41,4 +41,4 @@ class tlm_delayed_write_if : public virtual sc_core::sc_interface } // namespace tlm -#endif /* __SYSTEMC_EXT_TLM_CORE_1_ANALYSIS_WRITE_IF_H__ */ +#endif /* __SYSTEMC_EXT_TLM_CORE_1_ANALYSIS_WRITE_IF_HH__ */ diff --git a/src/systemc/ext/tlm_core/1/req_rsp/adapters/adapters.h b/src/systemc/ext/tlm_core/1/req_rsp/adapters/adapters.hh similarity index 91% rename from src/systemc/ext/tlm_core/1/req_rsp/adapters/adapters.h rename to src/systemc/ext/tlm_core/1/req_rsp/adapters/adapters.hh index 4aee66bea..0e451aac8 100644 --- a/src/systemc/ext/tlm_core/1/req_rsp/adapters/adapters.h +++ b/src/systemc/ext/tlm_core/1/req_rsp/adapters/adapters.hh @@ -17,10 +17,10 @@ *****************************************************************************/ -#ifndef __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_ADAPTERS_H__ -#define __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_ADAPTERS_H__ +#ifndef __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_ADAPTERS_HH__ +#define __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_ADAPTERS_HH__ -#include "tlm_core/1/req_rsp/interfaces/master_slave_ifs.h" +#include "tlm_core/1/req_rsp/interfaces/master_slave_ifs.hh" namespace tlm { @@ -97,4 +97,4 @@ class tlm_slave_to_transport : public sc_core::sc_module } // namespace tlm -#endif /* __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_ADAPTERS_H__ */ +#endif /* __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_ADAPTERS_HH__ */ diff --git a/src/systemc/ext/tlm_core/1/req_rsp/channels/fifo/circular_buffer.h b/src/systemc/ext/tlm_core/1/req_rsp/channels/fifo/circular_buffer.hh similarity index 96% rename from src/systemc/ext/tlm_core/1/req_rsp/channels/fifo/circular_buffer.h rename to src/systemc/ext/tlm_core/1/req_rsp/channels/fifo/circular_buffer.hh index 7625d712c..0badaa56f 100644 --- a/src/systemc/ext/tlm_core/1/req_rsp/channels/fifo/circular_buffer.h +++ b/src/systemc/ext/tlm_core/1/req_rsp/channels/fifo/circular_buffer.hh @@ -17,8 +17,8 @@ *****************************************************************************/ -#ifndef __TLM_CORE_1_REQ_RSP_CHANNELS_FIFO_CIRCULAR_BUFFER_H__ -#define __TLM_CORE_1_REQ_RSP_CHANNELS_FIFO_CIRCULAR_BUFFER_H__ +#ifndef __TLM_CORE_1_REQ_RSP_CHANNELS_FIFO_CIRCULAR_BUFFER_HH__ +#define __TLM_CORE_1_REQ_RSP_CHANNELS_FIFO_CIRCULAR_BUFFER_HH__ #include @@ -249,4 +249,4 @@ circular_buffer::buf_clear(void *buf, int n) } // namespace tlm -#endif /* __TLM_CORE_1_REQ_RSP_CHANNELS_FIFO_CIRCULAR_BUFFER_H__ */ +#endif /* __TLM_CORE_1_REQ_RSP_CHANNELS_FIFO_CIRCULAR_BUFFER_HH__ */ diff --git a/src/systemc/ext/tlm_core/1/req_rsp/channels/fifo/fifo.h b/src/systemc/ext/tlm_core/1/req_rsp/channels/fifo/fifo.hh similarity index 92% rename from src/systemc/ext/tlm_core/1/req_rsp/channels/fifo/fifo.h rename to src/systemc/ext/tlm_core/1/req_rsp/channels/fifo/fifo.hh index a85c89045..d1ce4835b 100644 --- a/src/systemc/ext/tlm_core/1/req_rsp/channels/fifo/fifo.h +++ b/src/systemc/ext/tlm_core/1/req_rsp/channels/fifo/fifo.hh @@ -17,8 +17,8 @@ *****************************************************************************/ -#ifndef __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_CHANNELS_FIFO_FIFO_H__ -#define __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_CHANNELS_FIFO_FIFO_H__ +#ifndef __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_CHANNELS_FIFO_FIFO_HH__ +#define __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_CHANNELS_FIFO_FIFO_HH__ // // This implements put, get and peek @@ -34,8 +34,8 @@ // actual physical buffer. // -#include "tlm_core/1/req_rsp/channels/fifo/circular_buffer.h" -#include "tlm_core/1/req_rsp/interfaces/fifo_ifs.h" +#include "tlm_core/1/req_rsp/channels/fifo/circular_buffer.hh" +#include "tlm_core/1/req_rsp/interfaces/fifo_ifs.hh" namespace tlm { @@ -223,8 +223,8 @@ tlm_fifo::update() } // namespace tlm -#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" +#include "tlm_core/1/req_rsp/channels/fifo/fifo_peek.hh" +#include "tlm_core/1/req_rsp/channels/fifo/fifo_put_get.hh" +#include "tlm_core/1/req_rsp/channels/fifo/fifo_resize.hh" -#endif /* __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_CHANNELS_FIFO_FIFO_H__ */ +#endif /* __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_CHANNELS_FIFO_FIFO_HH__ */ diff --git a/src/systemc/ext/tlm_core/1/req_rsp/channels/fifo/fifo_peek.h b/src/systemc/ext/tlm_core/1/req_rsp/channels/fifo/fifo_peek.hh similarity index 91% rename from src/systemc/ext/tlm_core/1/req_rsp/channels/fifo/fifo_peek.h rename to src/systemc/ext/tlm_core/1/req_rsp/channels/fifo/fifo_peek.hh index c132852f9..843120512 100644 --- a/src/systemc/ext/tlm_core/1/req_rsp/channels/fifo/fifo_peek.h +++ b/src/systemc/ext/tlm_core/1/req_rsp/channels/fifo/fifo_peek.hh @@ -17,8 +17,8 @@ *****************************************************************************/ -#ifndef __TLM_CORE_1_REQ_RSP_CHANNELS_FIFO_FIFO_PEEK_H__ -#define __TLM_CORE_1_REQ_RSP_CHANNELS_FIFO_FIFO_PEEK_H__ +#ifndef __TLM_CORE_1_REQ_RSP_CHANNELS_FIFO_FIFO_PEEK_HH__ +#define __TLM_CORE_1_REQ_RSP_CHANNELS_FIFO_FIFO_PEEK_HH__ namespace tlm { @@ -84,4 +84,4 @@ tlm_fifo::nb_poke(const T &t, int n) } // namespace tlm -#endif /* __TLM_CORE_1_REQ_RSP_CHANNELS_FIFO_FIFO_PEEK_H__ */ +#endif /* __TLM_CORE_1_REQ_RSP_CHANNELS_FIFO_FIFO_PEEK_HH__ */ diff --git a/src/systemc/ext/tlm_core/1/req_rsp/channels/fifo/fifo_put_get.h b/src/systemc/ext/tlm_core/1/req_rsp/channels/fifo/fifo_put_get.hh similarity index 92% rename from src/systemc/ext/tlm_core/1/req_rsp/channels/fifo/fifo_put_get.h rename to src/systemc/ext/tlm_core/1/req_rsp/channels/fifo/fifo_put_get.hh index 8d34d2a56..ed419b2c7 100644 --- a/src/systemc/ext/tlm_core/1/req_rsp/channels/fifo/fifo_put_get.h +++ b/src/systemc/ext/tlm_core/1/req_rsp/channels/fifo/fifo_put_get.hh @@ -17,8 +17,8 @@ *****************************************************************************/ -#ifndef __TLM_CORE_1_REQ_RSP_CHANNELS_FIFO_FIFO_PUT_GET_H__ -#define __TLM_CORE_1_REQ_RSP_CHANNELS_FIFO_FIFO_PUT_GET_H__ +#ifndef __TLM_CORE_1_REQ_RSP_CHANNELS_FIFO_FIFO_PUT_GET_HH__ +#define __TLM_CORE_1_REQ_RSP_CHANNELS_FIFO_FIFO_PUT_GET_HH__ namespace tlm { @@ -110,4 +110,4 @@ tlm_fifo::nb_can_put(tlm_tag *) const } // namespace tlm -#endif /* __TLM_CORE_1_REQ_RSP_CHANNELS_FIFO_FIFO_PUT_GET_H__ */ +#endif /* __TLM_CORE_1_REQ_RSP_CHANNELS_FIFO_FIFO_PUT_GET_HH__ */ diff --git a/src/systemc/ext/tlm_core/1/req_rsp/channels/fifo/fifo_resize.h b/src/systemc/ext/tlm_core/1/req_rsp/channels/fifo/fifo_resize.hh similarity index 90% rename from src/systemc/ext/tlm_core/1/req_rsp/channels/fifo/fifo_resize.h rename to src/systemc/ext/tlm_core/1/req_rsp/channels/fifo/fifo_resize.hh index 3f936fb9c..31175ac41 100644 --- a/src/systemc/ext/tlm_core/1/req_rsp/channels/fifo/fifo_resize.h +++ b/src/systemc/ext/tlm_core/1/req_rsp/channels/fifo/fifo_resize.hh @@ -17,8 +17,8 @@ *****************************************************************************/ -#ifndef __TLM_CORE_1_REQ_RSP_CHANNELS_FIFO_FIFO_RESIZE_H__ -#define __TLM_CORE_1_REQ_RSP_CHANNELS_FIFO_FIFO_RESIZE_H__ +#ifndef __TLM_CORE_1_REQ_RSP_CHANNELS_FIFO_FIFO_RESIZE_HH__ +#define __TLM_CORE_1_REQ_RSP_CHANNELS_FIFO_FIFO_RESIZE_HH__ // Resize interface. namespace tlm @@ -77,4 +77,4 @@ tlm_fifo::nb_bound(unsigned int new_size) } // namespace tlm -#endif /* __TLM_CORE_1_REQ_RSP_CHANNELS_FIFO_FIFO_RESIZE_H__ */ +#endif /* __TLM_CORE_1_REQ_RSP_CHANNELS_FIFO_FIFO_RESIZE_HH__ */ diff --git a/src/systemc/ext/tlm_core/1/req_rsp/channels/req_rsp_channels/put_get_imp.h b/src/systemc/ext/tlm_core/1/req_rsp/channels/req_rsp_channels/put_get_imp.hh similarity index 95% rename from src/systemc/ext/tlm_core/1/req_rsp/channels/req_rsp_channels/put_get_imp.h rename to src/systemc/ext/tlm_core/1/req_rsp/channels/req_rsp_channels/put_get_imp.hh index e821573b9..f9821dbef 100644 --- a/src/systemc/ext/tlm_core/1/req_rsp/channels/req_rsp_channels/put_get_imp.h +++ b/src/systemc/ext/tlm_core/1/req_rsp/channels/req_rsp_channels/put_get_imp.hh @@ -18,11 +18,11 @@ *****************************************************************************/ #ifndef \ - __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_CHANNELS_REQ_RSP_CHANNELS_PUT_GET_IMP_H__ + __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_CHANNELS_REQ_RSP_CHANNELS_PUT_GET_IMP_HH__ #define \ - __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_CHANNELS_REQ_RSP_CHANNELS_PUT_GET_IMP_H__ + __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_CHANNELS_REQ_RSP_CHANNELS_PUT_GET_IMP_HH__ -#include "tlm_core/1/req_rsp/interfaces/master_slave_ifs.h" +#include "tlm_core/1/req_rsp/interfaces/master_slave_ifs.hh" namespace tlm { @@ -112,4 +112,4 @@ class tlm_slave_imp : private tlm_put_get_imp, } // namespace tlm #endif -/* __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_CHANNELS_REQ_RSP_CHANNELS_PUT_GET_IMP_H__*/ +/*__SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_CHANNELS_REQ_RSP_CHANNELS_PUT_GET_IMP_HH__*/ diff --git a/src/systemc/ext/tlm_core/1/req_rsp/channels/req_rsp_channels/req_rsp_channels.h b/src/systemc/ext/tlm_core/1/req_rsp/channels/req_rsp_channels/req_rsp_channels.hh similarity index 93% rename from src/systemc/ext/tlm_core/1/req_rsp/channels/req_rsp_channels/req_rsp_channels.h rename to src/systemc/ext/tlm_core/1/req_rsp/channels/req_rsp_channels/req_rsp_channels.hh index 321d947ea..196a72e7d 100644 --- a/src/systemc/ext/tlm_core/1/req_rsp/channels/req_rsp_channels/req_rsp_channels.h +++ b/src/systemc/ext/tlm_core/1/req_rsp/channels/req_rsp_channels/req_rsp_channels.hh @@ -17,12 +17,14 @@ *****************************************************************************/ -#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__ +#ifndef \ + __EXT_TLM_CORE_1_REQ_RSP_CHANNELS_REQ_RSP_CHANNELS_REQ_RSP_CHANNELS_HH__ +#define \ + __EXT_TLM_CORE_1_REQ_RSP_CHANNELS_REQ_RSP_CHANNELS_REQ_RSP_CHANNELS_HH__ -#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" +#include "tlm_core/1/req_rsp/adapters/adapters.hh" +#include "tlm_core/1/req_rsp/channels/fifo/fifo.hh" +#include "tlm_core/1/req_rsp/channels/req_rsp_channels/put_get_imp.hh" namespace tlm { @@ -135,4 +137,4 @@ class tlm_transport_channel : public sc_core::sc_module } // namespace tlm #endif -/* __EXT_TLM_CORE_1_REQ_RSP_CHANNELS_REQ_RSP_CHANNELS_REQ_RSP_CHANNELS_H__ */ +/* __EXT_TLM_CORE_1_REQ_RSP_CHANNELS_REQ_RSP_CHANNELS_REQ_RSP_CHANNELS_HH__ */ diff --git a/src/systemc/ext/tlm_core/1/req_rsp/interfaces/core_ifs.h b/src/systemc/ext/tlm_core/1/req_rsp/interfaces/core_ifs.hh similarity index 95% rename from src/systemc/ext/tlm_core/1/req_rsp/interfaces/core_ifs.h rename to src/systemc/ext/tlm_core/1/req_rsp/interfaces/core_ifs.hh index 2a5778784..bb05a2101 100644 --- a/src/systemc/ext/tlm_core/1/req_rsp/interfaces/core_ifs.h +++ b/src/systemc/ext/tlm_core/1/req_rsp/interfaces/core_ifs.hh @@ -17,10 +17,10 @@ *****************************************************************************/ -#ifndef __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_INTERFACES_CORE_IFS_H__ -#define __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_INTERFACES_CORE_IFS_H__ +#ifndef __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_INTERFACES_CORE_IFS_HH__ +#define __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_INTERFACES_CORE_IFS_HH__ -#include "tlm_core/1/req_rsp/interfaces/tag.h" +#include "tlm_core/1/req_rsp/interfaces/tag.hh" namespace tlm { @@ -132,4 +132,4 @@ class tlm_get_peek_if : public virtual tlm_get_if, } // namespace tlm -#endif /* __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_INTERFACES_CORE_IFS_H__ */ +#endif /* __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_INTERFACES_CORE_IFS_HH__ */ diff --git a/src/systemc/ext/tlm_core/1/req_rsp/interfaces/fifo_ifs.h b/src/systemc/ext/tlm_core/1/req_rsp/interfaces/fifo_ifs.hh similarity index 92% rename from src/systemc/ext/tlm_core/1/req_rsp/interfaces/fifo_ifs.h rename to src/systemc/ext/tlm_core/1/req_rsp/interfaces/fifo_ifs.hh index 20d3b7e08..b6d06cef8 100644 --- a/src/systemc/ext/tlm_core/1/req_rsp/interfaces/fifo_ifs.h +++ b/src/systemc/ext/tlm_core/1/req_rsp/interfaces/fifo_ifs.hh @@ -17,10 +17,10 @@ *****************************************************************************/ -#ifndef __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_INTERFACES_FIFO_IFS_H__ -#define __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_INTERFACES_FIFO_IFS_H__ +#ifndef __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_INTERFACES_FIFO_IFS_HH__ +#define __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_INTERFACES_FIFO_IFS_HH__ -#include "tlm_core/1/req_rsp/interfaces/core_ifs.h" +#include "tlm_core/1/req_rsp/interfaces/core_ifs.hh" namespace tlm { @@ -76,4 +76,4 @@ class tlm_fifo_config_size_if : public virtual sc_core::sc_interface } // namespace tlm -#endif /* __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_INTERFACES_FIFO_IFS_H__ */ +#endif /* __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_INTERFACES_FIFO_IFS_HH__ */ diff --git a/src/systemc/ext/tlm_core/1/req_rsp/interfaces/master_slave_ifs.h b/src/systemc/ext/tlm_core/1/req_rsp/interfaces/master_slave_ifs.hh similarity index 90% rename from src/systemc/ext/tlm_core/1/req_rsp/interfaces/master_slave_ifs.h rename to src/systemc/ext/tlm_core/1/req_rsp/interfaces/master_slave_ifs.hh index a1411c9ee..04c28ce60 100644 --- a/src/systemc/ext/tlm_core/1/req_rsp/interfaces/master_slave_ifs.h +++ b/src/systemc/ext/tlm_core/1/req_rsp/interfaces/master_slave_ifs.hh @@ -17,10 +17,10 @@ *****************************************************************************/ -#ifndef __TLM_CORE_1_REQ_RSP_INTERFACES_MASTER_SLAVE_IFS_H__ -#define __TLM_CORE_1_REQ_RSP_INTERFACES_MASTER_SLAVE_IFS_H__ +#ifndef __TLM_CORE_1_REQ_RSP_INTERFACES_MASTER_SLAVE_IFS_HH__ +#define __TLM_CORE_1_REQ_RSP_INTERFACES_MASTER_SLAVE_IFS_HH__ -#include "tlm_core/1/req_rsp/interfaces/core_ifs.h" +#include "tlm_core/1/req_rsp/interfaces/core_ifs.hh" namespace tlm { @@ -72,4 +72,4 @@ class tlm_slave_if : public virtual tlm_put_if, } // namespace tlm -#endif /* __TLM_CORE_1_REQ_RSP_INTERFACES_MASTER_SLAVE_IFS_H__ */ +#endif /* __TLM_CORE_1_REQ_RSP_INTERFACES_MASTER_SLAVE_IFS_HH__ */ diff --git a/src/systemc/ext/tlm_core/1/req_rsp/interfaces/tag.h b/src/systemc/ext/tlm_core/1/req_rsp/interfaces/tag.hh similarity index 84% rename from src/systemc/ext/tlm_core/1/req_rsp/interfaces/tag.h rename to src/systemc/ext/tlm_core/1/req_rsp/interfaces/tag.hh index 7aa7581c8..19e5f7a70 100644 --- a/src/systemc/ext/tlm_core/1/req_rsp/interfaces/tag.h +++ b/src/systemc/ext/tlm_core/1/req_rsp/interfaces/tag.hh @@ -17,8 +17,8 @@ *****************************************************************************/ -#ifndef __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_INTERFACES_TAG_H__ -#define __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_INTERFACES_TAG_H__ +#ifndef __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_INTERFACES_TAG_HH__ +#define __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_INTERFACES_TAG_HH__ namespace tlm { @@ -29,4 +29,4 @@ class tlm_tag } -#endif /* __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_INTERFACES_TAG_H__ */ +#endif /* __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_INTERFACES_TAG_HH__ */ diff --git a/src/systemc/ext/tlm_core/1/req_rsp/ports/event_finder.h b/src/systemc/ext/tlm_core/1/req_rsp/ports/event_finder.hh similarity index 90% rename from src/systemc/ext/tlm_core/1/req_rsp/ports/event_finder.h rename to src/systemc/ext/tlm_core/1/req_rsp/ports/event_finder.hh index 61ac88664..2e411ebad 100644 --- a/src/systemc/ext/tlm_core/1/req_rsp/ports/event_finder.h +++ b/src/systemc/ext/tlm_core/1/req_rsp/ports/event_finder.hh @@ -17,10 +17,10 @@ *****************************************************************************/ -#ifndef __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_PORTS_EVENT_FINDER_H__ -#define __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_PORTS_EVENT_FINDER_H__ +#ifndef __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_PORTS_EVENT_FINDER_HH__ +#define __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_PORTS_EVENT_FINDER_HH__ -#include "tlm_core/1/req_rsp/interfaces/tag.h" +#include "tlm_core/1/req_rsp/interfaces/tag.hh" namespace tlm { @@ -65,4 +65,4 @@ tlm_event_finder_t::find_event(sc_core::sc_interface *if_p) const } // namespace tlm -#endif /* __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_PORTS_EVENT_FINDER_H__ */ +#endif /* __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_PORTS_EVENT_FINDER_HH__ */ diff --git a/src/systemc/ext/tlm_core/1/req_rsp/ports/nonblocking_port.h b/src/systemc/ext/tlm_core/1/req_rsp/ports/nonblocking_port.hh similarity index 95% rename from src/systemc/ext/tlm_core/1/req_rsp/ports/nonblocking_port.h rename to src/systemc/ext/tlm_core/1/req_rsp/ports/nonblocking_port.hh index 099d2fe7c..65964d3d2 100644 --- a/src/systemc/ext/tlm_core/1/req_rsp/ports/nonblocking_port.h +++ b/src/systemc/ext/tlm_core/1/req_rsp/ports/nonblocking_port.hh @@ -17,11 +17,11 @@ *****************************************************************************/ -#ifndef __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_PORTS_NONBLOCKING_PORT_H__ -#define __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_PORTS_NONBLOCKING_PORT_H__ +#ifndef __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_PORTS_NONBLOCKING_PORT_HH__ +#define __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_PORTS_NONBLOCKING_PORT_HH__ -#include "tlm_core/1/req_rsp/interfaces/core_ifs.h" -#include "tlm_core/1/req_rsp/ports/event_finder.h" +#include "tlm_core/1/req_rsp/interfaces/core_ifs.hh" +#include "tlm_core/1/req_rsp/ports/event_finder.hh" namespace tlm { @@ -85,4 +85,4 @@ class tlm_nonblocking_put_port : } // namespace tlm -#endif /* __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_PORTS_NONBLOCKING_PORT_H__ */ +#endif /* __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_PORTS_NONBLOCKING_PORT_HH__ */ diff --git a/src/systemc/ext/tlm_core/1/req_rsp/req_rsp.h b/src/systemc/ext/tlm_core/1/req_rsp/req_rsp.hh similarity index 77% rename from src/systemc/ext/tlm_core/1/req_rsp/req_rsp.h rename to src/systemc/ext/tlm_core/1/req_rsp/req_rsp.hh index 746a8598a..30acf829b 100644 --- a/src/systemc/ext/tlm_core/1/req_rsp/req_rsp.h +++ b/src/systemc/ext/tlm_core/1/req_rsp/req_rsp.hh @@ -17,20 +17,20 @@ *****************************************************************************/ -#ifndef __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_REQ_RSP_H__ -#define __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_REQ_RSP_H__ +#ifndef __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_REQ_RSP_HH__ +#define __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_REQ_RSP_HH__ // The unannotated TLM interfaces. -#include "tlm_core/1/req_rsp/interfaces/core_ifs.h" -#include "tlm_core/1/req_rsp/interfaces/master_slave_ifs.h" +#include "tlm_core/1/req_rsp/interfaces/core_ifs.hh" +#include "tlm_core/1/req_rsp/interfaces/master_slave_ifs.hh" // The channels : tlm_fifo, tlm_transport_channel and tlm_req_rsp_channel. -#include "tlm_core/1/req_rsp/channels/req_rsp_channels/req_rsp_channels.h" +#include "tlm_core/1/req_rsp/channels/req_rsp_channels/req_rsp_channels.hh" // Some non blocking ports to provide static sensitivity. -#include "tlm_core/1/req_rsp/ports/nonblocking_port.h" +#include "tlm_core/1/req_rsp/ports/nonblocking_port.hh" -#endif /* __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_REQ_RSP_H__ */ +#endif /* __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_REQ_RSP_HH__ */ diff --git a/src/systemc/ext/tlm_core/2/generic_payload/array.h b/src/systemc/ext/tlm_core/2/generic_payload/array.hh similarity index 94% rename from src/systemc/ext/tlm_core/2/generic_payload/array.h rename to src/systemc/ext/tlm_core/2/generic_payload/array.hh index 1c6c724a4..8650e6888 100644 --- a/src/systemc/ext/tlm_core/2/generic_payload/array.h +++ b/src/systemc/ext/tlm_core/2/generic_payload/array.hh @@ -17,8 +17,8 @@ *****************************************************************************/ -#ifndef __SYSTEMC_EXT_TLM_CORE_2_GENERIC_PAYLOADS_ARRAY_H__ -#define __SYSTEMC_EXT_TLM_CORE_2_GENERIC_PAYLOADS_ARRAY_H__ +#ifndef __SYSTEMC_EXT_TLM_CORE_2_GENERIC_PAYLOADS_ARRAY_HH__ +#define __SYSTEMC_EXT_TLM_CORE_2_GENERIC_PAYLOADS_ARRAY_HH__ #include @@ -95,4 +95,4 @@ const char *const tlm_array::kind_string = "tlm_array"; } // namespace tlm -#endif /* __SYSTEMC_EXT_TLM_CORE_2_GENERIC_PAYLOADS_ARRAY_H__ */ +#endif /* __SYSTEMC_EXT_TLM_CORE_2_GENERIC_PAYLOADS_ARRAY_HH__ */ diff --git a/src/systemc/ext/tlm_core/2/generic_payload/endian_conv.h b/src/systemc/ext/tlm_core/2/generic_payload/endian_conv.hh similarity index 99% rename from src/systemc/ext/tlm_core/2/generic_payload/endian_conv.h rename to src/systemc/ext/tlm_core/2/generic_payload/endian_conv.hh index 50d5e6873..07dcef74c 100644 --- a/src/systemc/ext/tlm_core/2/generic_payload/endian_conv.h +++ b/src/systemc/ext/tlm_core/2/generic_payload/endian_conv.hh @@ -18,12 +18,12 @@ *****************************************************************************/ -#ifndef __SYSTEMC_EXT_TLM_CORE_2_GENERIC_PAYLOAD_ENDIAN_CONV_H__ -#define __SYSTEMC_EXT_TLM_CORE_2_GENERIC_PAYLOAD_ENDIAN_CONV_H__ +#ifndef __SYSTEMC_EXT_TLM_CORE_2_GENERIC_PAYLOAD_ENDIAN_CONV_HH__ +#define __SYSTEMC_EXT_TLM_CORE_2_GENERIC_PAYLOAD_ENDIAN_CONV_HH__ #include // std::memset -#include "tlm_core/2/generic_payload/gp.h" +#include "tlm_core/2/generic_payload/gp.hh" namespace tlm { @@ -938,4 +938,4 @@ tlm_from_hostendian(tlm_generic_payload *txn) } // namespace tlm -#endif /* __SYSTEMC_EXT_TLM_CORE_2_GENERIC_PAYLOAD_ENDIAN_CONV_H__ */ +#endif /* __SYSTEMC_EXT_TLM_CORE_2_GENERIC_PAYLOAD_ENDIAN_CONV_HH__ */ 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.hh similarity index 71% rename from src/systemc/ext/tlm_core/2/generic_payload/generic_payload.h rename to src/systemc/ext/tlm_core/2/generic_payload/generic_payload.hh index fb10b8809..4e03bb907 100644 --- a/src/systemc/ext/tlm_core/2/generic_payload/generic_payload.h +++ b/src/systemc/ext/tlm_core/2/generic_payload/generic_payload.hh @@ -17,12 +17,12 @@ *****************************************************************************/ -#ifndef __SYSTEMC_EXT_TLM_CORE_2_GENERIC_GENERIC_PAYLOAD_H__ -#define __SYSTEMC_EXT_TLM_CORE_2_GENERIC_GENERIC_PAYLOAD_H__ +#ifndef __SYSTEMC_EXT_TLM_CORE_2_GENERIC_GENERIC_PAYLOAD_HH__ +#define __SYSTEMC_EXT_TLM_CORE_2_GENERIC_GENERIC_PAYLOAD_HH__ -#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" +#include "tlm_core/2/generic_payload/endian_conv.hh" +#include "tlm_core/2/generic_payload/gp.hh" +#include "tlm_core/2/generic_payload/helpers.hh" +#include "tlm_core/2/generic_payload/phase.hh" -#endif /* __SYSTEMC_EXT_TLM_CORE_2_GENERIC_GENERIC_PAYLOAD_H__ */ +#endif /* __SYSTEMC_EXT_TLM_CORE_2_GENERIC_GENERIC_PAYLOAD_HH__ */ diff --git a/src/systemc/ext/tlm_core/2/generic_payload/gp.h b/src/systemc/ext/tlm_core/2/generic_payload/gp.hh similarity index 98% rename from src/systemc/ext/tlm_core/2/generic_payload/gp.h rename to src/systemc/ext/tlm_core/2/generic_payload/gp.hh index 84bc25a01..80ceb6a20 100644 --- a/src/systemc/ext/tlm_core/2/generic_payload/gp.h +++ b/src/systemc/ext/tlm_core/2/generic_payload/gp.hh @@ -17,13 +17,13 @@ *****************************************************************************/ -#ifndef __SYSTEMC_EXT_TLM_CORE_2_GENERIC_PAYLOAD_GP_H__ -#define __SYSTEMC_EXT_TLM_CORE_2_GENERIC_PAYLOAD_GP_H__ +#ifndef __SYSTEMC_EXT_TLM_CORE_2_GENERIC_PAYLOAD_GP_HH__ +#define __SYSTEMC_EXT_TLM_CORE_2_GENERIC_PAYLOAD_GP_HH__ #include #include // std::type_info -#include "tlm_core/2/generic_payload/array.h" +#include "tlm_core/2/generic_payload/array.hh" namespace tlm { @@ -425,4 +425,4 @@ class tlm_generic_payload } // namespace tlm -#endif /* __SYSTEMC_EXT_TLM_CORE_2_GENERIC_PAYLOAD_GP_H__ */ +#endif /* __SYSTEMC_EXT_TLM_CORE_2_GENERIC_PAYLOAD_GP_HH__ */ diff --git a/src/systemc/ext/tlm_core/2/generic_payload/helpers.h b/src/systemc/ext/tlm_core/2/generic_payload/helpers.hh similarity index 91% rename from src/systemc/ext/tlm_core/2/generic_payload/helpers.h rename to src/systemc/ext/tlm_core/2/generic_payload/helpers.hh index 4ec4faeeb..ec1582a89 100644 --- a/src/systemc/ext/tlm_core/2/generic_payload/helpers.h +++ b/src/systemc/ext/tlm_core/2/generic_payload/helpers.hh @@ -17,8 +17,8 @@ *****************************************************************************/ -#ifndef __SYSTEMC_EXT_TLM_CORE_2_GENERIC_PAYLOAD_HELPERS_H__ -#define __SYSTEMC_EXT_TLM_CORE_2_GENERIC_PAYLOAD_HELPERS_H__ +#ifndef __SYSTEMC_EXT_TLM_CORE_2_GENERIC_PAYLOAD_HELPERS_HH__ +#define __SYSTEMC_EXT_TLM_CORE_2_GENERIC_PAYLOAD_HELPERS_HH__ namespace tlm { @@ -67,4 +67,4 @@ has_host_endianness(tlm_endianness endianness) } // namespace tlm -#endif /* __SYSTEMC_EXT_TLM_CORE_2_GENERIC_PAYLOAD_HELPERS_H__ */ +#endif /* __SYSTEMC_EXT_TLM_CORE_2_GENERIC_PAYLOAD_HELPERS_HH__ */ diff --git a/src/systemc/ext/tlm_core/2/generic_payload/phase.h b/src/systemc/ext/tlm_core/2/generic_payload/phase.hh similarity index 94% rename from src/systemc/ext/tlm_core/2/generic_payload/phase.h rename to src/systemc/ext/tlm_core/2/generic_payload/phase.hh index ca58b2f9d..db5866a6b 100644 --- a/src/systemc/ext/tlm_core/2/generic_payload/phase.h +++ b/src/systemc/ext/tlm_core/2/generic_payload/phase.hh @@ -17,8 +17,8 @@ *****************************************************************************/ -#ifndef __SYSTEMC_EXT_TLM_CORE_2_GENERIC_PAYLOAD_PHASE_H__ -#define __SYSTEMC_EXT_TLM_CORE_2_GENERIC_PAYLOAD_PHASE_H__ +#ifndef __SYSTEMC_EXT_TLM_CORE_2_GENERIC_PAYLOAD_PHASE_HH__ +#define __SYSTEMC_EXT_TLM_CORE_2_GENERIC_PAYLOAD_PHASE_HH__ #include #include @@ -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_2_GENERIC_PAYLOAD_PHASE_H__ */ +#endif /* __SYSTEMC_EXT_TLM_CORE_2_GENERIC_PAYLOAD_PHASE_HH__ */ diff --git a/src/systemc/ext/tlm_core/2/interfaces/dmi.h b/src/systemc/ext/tlm_core/2/interfaces/dmi.hh similarity index 96% rename from src/systemc/ext/tlm_core/2/interfaces/dmi.h rename to src/systemc/ext/tlm_core/2/interfaces/dmi.hh index 1e019e0b6..b00f0990c 100644 --- a/src/systemc/ext/tlm_core/2/interfaces/dmi.h +++ b/src/systemc/ext/tlm_core/2/interfaces/dmi.hh @@ -17,8 +17,8 @@ *****************************************************************************/ -#ifndef __SYSTEMC_EXT_TLM_CORE_2_INTERFACES_DMI_H__ -#define __SYSTEMC_EXT_TLM_CORE_2_INTERFACES_DMI_H__ +#ifndef __SYSTEMC_EXT_TLM_CORE_2_INTERFACES_DMI_HH__ +#define __SYSTEMC_EXT_TLM_CORE_2_INTERFACES_DMI_HH__ #include @@ -121,4 +121,4 @@ class tlm_dmi } // namespace tlm -#endif /* __SYSTEMC_EXT_TLM_CORE_2_INTERFACES_DMI_H__ */ +#endif /* __SYSTEMC_EXT_TLM_CORE_2_INTERFACES_DMI_HH__ */ diff --git a/src/systemc/ext/tlm_core/2/interfaces/fw_bw_ifs.h b/src/systemc/ext/tlm_core/2/interfaces/fw_bw_ifs.hh similarity index 97% rename from src/systemc/ext/tlm_core/2/interfaces/fw_bw_ifs.h rename to src/systemc/ext/tlm_core/2/interfaces/fw_bw_ifs.hh index 032ca3982..76946532d 100644 --- a/src/systemc/ext/tlm_core/2/interfaces/fw_bw_ifs.h +++ b/src/systemc/ext/tlm_core/2/interfaces/fw_bw_ifs.hh @@ -17,13 +17,13 @@ *****************************************************************************/ -#ifndef __SYSTEMC_EXT_TLM_CORE_2_INTERFACES_FW_BW_IFS_H__ -#define __SYSTEMC_EXT_TLM_CORE_2_INTERFACES_FW_BW_IFS_H__ +#ifndef __SYSTEMC_EXT_TLM_CORE_2_INTERFACES_FW_BW_IFS_HH__ +#define __SYSTEMC_EXT_TLM_CORE_2_INTERFACES_FW_BW_IFS_HH__ #include -#include "tlm_core/2/generic_payload/generic_payload.h" -#include "tlm_core/2/interfaces/dmi.h" +#include "tlm_core/2/generic_payload/generic_payload.hh" +#include "tlm_core/2/interfaces/dmi.hh" namespace tlm { @@ -219,4 +219,4 @@ class tlm_bw_transport_if : } // namespace tlm -#endif /* __SYSTEMC_EXT_TLM_CORE_2_INTERFACES_FW_BW_IFS_H__ */ +#endif /* __SYSTEMC_EXT_TLM_CORE_2_INTERFACES_FW_BW_IFS_HH__ */ diff --git a/src/systemc/ext/tlm_core/2/interfaces/interfaces.h b/src/systemc/ext/tlm_core/2/interfaces/interfaces.hh similarity index 77% rename from src/systemc/ext/tlm_core/2/interfaces/interfaces.h rename to src/systemc/ext/tlm_core/2/interfaces/interfaces.hh index bab1536ad..888683473 100644 --- a/src/systemc/ext/tlm_core/2/interfaces/interfaces.h +++ b/src/systemc/ext/tlm_core/2/interfaces/interfaces.hh @@ -17,10 +17,10 @@ *****************************************************************************/ -#ifndef __SYSTEMC_EXT_TLM_CORE_2_INTERFACES_INTERFACES_H__ -#define __SYSTEMC_EXT_TLM_CORE_2_INTERFACES_INTERFACES_H__ +#ifndef __SYSTEMC_EXT_TLM_CORE_2_INTERFACES_INTERFACES_HH__ +#define __SYSTEMC_EXT_TLM_CORE_2_INTERFACES_INTERFACES_HH__ -#include "tlm_core/2/interfaces/dmi.h" -#include "tlm_core/2/interfaces/fw_bw_ifs.h" +#include "tlm_core/2/interfaces/dmi.hh" +#include "tlm_core/2/interfaces/fw_bw_ifs.hh" -#endif /* __SYSTEMC_EXT_TLM_CORE_2_INTERFACES_INTERFACES_H__ */ +#endif /* __SYSTEMC_EXT_TLM_CORE_2_INTERFACES_INTERFACES_HH__ */ diff --git a/src/systemc/ext/tlm_core/2/quantum/global_quantum.h b/src/systemc/ext/tlm_core/2/quantum/global_quantum.hh similarity index 92% rename from src/systemc/ext/tlm_core/2/quantum/global_quantum.h rename to src/systemc/ext/tlm_core/2/quantum/global_quantum.hh index 54fcd5c2c..5b6e267d1 100644 --- a/src/systemc/ext/tlm_core/2/quantum/global_quantum.h +++ b/src/systemc/ext/tlm_core/2/quantum/global_quantum.hh @@ -17,8 +17,8 @@ *****************************************************************************/ -#ifndef __SYSTEMC_EXT_TLM_CORE_2_QUANTUM_GLOBAL_QUANTUM_H__ -#define __SYSTEMC_EXT_TLM_CORE_2_QUANTUM_GLOBAL_QUANTUM_H__ +#ifndef __SYSTEMC_EXT_TLM_CORE_2_QUANTUM_GLOBAL_QUANTUM_HH__ +#define __SYSTEMC_EXT_TLM_CORE_2_QUANTUM_GLOBAL_QUANTUM_HH__ #include @@ -73,4 +73,4 @@ class tlm_global_quantum } // namespace tlm -#endif /* __SYSTEMC_EXT_TLM_CORE_2_QUANTUM_GLOBAL_QUANTUM_H__ */ +#endif /* __SYSTEMC_EXT_TLM_CORE_2_QUANTUM_GLOBAL_QUANTUM_HH__ */ diff --git a/src/systemc/ext/tlm_core/2/quantum/quantum.h b/src/systemc/ext/tlm_core/2/quantum/quantum.hh similarity index 81% rename from src/systemc/ext/tlm_core/2/quantum/quantum.h rename to src/systemc/ext/tlm_core/2/quantum/quantum.hh index 6639d42fb..b46047e63 100644 --- a/src/systemc/ext/tlm_core/2/quantum/quantum.h +++ b/src/systemc/ext/tlm_core/2/quantum/quantum.hh @@ -17,9 +17,9 @@ *****************************************************************************/ -#ifndef ____SYSTEMC_EXT_TLM_CORE_2_QUANTUM_QUANTUM_H__ -#define ____SYSTEMC_EXT_TLM_CORE_2_QUANTUM_QUANTUM_H__ +#ifndef ____SYSTEMC_EXT_TLM_CORE_2_QUANTUM_QUANTUM_HH__ +#define ____SYSTEMC_EXT_TLM_CORE_2_QUANTUM_QUANTUM_HH__ -#include "tlm_core/2/quantum/global_quantum.h" +#include "tlm_core/2/quantum/global_quantum.hh" -#endif /* ____SYSTEMC_EXT_TLM_CORE_2_QUANTUM_QUANTUM_H__ */ +#endif /* ____SYSTEMC_EXT_TLM_CORE_2_QUANTUM_QUANTUM_HH__ */ diff --git a/src/systemc/ext/tlm_core/2/sockets/base_socket_if.h b/src/systemc/ext/tlm_core/2/sockets/base_socket_if.hh similarity index 100% rename from src/systemc/ext/tlm_core/2/sockets/base_socket_if.h rename to src/systemc/ext/tlm_core/2/sockets/base_socket_if.hh diff --git a/src/systemc/ext/tlm_core/2/sockets/initiator_socket.h b/src/systemc/ext/tlm_core/2/sockets/initiator_socket.hh similarity index 95% rename from src/systemc/ext/tlm_core/2/sockets/initiator_socket.h rename to src/systemc/ext/tlm_core/2/sockets/initiator_socket.hh index 686f930c4..91c147bc9 100644 --- a/src/systemc/ext/tlm_core/2/sockets/initiator_socket.h +++ b/src/systemc/ext/tlm_core/2/sockets/initiator_socket.hh @@ -17,11 +17,11 @@ *****************************************************************************/ -#ifndef __SYSTEMC_EXT_TLM_CORE_2_SOCKETS_INITIATOR_SOCKET_H__ -#define __SYSTEMC_EXT_TLM_CORE_2_SOCKETS_INITIATOR_SOCKET_H__ +#ifndef __SYSTEMC_EXT_TLM_CORE_2_SOCKETS_INITIATOR_SOCKET_HH__ +#define __SYSTEMC_EXT_TLM_CORE_2_SOCKETS_INITIATOR_SOCKET_HH__ -#include "tlm_core/2/interfaces/fw_bw_ifs.h" -#include "tlm_core/2/sockets/base_socket_if.h" +#include "tlm_core/2/interfaces/fw_bw_ifs.hh" +#include "tlm_core/2/sockets/base_socket_if.hh" namespace tlm { @@ -201,4 +201,4 @@ class tlm_initiator_socket : public tlm_base_initiator_socket< } // namespace tlm -#endif /* __SYSTEMC_EXT_TLM_CORE_2_SOCKETS_INITIATOR_SOCKET_H__ */ +#endif /* __SYSTEMC_EXT_TLM_CORE_2_SOCKETS_INITIATOR_SOCKET_HH__ */ diff --git a/src/systemc/ext/tlm_core/2/sockets/sockets.h b/src/systemc/ext/tlm_core/2/sockets/sockets.hh similarity index 78% rename from src/systemc/ext/tlm_core/2/sockets/sockets.h rename to src/systemc/ext/tlm_core/2/sockets/sockets.hh index 53d1819a7..781c51a26 100644 --- a/src/systemc/ext/tlm_core/2/sockets/sockets.h +++ b/src/systemc/ext/tlm_core/2/sockets/sockets.hh @@ -17,10 +17,10 @@ *****************************************************************************/ -#ifndef __SYSTEMC_EXT_TLM_CORE_2_SOCKETS_SOCKETS_H__ -#define __SYSTEMC_EXT_TLM_CORE_2_SOCKETS_SOCKETS_H__ +#ifndef __SYSTEMC_EXT_TLM_CORE_2_SOCKETS_SOCKETS_HH__ +#define __SYSTEMC_EXT_TLM_CORE_2_SOCKETS_SOCKETS_HH__ -#include "tlm_core/2/sockets/initiator_socket.h" -#include "tlm_core/2/sockets/target_socket.h" +#include "tlm_core/2/sockets/initiator_socket.hh" +#include "tlm_core/2/sockets/target_socket.hh" -#endif /* __SYSTEMC_EXT_TLM_CORE_2_SOCKETS_SOCKETS_H__ */ +#endif /* __SYSTEMC_EXT_TLM_CORE_2_SOCKETS_SOCKETS_HH__ */ diff --git a/src/systemc/ext/tlm_core/2/sockets/target_socket.h b/src/systemc/ext/tlm_core/2/sockets/target_socket.hh similarity index 96% rename from src/systemc/ext/tlm_core/2/sockets/target_socket.h rename to src/systemc/ext/tlm_core/2/sockets/target_socket.hh index 7493c97dc..b412a7d5c 100644 --- a/src/systemc/ext/tlm_core/2/sockets/target_socket.h +++ b/src/systemc/ext/tlm_core/2/sockets/target_socket.hh @@ -17,11 +17,11 @@ *****************************************************************************/ -#ifndef __SYSTEMC_EXT_TLM_CORE_2_SOCKETS_TARGET_SOCKET_H__ -#define __SYSTEMC_EXT_TLM_CORE_2_SOCKETS_TARGET_SOCKET_H__ +#ifndef __SYSTEMC_EXT_TLM_CORE_2_SOCKETS_TARGET_SOCKET_HH__ +#define __SYSTEMC_EXT_TLM_CORE_2_SOCKETS_TARGET_SOCKET_HH__ -#include "tlm_core/2/interfaces/fw_bw_ifs.h" -#include "tlm_core/2/sockets/base_socket_if.h" +#include "tlm_core/2/interfaces/fw_bw_ifs.hh" +#include "tlm_core/2/sockets/base_socket_if.hh" namespace tlm { @@ -220,4 +220,4 @@ class tlm_target_socket : } // namespace tlm -#endif /* __SYSTEMC_EXT_TLM_CORE_2_SOCKETS_TARGET_SOCKET_H__ */ +#endif /* __SYSTEMC_EXT_TLM_CORE_2_SOCKETS_TARGET_SOCKET_HH__ */ diff --git a/src/systemc/ext/tlm_core/2/version.h b/src/systemc/ext/tlm_core/2/version.hh similarity index 97% rename from src/systemc/ext/tlm_core/2/version.h rename to src/systemc/ext/tlm_core/2/version.hh index b7bca36ac..2c52c3413 100644 --- a/src/systemc/ext/tlm_core/2/version.h +++ b/src/systemc/ext/tlm_core/2/version.hh @@ -52,8 +52,8 @@ inline const char* tlm_copyright (void) --------------------------------------------------------------------------- */ -#ifndef __SYSTEMC_EXT_TLM_CORE_2_VERSION_H__ -#define __SYSTEMC_EXT_TLM_CORE_2_VERSION_H__ +#ifndef __SYSTEMC_EXT_TLM_CORE_2_VERSION_HH__ +#define __SYSTEMC_EXT_TLM_CORE_2_VERSION_HH__ namespace tlm { @@ -152,4 +152,4 @@ inline const char *tlm_copyright() { return tlm_copyright_string.c_str(); } } // namespace tlm -#endif /* __SYSTEMC_EXT_TLM_CORE_2_VERSION_H__ */ +#endif /* __SYSTEMC_EXT_TLM_CORE_2_VERSION_HH__ */ -- 2.30.2