Mercurial > cgi-bin > hgwebdir.cgi > PR > Applications > HWSim > HWSim__PingPong__HWDef
diff main.c @ 16:df53f52ef49c
naming conflicts fixed
HWSimResults changed, so FakeSim needs an update -> TODO Stefan
| author | hausers |
|---|---|
| date | Fri, 17 Feb 2012 17:41:12 +0100 |
| parents | 8d9d367e96f9 |
| children | b0e9969d8d15 |
line diff
1.1 --- a/main.c Sun Feb 12 01:47:58 2012 -0800 1.2 +++ b/main.c Fri Feb 17 17:41:12 2012 +0100 1.3 @@ -10,13 +10,12 @@ 1.4 1.5 #include "SimParams.h" 1.6 #include "HWSim__PingPong__HWDef/HWSim__PingPong__HWDef.h" 1.7 -//Stefan: name conflict here -- MC_shared version of params is in HWSim__PingPong__HWDef.h, but need normal C version here 1.8 #include "../C_Libraries/ParamHelper/Param.h" 1.9 1.10 1.11 char __ProgrammName[] = "HWSim Hello World"; 1.12 char __DataSet[255]; 1.13 -char __Scheduler[]; 1.14 +char __Scheduler[1]; 1.15 1.16 /* 1.17 * 1.18 @@ -47,7 +46,8 @@ 1.19 #endif 1.20 1.21 //HWSim 1.22 - HWSim__generate_paraver_output(argv[2], simResults, netlist); 1.23 + //HWSim__generate_paraver_output(argv[2], simResults, netlist); //Stefan: my version 1.24 + HWSim__generate_paraver_output(simResults); 1.25 //HWSim__generate_vcd_output( simResults ); 1.26 1.27 exit(0); //cleans up
