Changeset 35

Timestamp:

May 25, 2010, 4:54:56 PM (14 years ago)

Author:

simerabe

Message:

fixing bug : multi-inclusion control

Location:

trunk

Files:

• lib/vci_ring_initiator/caba/source/include/vci_ring_initiator.h (modified) (2 diffs)
• lib/vci_ring_target/caba/source/include/vci_ring_target.h (modified) (2 diffs)
• modules/half_gateway_initiator_2/caba/source/include/half_gateway_initiator_2.h (modified) (2 diffs)
• modules/half_gateway_target_2/caba/source/include/half_gateway_target_2.h (modified) (3 diffs)

trunk/lib/vci_ring_initiator/caba/source/include/vci_ring_initiator.h

@@ -64 +64 @@
 //     (40)       (1)   (5)                     (34)                                    
 /////////////////////////////////////////////////////////////////////////////////////
+#ifndef SOCLIB_CABA_VCI_RING_INITIATOR_H
+#define SOCLIB_CABA_VCI_RING_INITIATOR_H
 
 #include "vci_target.h"
@@ -701 +703 @@
 
 }} // end namespace
-
-
+#endif // SOCLIB_CABA_VCI_RING_INITIATOR_H
+
+

trunk/lib/vci_ring_target/caba/source/include/vci_ring_target.h

@@ -25 +25 @@
  * Copyright: UPMC - LIP6
  */
+#ifndef SOCLIB_CABA_VCI_RING_TARGET_H
+#define SOCLIB_CABA_VCI_RING_TARGET_H
+
 #include "vci_initiator.h"
 #include "generic_fifo.h"
@@ -788 +791 @@
 
 }} // end namespace
-
-
+#endif // SOCLIB_CABA_VCI_RING_TARGET_H
+

trunk/modules/half_gateway_initiator_2/caba/source/include/half_gateway_initiator_2.h

@@ -23 +23 @@
  * Copyright: UPMC - LIP6
  */
+#ifndef SOCLIB_CABA_HALF_GATEWAY_INITIATOR_2_H
+#define SOCLIB_CABA_HALF_GATEWAY_INITIATOR_2_H
+
 #include <systemc>
 #include "caba_base_module.h"
@@ -434 +437 @@
 }} // end namespace
 
-
+#endif // SOCLIB_CABA_HALF_GATEWAY_INITIATOR_2_H
+

trunk/modules/half_gateway_target_2/caba/source/include/half_gateway_target_2.h

@@ -25 +25 @@
  * Copyright: UPMC - LIP6
  */
+
+#ifndef SOCLIB_CABA_HALF_GATEWAY_TARGET_2_H
+#define SOCLIB_CABA_HALF_GATEWAY_TARGET_2_H
+
 #include <systemc>
 #include "vci_initiator.h"
@@ -197 +201 @@
 if( trace(sc_time_stamp()))
 std::cout << sc_time_stamp() << " -- " << m_name << " --  ring_rsp_fsm : DEFAULT " 
+          << " -- fifo_rsp_rok : " << m_rsp_fifo.rok()
           << " -- fifo_rsp_data : " << std::hex << m_rsp_fifo.read()
           << std::endl;
@@ -533 +538 @@
 }} // end namespace
 
-
+#endif // SOCLIB_CABA_HALF_GATEWAY_TARGET_2_H