Changeset 80

Timestamp:

Mar 27, 2008, 2:07:50 PM (16 years ago)

Author:

rosiere

Message:

Oups, Environnement is french :P

Location:

trunk/IPs/systemC/Environment

Files:

• . (moved) (moved from trunk/IPs/systemC/Environnement)
• Cache/Makefile (modified) (1 diff)
• Cache/include/Cache.h (modified) (2 diffs)
• Cache/include/Cache_MultiLevel.h (modified) (2 diffs)
• Cache/include/Cache_MultiLevel_Access.h (modified) (1 diff)
• Cache/include/Cache_MultiLevel_Parameters.h (modified) (2 diffs)
• Cache/include/Cache_OneLevel.h (modified) (2 diffs)
• Cache/include/Cache_OneLevel_Access_Port.h (modified) (2 diffs)
• Cache/include/Cache_OneLevel_Address.h (modified) (1 diff)
• Cache/include/Cache_OneLevel_Parameters.h (modified) (2 diffs)
• Cache/include/Cache_OneLevel_Tag.h (modified) (1 diff)
• Cache/include/Cache_OneLevel_Write_Buffer.h (modified) (1 diff)
• Cache/include/Cache_Parameters.h (modified) (2 diffs)
• Cache/include/Types.h (modified) (1 diff)
• Cache/selftest/main.cpp (modified) (1 diff)
• Cache/src/Cache.cpp (modified) (1 diff)
• Cache/src/Cache_MultiLevel.cpp (modified) (1 diff)
• Cache/src/Cache_MultiLevel_access.cpp (modified) (1 diff)
• Cache/src/Cache_MultiLevel_information.cpp (modified) (1 diff)
• Cache/src/Cache_MultiLevel_latence.cpp (modified) (1 diff)
• Cache/src/Cache_MultiLevel_print.cpp (modified) (1 diff)
• Cache/src/Cache_MultiLevel_reset.cpp (modified) (1 diff)
• Cache/src/Cache_MultiLevel_transition.cpp (modified) (1 diff)
• Cache/src/Cache_MultiLevel_update_access.cpp (modified) (1 diff)
• Cache/src/Cache_OneLevel.cpp (modified) (1 diff)
• Cache/src/Cache_OneLevel_access.cpp (modified) (1 diff)
• Cache/src/Cache_OneLevel_access_cached.cpp (modified) (1 diff)
• Cache/src/Cache_OneLevel_access_flush.cpp (modified) (1 diff)
• Cache/src/Cache_OneLevel_access_invalidate.cpp (modified) (1 diff)
• Cache/src/Cache_OneLevel_access_uncached.cpp (modified) (1 diff)
• Cache/src/Cache_OneLevel_hit_access_port.cpp (modified) (1 diff)
• Cache/src/Cache_OneLevel_hit_cache.cpp (modified) (1 diff)
• Cache/src/Cache_OneLevel_hit_write_buffer.cpp (modified) (1 diff)
• Cache/src/Cache_OneLevel_index_victim.cpp (modified) (1 diff)
• Cache/src/Cache_OneLevel_information.cpp (modified) (1 diff)
• Cache/src/Cache_OneLevel_latence.cpp (modified) (1 diff)
• Cache/src/Cache_OneLevel_need_slot.cpp (modified) (1 diff)
• Cache/src/Cache_OneLevel_print.cpp (modified) (1 diff)
• Cache/src/Cache_OneLevel_reset.cpp (modified) (1 diff)
• Cache/src/Cache_OneLevel_transition.cpp (modified) (1 diff)
• Cache/src/Cache_OneLevel_translate_address.cpp (modified) (1 diff)
• Cache/src/Cache_OneLevel_update_latence.cpp (modified) (1 diff)
• Cache/src/Cache_OneLevel_update_lru.cpp (modified) (1 diff)
• Cache/src/Cache_information.cpp (modified) (1 diff)
• Cache/src/Cache_latence.cpp (modified) (1 diff)
• Cache/src/Cache_print.cpp (modified) (1 diff)
• Cache/src/Cache_range_port.cpp (modified) (1 diff)
• Cache/src/Cache_reset.cpp (modified) (1 diff)
• Cache/src/Cache_transition.cpp (modified) (1 diff)
• Makefile.Environnement (modified) (2 diffs)
• Queue/Makefile (modified) (1 diff)
• Queue/include/Parameters.h (modified) (1 diff)
• Queue/include/Queue.h (modified) (2 diffs)
• Queue/include/Slot.h (modified) (1 diff)
• Queue/include/Sort_Queue.h (modified) (2 diffs)
• Queue/include/Sort_Queue_Dynamic.h (modified) (2 diffs)
• Queue/selftest/main.cpp (modified) (1 diff)
• RamLock/Makefile (modified) (1 diff)
• RamLock/include/Parameters.h (modified) (1 diff)
• RamLock/include/RamLock.h (modified) (3 diffs)
• RamLock/selftest/main.cpp (modified) (1 diff)
• RamLock/src/RamLock.cpp (modified) (1 diff)
• RamLock/src/RamLock_print.cpp (modified) (1 diff)
• RamLock/src/RamLock_read.cpp (modified) (1 diff)
• RamLock/src/RamLock_reset.cpp (modified) (1 diff)
• RamLock/src/RamLock_test.cpp (modified) (1 diff)
• RamLock/src/RamLock_write.cpp (modified) (1 diff)

trunk/IPs/systemC/Environment/Cache/Makefile

@@ -12 +12 @@
                                 @\
                                 $(MAKE) --directory=$(DIR_QUEUE) all; \
-                                $(MAKE)                          all_environnement;
+                                $(MAKE)                          all_environment;
 
 clean                           :
                                 @\
                                 $(MAKE) --directory=$(DIR_QUEUE) clean; \
-                                $(MAKE)                          environnement_clean;
+                                $(MAKE)                          environment_clean;
 
 help                            :
-                                @$(MAKE) environnement_help
+                                @$(MAKE) environment_help
 
-include                         ../Makefile.Environnement
+include                         ../Makefile.Environment

trunk/IPs/systemC/Environment/Cache/include/Cache.h

@@ -1 @@
-#ifndef ENVIRONNEMENT_CACHE_H
-#define ENVIRONNEMENT_CACHE_H
+#ifndef ENVIRONMENT_CACHE_H
+#define ENVIRONMENT_CACHE_H
 
 #include "Cache_Parameters.h"
@@ -6 +6 @@
 #include "Types.h"
 
-namespace environnement {
+namespace environment {
 namespace cache {
 

trunk/IPs/systemC/Environment/Cache/include/Cache_MultiLevel.h

@@ -1 @@
-#ifndef ENVIRONNEMENT_CACHE_CACHE_MULTILEVEL_H
-#define ENVIRONNEMENT_CACHE_CACHE_MULTILEVEL_H
+#ifndef ENVIRONMENT_CACHE_CACHE_MULTILEVEL_H
+#define ENVIRONMENT_CACHE_CACHE_MULTILEVEL_H
 
 #include "Cache_MultiLevel_Parameters.h"
@@ -6 +6 @@
 #include "Cache_OneLevel.h"
 
-namespace environnement {
+namespace environment {
 namespace cache {
 namespace cache_multilevel {

trunk/IPs/systemC/Environment/Cache/include/Cache_MultiLevel_Access.h

@@ -1 @@
-#ifndef ENVIRONNEMENT_CACHE_CACHE_MULTILEVEL_ACCESS_H
-#define ENVIRONNEMENT_CACHE_CACHE_MULTILEVEL_ACCESS_H
+#ifndef ENVIRONMENT_CACHE_CACHE_MULTILEVEL_ACCESS_H
+#define ENVIRONMENT_CACHE_CACHE_MULTILEVEL_ACCESS_H
 
 #include "Types.h"
 
-namespace environnement {
+namespace environment {
 namespace cache {
 namespace cache_multilevel {

trunk/IPs/systemC/Environment/Cache/include/Cache_MultiLevel_Parameters.h

@@ -1 @@
-#ifndef ENVIRONNEMENT_CACHE_CACHE_MULTILEVEL_PARAMETERS_H
-#define ENVIRONNEMENT_CACHE_CACHE_MULTILEVEL_PARAMETERS_H
+#ifndef ENVIRONMENT_CACHE_CACHE_MULTILEVEL_PARAMETERS_H
+#define ENVIRONMENT_CACHE_CACHE_MULTILEVEL_PARAMETERS_H
 
 #include <iostream>
@@ -7 +7 @@
 #include "Cache_OneLevel_Parameters.h"
 
-namespace environnement {
+namespace environment {
 namespace cache {
 namespace cache_multilevel {

trunk/IPs/systemC/Environment/Cache/include/Cache_OneLevel.h

@@ -1 @@
-#ifndef ENVIRONNEMENT_CACHE_CACHE_ONELEVEL_H
-#define ENVIRONNEMENT_CACHE_CACHE_ONELEVEL_H
+#ifndef ENVIRONMENT_CACHE_CACHE_ONELEVEL_H
+#define ENVIRONMENT_CACHE_CACHE_ONELEVEL_H
 
 #include "Cache_OneLevel_Access_Port.h"
@@ -9 +9 @@
 #include "../../Queue/include/Sort_Queue_Dynamic.h"
 
-namespace environnement {
+namespace environment {
 namespace cache {
 namespace cache_onelevel {

trunk/IPs/systemC/Environment/Cache/include/Cache_OneLevel_Access_Port.h

@@ -1 @@
-#ifndef ENVIRONNEMENT_CACHE_CACHE_ONELEVEL_ACCESS_PORT_H
-#define ENVIRONNEMENT_CACHE_CACHE_ONELEVEL_ACCESS_PORT_H
+#ifndef ENVIRONMENT_CACHE_CACHE_ONELEVEL_ACCESS_PORT_H
+#define ENVIRONMENT_CACHE_CACHE_ONELEVEL_ACCESS_PORT_H
 
 #include <iostream>
@@ -6 +6 @@
 #include "Cache_OneLevel_Address.h"
 
-namespace environnement {
+namespace environment {
 namespace cache {
 namespace cache_onelevel {

trunk/IPs/systemC/Environment/Cache/include/Cache_OneLevel_Address.h

@@ -1 @@
-#ifndef ENVIRONNEMENT_CACHE_CACHE_ONELEVEL_ADDRESS_H
-#define ENVIRONNEMENT_CACHE_CACHE_ONELEVEL_ADDRESS_H
+#ifndef ENVIRONMENT_CACHE_CACHE_ONELEVEL_ADDRESS_H
+#define ENVIRONMENT_CACHE_CACHE_ONELEVEL_ADDRESS_H
 
 #include <iostream>
 #include <iomanip>
 
-namespace environnement {
+namespace environment {
 namespace cache {
 namespace cache_onelevel {

trunk/IPs/systemC/Environment/Cache/include/Cache_OneLevel_Parameters.h

@@ -1 @@
-#ifndef ENVIRONNEMENT_CACHE_CACHE_ONELEVEL_PARAMETERS_H
-#define ENVIRONNEMENT_CACHE_CACHE_ONELEVEL_PARAMETERS_H
+#ifndef ENVIRONMENT_CACHE_CACHE_ONELEVEL_PARAMETERS_H
+#define ENVIRONMENT_CACHE_CACHE_ONELEVEL_PARAMETERS_H
 
 #include <iostream>
@@ -6 +6 @@
 #include <math.h>
 
-namespace environnement {
+namespace environment {
 namespace cache {
 namespace cache_onelevel {

trunk/IPs/systemC/Environment/Cache/include/Cache_OneLevel_Tag.h

@@ -1 @@
-#ifndef ENVIRONNEMENT_CACHE_CACHE_ONELEVEL_TAG_H
-#define ENVIRONNEMENT_CACHE_CACHE_ONELEVEL_TAG_H
+#ifndef ENVIRONMENT_CACHE_CACHE_ONELEVEL_TAG_H
+#define ENVIRONMENT_CACHE_CACHE_ONELEVEL_TAG_H
 
 #include <iostream>
 #include <iomanip>
 
-namespace environnement {
+namespace environment {
 namespace cache {
 namespace cache_onelevel {

trunk/IPs/systemC/Environment/Cache/include/Cache_OneLevel_Write_Buffer.h

@@ -1 @@
-#ifndef ENVIRONNEMENT_CACHE_CACHE_ONELEVEL_WRITE_BUFFER_H
-#define ENVIRONNEMENT_CACHE_CACHE_ONELEVEL_WRITE_BUFFER_H
+#ifndef ENVIRONMENT_CACHE_CACHE_ONELEVEL_WRITE_BUFFER_H
+#define ENVIRONMENT_CACHE_CACHE_ONELEVEL_WRITE_BUFFER_H
 
 #include <iostream>
 #include "Cache_OneLevel_Address.h"
 
-namespace environnement {
+namespace environment {
 namespace cache {
 namespace cache_onelevel {

trunk/IPs/systemC/Environment/Cache/include/Cache_Parameters.h

@@ -1 @@
-#ifndef ENVIRONNEMENT_CACHE_PARAMETERS_H
-#define ENVIRONNEMENT_CACHE_PARAMETERS_H
+#ifndef ENVIRONMENT_CACHE_PARAMETERS_H
+#define ENVIRONMENT_CACHE_PARAMETERS_H
 
 #include <iostream>
@@ -7 +7 @@
 #include "Cache_MultiLevel_Parameters.h"
 
-namespace environnement {
+namespace environment {
 namespace cache {
 

trunk/IPs/systemC/Environment/Cache/include/Types.h

@@ -1 @@
-#ifndef ENVIRONNEMENT_CACHE_TYPES_H
-#define ENVIRONNEMENT_CACHE_TYPES_H
+#ifndef ENVIRONMENT_CACHE_TYPES_H
+#define ENVIRONMENT_CACHE_TYPES_H
 
-namespace environnement {
+namespace environment {
 namespace cache {
 

trunk/IPs/systemC/Environment/Cache/selftest/main.cpp

@@ -3 +3 @@
 
 using namespace std;
-using namespace environnement;
-using namespace environnement::cache;
+using namespace environment;
+using namespace environment::cache;
 
 #define TEST(x,y)                               \

trunk/IPs/systemC/Environment/Cache/src/Cache.cpp

@@ -2 +2 @@
 #include <sstream>
 
-namespace environnement {
+namespace environment {
 namespace cache {
 

trunk/IPs/systemC/Environment/Cache/src/Cache_MultiLevel.cpp

@@ -2 +2 @@
 #include <sstream>
 
-namespace environnement {
+namespace environment {
 namespace cache {
 namespace cache_multilevel {

trunk/IPs/systemC/Environment/Cache/src/Cache_MultiLevel_access.cpp

@@ -2 +2 @@
 #include <sstream>
 
-namespace environnement {
+namespace environment {
 namespace cache {
 namespace cache_multilevel {

trunk/IPs/systemC/Environment/Cache/src/Cache_MultiLevel_information.cpp

@@ -2 +2 @@
 #include <sstream>
 
-namespace environnement {
+namespace environment {
 namespace cache {
 namespace cache_multilevel {

trunk/IPs/systemC/Environment/Cache/src/Cache_MultiLevel_latence.cpp

@@ -2 +2 @@
 #include <sstream>
 
-namespace environnement {
+namespace environment {
 namespace cache {
 namespace cache_multilevel {

trunk/IPs/systemC/Environment/Cache/src/Cache_MultiLevel_print.cpp

@@ -1 +1 @@
 #include "../include/Cache_MultiLevel.h"
 
-namespace environnement {
+namespace environment {
 namespace cache {
 namespace cache_multilevel {

trunk/IPs/systemC/Environment/Cache/src/Cache_MultiLevel_reset.cpp

@@ -2 +2 @@
 #include <sstream>
 
-namespace environnement {
+namespace environment {
 namespace cache {
 namespace cache_multilevel {

trunk/IPs/systemC/Environment/Cache/src/Cache_MultiLevel_transition.cpp

@@ -2 +2 @@
 #include <sstream>
 
-namespace environnement {
+namespace environment {
 namespace cache {
 namespace cache_multilevel {

trunk/IPs/systemC/Environment/Cache/src/Cache_MultiLevel_update_access.cpp

@@ -2 +2 @@
 #include <sstream>
 
-namespace environnement {
+namespace environment {
 namespace cache {
 namespace cache_multilevel {

trunk/IPs/systemC/Environment/Cache/src/Cache_OneLevel.cpp

@@ -1 +1 @@
 #include "../include/Cache_OneLevel.h"
 
-namespace environnement {
+namespace environment {
 namespace cache {
 namespace cache_onelevel {

trunk/IPs/systemC/Environment/Cache/src/Cache_OneLevel_access.cpp

@@ -1 +1 @@
 #include "../include/Cache_OneLevel.h"
 
-namespace environnement {
+namespace environment {
 namespace cache {
 namespace cache_onelevel {

trunk/IPs/systemC/Environment/Cache/src/Cache_OneLevel_access_cached.cpp

@@ -1 +1 @@
 #include "../include/Cache_OneLevel.h"
 
-namespace environnement {
+namespace environment {
 namespace cache {
 namespace cache_onelevel {

trunk/IPs/systemC/Environment/Cache/src/Cache_OneLevel_access_flush.cpp

@@ -1 +1 @@
 #include "../include/Cache_OneLevel.h"
 
-namespace environnement {
+namespace environment {
 namespace cache {
 namespace cache_onelevel {

trunk/IPs/systemC/Environment/Cache/src/Cache_OneLevel_access_invalidate.cpp

@@ -1 +1 @@
 #include "../include/Cache_OneLevel.h"
 
-namespace environnement {
+namespace environment {
 namespace cache {
 namespace cache_onelevel {

trunk/IPs/systemC/Environment/Cache/src/Cache_OneLevel_access_uncached.cpp

@@ -1 +1 @@
 #include "../include/Cache_OneLevel.h"
 
-namespace environnement {
+namespace environment {
 namespace cache {
 namespace cache_onelevel {

trunk/IPs/systemC/Environment/Cache/src/Cache_OneLevel_hit_access_port.cpp

@@ -1 +1 @@
 #include "../include/Cache_OneLevel.h"
 
-namespace environnement {
+namespace environment {
 namespace cache {
 namespace cache_onelevel {

trunk/IPs/systemC/Environment/Cache/src/Cache_OneLevel_hit_cache.cpp

@@ -1 +1 @@
 #include "../include/Cache_OneLevel.h"
 
-namespace environnement {
+namespace environment {
 namespace cache {
 namespace cache_onelevel {

trunk/IPs/systemC/Environment/Cache/src/Cache_OneLevel_hit_write_buffer.cpp

@@ -1 +1 @@
 #include "../include/Cache_OneLevel.h"
 
-namespace environnement {
+namespace environment {
 namespace cache {
 namespace cache_onelevel {

trunk/IPs/systemC/Environment/Cache/src/Cache_OneLevel_index_victim.cpp

@@ -1 +1 @@
 #include "../include/Cache_OneLevel.h"
 
-namespace environnement {
+namespace environment {
 namespace cache {
 namespace cache_onelevel {

trunk/IPs/systemC/Environment/Cache/src/Cache_OneLevel_information.cpp

@@ -2 +2 @@
 #include <sstream>
 
-namespace environnement {
+namespace environment {
 namespace cache {
 namespace cache_onelevel {

trunk/IPs/systemC/Environment/Cache/src/Cache_OneLevel_latence.cpp

@@ -1 +1 @@
 #include "../include/Cache_OneLevel.h"
 
-namespace environnement {
+namespace environment {
 namespace cache {
 namespace cache_onelevel {

trunk/IPs/systemC/Environment/Cache/src/Cache_OneLevel_need_slot.cpp

@@ -1 +1 @@
 #include "../include/Cache_OneLevel.h"
 
-namespace environnement {
+namespace environment {
 namespace cache {
 namespace cache_onelevel {

trunk/IPs/systemC/Environment/Cache/src/Cache_OneLevel_print.cpp

@@ -1 +1 @@
 #include "../include/Cache_OneLevel.h"
 
-namespace environnement {
+namespace environment {
 namespace cache {
 namespace cache_onelevel {

trunk/IPs/systemC/Environment/Cache/src/Cache_OneLevel_reset.cpp

@@ -1 +1 @@
 #include "../include/Cache_OneLevel.h"
 
-namespace environnement {
+namespace environment {
 namespace cache {
 namespace cache_onelevel {

trunk/IPs/systemC/Environment/Cache/src/Cache_OneLevel_transition.cpp

@@ -1 +1 @@
 #include "../include/Cache_OneLevel.h"
 
-namespace environnement {
+namespace environment {
 namespace cache {
 namespace cache_onelevel {

trunk/IPs/systemC/Environment/Cache/src/Cache_OneLevel_translate_address.cpp

@@ -1 +1 @@
 #include "../include/Cache_OneLevel.h"
 
-namespace environnement {
+namespace environment {
 namespace cache {
 namespace cache_onelevel {

trunk/IPs/systemC/Environment/Cache/src/Cache_OneLevel_update_latence.cpp

@@ -1 +1 @@
 #include "../include/Cache_OneLevel.h"
 
-namespace environnement {
+namespace environment {
 namespace cache {
 namespace cache_onelevel {

trunk/IPs/systemC/Environment/Cache/src/Cache_OneLevel_update_lru.cpp

@@ -1 +1 @@
 #include "../include/Cache_OneLevel.h"
 
-namespace environnement {
+namespace environment {
 namespace cache {
 namespace cache_onelevel {

trunk/IPs/systemC/Environment/Cache/src/Cache_information.cpp

@@ -2 +2 @@
 #include <sstream>
 
-namespace environnement {
+namespace environment {
 namespace cache {
 

trunk/IPs/systemC/Environment/Cache/src/Cache_latence.cpp

@@ -1 +1 @@
 #include "../include/Cache.h"
 
-namespace environnement {
+namespace environment {
 namespace cache {
   

trunk/IPs/systemC/Environment/Cache/src/Cache_print.cpp

@@ -1 +1 @@
 #include "../include/Cache.h"
 
-namespace environnement {
+namespace environment {
 namespace cache {
 

trunk/IPs/systemC/Environment/Cache/src/Cache_range_port.cpp

@@ -1 +1 @@
 #include "../include/Cache.h"
 
-namespace environnement {
+namespace environment {
 namespace cache {
 

trunk/IPs/systemC/Environment/Cache/src/Cache_reset.cpp

@@ -1 +1 @@
 #include "../include/Cache.h"
 
-namespace environnement {
+namespace environment {
 namespace cache {
 

trunk/IPs/systemC/Environment/Cache/src/Cache_transition.cpp

@@ -1 +1 @@
 #include "../include/Cache.h"
 
-namespace environnement {
+namespace environment {
 namespace cache {
 

trunk/IPs/systemC/Environment/Makefile.Environnement

@@ -64 +64 @@
 
 
-exe                             : all_environnement
+exe                             : all_environment
                                 @\
                                 $(VALGRIND) ./$(EXE)
 
-all_environnement               : test_env $(DIR_OBJ) $(DIR_BIN)
+all_environment         : test_env $(DIR_OBJ) $(DIR_BIN)
                                 @\
                                 $(MAKE) $(EXE)
 
-environnement_clean             :
+environment_clean               :
                                 @\
                                 $(ECHO) "Delete     temporary files in directory "$(PWD);\
@@ -82 +82 @@
                                         $(DIR_INC)/*~;
 
-environnement_help              :
+environment_help                :
                                 @\
-                                $(ECHO) " -----[ Environnement ]------------------------------";\
+                                $(ECHO) " -----[ Environment ]------------------------------";\
                                 $(ECHO) "";\
                                 $(ECHO) " * test_env             : test if environnment's variable is set";\
-                                $(ECHO) " * all_environnement    : generate object";\
+                                $(ECHO) " * all_environment    : generate object";\
                                 $(ECHO) "";

trunk/IPs/systemC/Environment/Queue/Makefile

@@ -2 +2 @@
 
 all                             :
-                                @$(MAKE) all_environnement
+                                @$(MAKE) all_environment
 
 clean                           :
-                                @$(MAKE) environnement_clean
+                                @$(MAKE) environment_clean
 
 help                            :
-                                @$(MAKE) environnement_help
+                                @$(MAKE) environment_help
 
-include                         ../Makefile.Environnement
+include                         ../Makefile.Environment

trunk/IPs/systemC/Environment/Queue/include/Parameters.h

@@ -1 @@
-#ifndef ENVIRONNEMENT_QUEUE_PARAMETERS_H
-#define ENVIRONNEMENT_QUEUE_PARAMETERS_H
+#ifndef ENVIRONMENT_QUEUE_PARAMETERS_H
+#define ENVIRONMENT_QUEUE_PARAMETERS_H
 
 #include <stdint.h>
 #include <iostream>
 
-namespace environnement {
+namespace environment {
 namespace queue {
 

trunk/IPs/systemC/Environment/Queue/include/Queue.h

@@ -1 @@
-#ifndef ENVIRONNEMENT_QUEUE_QUEUE_H
-#define ENVIRONNEMENT_QUEUE_QUEUE_H
+#ifndef ENVIRONMENT_QUEUE_QUEUE_H
+#define ENVIRONMENT_QUEUE_QUEUE_H
 
 #include <stdint.h>
@@ -6 +6 @@
 #include "Slot.h"
 
-namespace environnement {
+namespace environment {
 namespace queue {
   

trunk/IPs/systemC/Environment/Queue/include/Slot.h

@@ -1 @@
-#ifndef ENVIRONNEMENT_QUEUE_SLOT_H
-#define ENVIRONNEMENT_QUEUE_SLOT_H
+#ifndef ENVIRONMENT_QUEUE_SLOT_H
+#define ENVIRONMENT_QUEUE_SLOT_H
 
 #include <stdint.h>
 #include <iostream>
 
-namespace environnement {
+namespace environment {
 namespace queue {
 

trunk/IPs/systemC/Environment/Queue/include/Sort_Queue.h

@@ -1 @@
-#ifndef ENVIRONNEMENT_QUEUE_SORT_QUEUE_H
-#define ENVIRONNEMENT_QUEUE_SORT_QUEUE_H
+#ifndef ENVIRONMENT_QUEUE_SORT_QUEUE_H
+#define ENVIRONMENT_QUEUE_SORT_QUEUE_H
 
 #include <stdint.h>
@@ -7 +7 @@
 #include "Queue.h"
 
-namespace environnement {
+namespace environment {
 namespace queue {
   

trunk/IPs/systemC/Environment/Queue/include/Sort_Queue_Dynamic.h

@@ -1 @@
-#ifndef ENVIRONNEMENT_QUEUE_SORT_QUEUE_DYNAMIC_H
-#define ENVIRONNEMENT_QUEUE_SORT_QUEUE_DYNAMIC_H
+#ifndef ENVIRONMENT_QUEUE_SORT_QUEUE_DYNAMIC_H
+#define ENVIRONMENT_QUEUE_SORT_QUEUE_DYNAMIC_H
 
 #include <stdint.h>
@@ -7 +7 @@
 #include "Queue.h"
 
-namespace environnement {
+namespace environment {
 namespace queue {
 

trunk/IPs/systemC/Environment/Queue/selftest/main.cpp

@@ -4 +4 @@
 
 using namespace std;
-using namespace environnement;
-using namespace environnement::queue;
+using namespace environment;
+using namespace environment::queue;
 
 

trunk/IPs/systemC/Environment/RamLock/Makefile

@@ -2 +2 @@
 
 all                             :
-                                @$(MAKE) all_environnement
+                                @$(MAKE) all_environment
 
 clean                           :
-                                @$(MAKE) environnement_clean
+                                @$(MAKE) environment_clean
 
 help                            :
-                                @$(MAKE) environnement_help
+                                @$(MAKE) environment_help
 
-include                         ../Makefile.Environnement
+include                         ../Makefile.Environment

trunk/IPs/systemC/Environment/RamLock/include/Parameters.h

@@ -1 @@
-#ifndef Environnement_Parameters_H
-#define Environnement_Parameters_H
+#ifndef Environment_Parameters_H
+#define Environment_Parameters_H
 
 #include <stdint.h>
 
-namespace environnement {
+namespace environment {
 namespace ramlock {
 

trunk/IPs/systemC/Environment/RamLock/include/RamLock.h

@@ -1 @@
-#ifndef Environnement_RamLock_H
-#define Environnement_RamLock_H
+#ifndef Environment_RamLock_H
+#define Environment_RamLock_H
 
 #include <stdint.h>
@@ -7 +7 @@
 #include "Parameters.h"
 
-namespace environnement {
+namespace environment {
 namespace ramlock {
 
@@ -30 +30 @@
   public  : bool write (uint32_t num_lock);
     
-  public  : friend std::ostream& operator<< (std::ostream& output, environnement::ramlock::RamLock & x);
+  public  : friend std::ostream& operator<< (std::ostream& output, environment::ramlock::RamLock & x);
   };
 

trunk/IPs/systemC/Environment/RamLock/selftest/main.cpp

@@ -3 +3 @@
 
 using namespace std;
-using namespace environnement;
-using namespace environnement::ramlock;
+using namespace environment;
+using namespace environment::ramlock;
 
 

trunk/IPs/systemC/Environment/RamLock/src/RamLock.cpp

@@ -1 +1 @@
 #include "../include/RamLock.h"
 
-namespace environnement {
+namespace environment {
 namespace ramlock {
 

trunk/IPs/systemC/Environment/RamLock/src/RamLock_print.cpp

@@ -1 +1 @@
 #include "../include/RamLock.h"
 
-namespace environnement {
+namespace environment {
 namespace ramlock {
 
-  std::ostream& operator<< (std::ostream& output, environnement::ramlock::RamLock & x)
+  std::ostream& operator<< (std::ostream& output, environment::ramlock::RamLock & x)
   {
     output << "<" << x._name << ">" << std::endl;

trunk/IPs/systemC/Environment/RamLock/src/RamLock_read.cpp

@@ -1 +1 @@
 #include "../include/RamLock.h"
 
-namespace environnement {
+namespace environment {
 namespace ramlock {
 

trunk/IPs/systemC/Environment/RamLock/src/RamLock_reset.cpp

@@ -1 +1 @@
 #include "../include/RamLock.h"
 
-namespace environnement {
+namespace environment {
 namespace ramlock {
 

trunk/IPs/systemC/Environment/RamLock/src/RamLock_test.cpp

@@ -1 +1 @@
 #include "../include/RamLock.h"
 
-namespace environnement {
+namespace environment {
 namespace ramlock {
 

trunk/IPs/systemC/Environment/RamLock/src/RamLock_write.cpp

@@ -1 +1 @@
 #include "../include/RamLock.h"
 
-namespace environnement {
+namespace environment {
 namespace ramlock {