Skip to content

Commit 93d2794

Browse files
ErickOFErickOF
committed
Fixing includes + h to hpp + split src from headers
1 parent ca4e985 commit 93d2794

37 files changed

+975
-873
lines changed

‎modules/communication/include/sobel_edge_detector_tlm.hpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
#ifndef SOBEL_EDGE_DETECTOR_TLM_HPP
22
#define SOBEL_EDGE_DETECTOR_TLM_HPP
3-
#include "systemc.h"
3+
#include <systemc.h>
4+
45
using namespace sc_core;
56
using namespace sc_dt;
67
using namespace std;
78

8-
#include "tlm.h"
9-
#include "tlm_utils/simple_initiator_socket.h"
10-
#include "tlm_utils/simple_target_socket.h"
11-
#include "tlm_utils/peq_with_cb_and_phase.h"
9+
#include <tlm.h>
10+
#include <tlm_utils/simple_initiator_socket.h>
11+
#include <tlm_utils/simple_target_socket.h>
12+
#include <tlm_utils/peq_with_cb_and_phase.h>
1213

1314
#include "sobel_edge_detector_lt_model.hpp"
14-
#include "../src/img_target.cpp"
15+
#include "img_target.hpp"
1516

1617
//Extended Unification TLM
1718
struct sobel_edge_detector_tlm : public Edge_Detector, public img_target
1819
{
19-
2020
SC_CTOR(sobel_edge_detector_tlm): Edge_Detector(Edge_Detector::name()), img_target(img_target::name()) {
2121
}
2222

@@ -25,4 +25,4 @@ struct sobel_edge_detector_tlm : public Edge_Detector, public img_target
2525
virtual void do_when_write_transaction(unsigned char*& data);
2626

2727
};
28-
#endif
28+
#endif // SOBEL_EDGE_DETECTOR_TLM_HPP

‎modules/communication/src/img_initiator.cpp

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,17 @@
33
#ifndef IMG_INITIATOR_CPP
44
#define IMG_INITIATOR_CPP
55

6-
// #include "tlm_transaction.cpp"
7-
#include "transaction_memory_manager.cpp"
6+
#include "transaction_memory_manager.hpp"
87

9-
#include "systemc.h"
8+
#include <systemc.h>
109
using namespace sc_core;
1110
using namespace sc_dt;
1211
using namespace std;
1312

14-
#include "tlm.h"
15-
#include "tlm_utils/simple_initiator_socket.h"
16-
#include "tlm_utils/simple_target_socket.h"
17-
#include "tlm_utils/peq_with_cb_and_phase.h"
13+
#include <tlm.h>
14+
#include <tlm_utils/simple_initiator_socket.h>
15+
#include <tlm_utils/simple_target_socket.h>
16+
#include <tlm_utils/peq_with_cb_and_phase.h>
1817

1918
//const char* tlm_enum_names[] = {"TLM_ACCEPTED", "TLM_UPDATED", "TLM_COMPLETED"};
2019

‎modules/communication/src/img_target.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
#ifndef IMG_TARGET_CPP
22
#define IMG_TARGET_CPP
33

4-
#include "systemc.h"
4+
#include <systemc.h>
55
using namespace sc_core;
66
using namespace sc_dt;
77
using namespace std;
88

9-
#include "tlm.h"
10-
#include "tlm_utils/simple_initiator_socket.h"
11-
#include "tlm_utils/simple_target_socket.h"
12-
#include "tlm_utils/peq_with_cb_and_phase.h"
9+
#include <tlm.h>
10+
#include <tlm_utils/simple_initiator_socket.h>
11+
#include <tlm_utils/simple_target_socket.h>
12+
#include <tlm_utils/peq_with_cb_and_phase.h>
1313

1414
//For an internal response phase
1515
DECLARE_EXTENDED_PHASE(internal_processing_ph);

‎modules/communication/src/sobel_edge_detector_tlm.cpp

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
#ifndef SOBEL_EDGE_DETECTOR_TLM_CPP
22
#define SOBEL_EDGE_DETECTOR_TLM_CPP
3-
#include "systemc.h"
3+
#include <systemc.h>
44
using namespace sc_core;
55
using namespace sc_dt;
66
using namespace std;
77

8-
#include "tlm.h"
9-
#include "tlm_utils/simple_initiator_socket.h"
10-
#include "tlm_utils/simple_target_socket.h"
11-
#include "tlm_utils/peq_with_cb_and_phase.h"
8+
#include <tlm.h>
9+
#include <tlm_utils/simple_initiator_socket.h>
10+
#include <tlm_utils/simple_target_socket.h>
11+
#include <tlm_utils/peq_with_cb_and_phase.h>
1212

1313
#include "sobel_edge_detector_tlm.hpp"
14-
// #include "tlm_transaction.cpp"
1514

1615
void sobel_edge_detector_tlm::do_when_read_transaction(unsigned char*& data){
1716
int sobel_results[2];

‎modules/communication/src/tb_edge_detector_tlm.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@ using namespace sc_core;
1919
using namespace sc_dt;
2020
using namespace std;
2121

22-
#include "tlm.h"
23-
#include "tlm_utils/simple_initiator_socket.h"
24-
#include "tlm_utils/simple_target_socket.h"
25-
#include "tlm_utils/peq_with_cb_and_phase.h"
22+
#include <tlm.h>
23+
#include <tlm_utils/simple_initiator_socket.h>
24+
#include <tlm_utils/simple_target_socket.h>
25+
#include <tlm_utils/peq_with_cb_and_phase.h>
2626

2727
#include "sobel_edge_detector_tlm.hpp"
28-
#include "img_initiator.cpp"
28+
#include "img_initiator.hpp"
2929

3030
SC_MODULE(Tb_top)
3131
{

‎modules/communication/src/transaction_memory_manager.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@
55
#ifndef TRANSACTION_MEMORY_MANAGER_CPP
66
#define TRANSACTION_MEMORY_MANAGER_CPP
77

8-
#include "systemc.h"
8+
#include <systemc.h>
99
using namespace sc_core;
1010
using namespace sc_dt;
1111
using namespace std;
1212

13-
#include "tlm.h"
14-
#include "tlm_utils/simple_initiator_socket.h"
15-
#include "tlm_utils/simple_target_socket.h"
16-
#include "tlm_utils/peq_with_cb_and_phase.h"
13+
#include <tlm.h>
14+
#include <tlm_utils/simple_initiator_socket.h>
15+
#include <tlm_utils/simple_target_socket.h>
16+
#include <tlm_utils/peq_with_cb_and_phase.h>
1717

1818
class mm: public tlm::tlm_mm_interface
1919
{

‎modules/edge-detector/include/AddressMap.h renamed to ‎modules/edge-detector/include/address_map.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#ifndef ADDRESSMAP_H
2-
#define ADDRESSMAP_H
1+
#ifndef ADDRESS_MAP_HPP
2+
#define ADDRESS_MAP_HPP
33

44
#define IMG_FILTER_KERNEL 0x00000003u
55
#define SOBEL_INPUT_0 0x00000027u
@@ -20,4 +20,4 @@
2020
#define MEM_START IMG_INPUT
2121
#define MEM_FINISH IMG_COMPRESSED + IMG_COMPRESSED_SZ
2222

23-
#endif // ADDRESSMAP_H
23+
#endif // ADDRESS_MAP_HPP

‎modules/edge-detector/include/sobel_edge_detector_at_model.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#define SOBEL_EDGE_DETECTOR_HPP
44

55
#include <systemc.h>
6-
#include "AddressMap.h"
6+
#include "address_map.hpp"
77

88
SC_MODULE(Edge_Detector)
99
{

‎modules/filter/include/ips_filter_defines.h renamed to ‎modules/filter/include/ips_filter_defines.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#ifndef IPS_FILTER_DEFINES
2-
#define IPS_FILTER_DEFINES
1+
#ifndef IPS_FILTER_DEFINES_HPP
2+
#define IPS_FILTER_DEFINES_HPP
33

44
#ifndef IPS_FILTER_KERNEL_SIZE
55
#define IPS_FILTER_KERNEL_SIZE 3
@@ -11,4 +11,4 @@
1111
#define DELAY_TIME (IPS_FILTER_KERNEL_SIZE * IPS_FILTER_KERNEL_SIZE * 1) + 4 + 2 + 1
1212
#endif // IPS_FILTER_PV_EN
1313

14-
#endif // IPS_FILTER_DEFINES
14+
#endif // IPS_FILTER_DEFINES_HPP

‎modules/filter/include/ips_filter_lt_model.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#include <systemc.h>
1010

1111
#ifdef USING_TLM_TB_EN
12-
#include "ips_filter_defines.h"
12+
#include "ips_filter_defines.hpp"
1313
#endif
1414

1515
/**

0 commit comments

Comments
 (0)