1.1 --- a/main.c	Fri Mar 02 18:14:06 2012 +0100
     1.2 +++ b/main.c	Mon Apr 02 14:06:11 2012 +0200
     1.3 @@ -4,7 +4,7 @@
     1.4   *
     1.5   * author seanhalle@yahoo.com
     1.6   */
     1.7 - 
     1.8 +
     1.9  #include <malloc.h>
    1.10  #include <stdlib.h>
    1.11  
    1.12 @@ -24,38 +24,38 @@
    1.13   * 
    1.14   */
    1.15  
    1.16 -int main( int argc, char **argv )
    1.17 - { ParamBag      *simParams;
    1.18 -   HWSimNetlist  *netlist;
    1.19 -   HWSimResults  *simResults;
    1.20 +int main(int argc, char **argv) {
    1.21 +    ParamBag *simParams;
    1.22 +    HWSimNetlist *netlist;
    1.23 +    HWSimResults *simResults;
    1.24 +    int result;
    1.25  
    1.26  #ifdef FAKE
    1.27 -	simParams= NULL;
    1.28 -   printf( "param file name: %s\n", argv[1] );
    1.29 -   printf("Paraver trace file %s\n", argv[2]);
    1.30 +    simParams = NULL;
    1.31 +    printf("param file name: %s\n", argv[1]);
    1.32 +    printf("Paraver trace file %s\n", argv[2]);
    1.33  
    1.34  #else
    1.35 -	
    1.36 -        // TODO use the pure C branch of paramBag
    1.37 -//   simParams = makeParamBag();
    1.38 -//   readParamFileIntoBag( argv[1], simParams );
    1.39 +
    1.40 +     //TODO use the pure C branch of paramBag
    1.41 +       simParams = makeParamBag();
    1.42 +       readParamFileIntoBag( argv[1], simParams );
    1.43  #endif
    1.44 -   
    1.45 -   netlist = createPingPongNetlist();
    1.46 +
    1.47 +    netlist = createPingPongNetlist();
    1.48  
    1.49  #ifdef FAKE
    1.50 -   simResults= create_simulation_results__fake(simParams,netlist);
    1.51 +    simResults = create_simulation_results__fake(simParams, netlist);
    1.52  #else
    1.53 -   simResults = 
    1.54 -    HWSim__run_simulation( NULL, netlist );
    1.55 -//	HWSim_test__run();
    1.56 +    simResults = HWSim__run_simulation( simParams, netlist );
    1.57 +    //HWSim_test__run();
    1.58  #endif
    1.59  
    1.60 -      //HWSim 
    1.61 -   //HWSim__generate_paraver_output(argv[2], simResults, netlist); //Stefan: my version
    1.62 -	//HWSim__generate_paraver_output(simResults);
    1.63 -   //HWSim__generate_vcd_output( simResults );
    1.64 -   
    1.65 -   exit(0); //cleans up
    1.66 - }
    1.67 +    //HWSim 
    1.68 +    //HWSim__generate_paraver_output(argv[2], simResults, netlist); //Stefan: my version
    1.69 +    //HWSim__generate_paraver_output(simResults);
    1.70 +    //HWSim__generate_vcd_output( simResults );
    1.71  
    1.72 +    exit(0); //cleans up
    1.73 +}
    1.74 +