1.1 --- a/src/Application/main.c	Mon Nov 07 16:03:01 2011 -0800
     1.2 +++ b/src/Application/main.c	Sat Nov 19 17:58:21 2011 -0800
     1.3 @@ -1,48 +1,38 @@
     1.4 -/*
     1.5 
     1.6 - *  Copyright Oct 24, 2009 OpenSourceStewardshipFoundation.org
     1.7 
     1.8 - *  Licensed under GNU General Public License version 2
     1.9 
    1.10 - *
    1.11 
    1.12 - * author seanhalle@yahoo.com
    1.13 
    1.14 - */
    1.15 
    1.16 -
    1.17 
    1.18 -#include <malloc.h>
    1.19 
    1.20 -#include <stdlib.h>
    1.21 
    1.22 -
    1.23 
    1.24 -#include "SimParams.h"
    1.25 
    1.26 -#include "HWSim_TeraFlux/HWSim_TeraFlux.h"
    1.27 
    1.28 -
    1.29 
    1.30 -/**
    1.31 
    1.32 - * 
    1.33 
    1.34 - */
    1.35 
    1.36 -int main( int argc, char **argv )
    1.37 
    1.38 - { SimulationParams  *simParams;
    1.39 
    1.40 -   SimulationResults *simResults;
    1.41 
    1.42 -   ParamBag          *paramBag;
    1.43 
    1.44 -   
    1.45 
    1.46 -   printf( "arguments: %s | %s\n", argv[0], argv[1] );
    1.47 
    1.48 -
    1.49 
    1.50 -   simParams             = malloc( sizeof(SimulationParams) );
    1.51 
    1.52 -
    1.53 
    1.54 -
    1.55 
    1.56 -      //VMS has its own separate internal malloc, so to get results out,
    1.57 
    1.58 -      // have to pass in empty array for it to fill up
    1.59 
    1.60 -      //The alternative is internally telling HWSim make external space to use
    1.61 
    1.62 -   simResults            = malloc( sizeof(SimulationResults) );
    1.63 
    1.64 -   simParams->simResults = simResults;
    1.65 
    1.66 -
    1.67 
    1.68 -   paramBag              = makeParamBag();
    1.69 
    1.70 -
    1.71 
    1.72 -   readParamFileIntoBag(     argv[1],   paramBag );
    1.73 
    1.74 -   fill_sim_params_from_bag( simParams, paramBag );
    1.75 
    1.76 -
    1.77 
    1.78 -
    1.79 
    1.80 -   constructAndSimulateSystem( simParams );
    1.81 
    1.82 -
    1.83 
    1.84 -   printSimResults( simResults );
    1.85 
    1.86 -
    1.87 
    1.88 -   fflush(stdin);
    1.89 
    1.90 -   
    1.91 
    1.92 -   exit(0); //cleans up
    1.93 
    1.94 - }
    1.95 
    1.96 -
    1.97 
    1.98 -
    1.99 
   1.100 +/*
   1.101 + *  Copyright 2011 OpenSourceStewardshipFoundation.org
   1.102 + *  Licensed under GNU General Public License version 2
   1.103 + *
   1.104 + * author seanhalle@yahoo.com
   1.105 + */
   1.106 + 
   1.107 +#include <malloc.h>
   1.108 +#include <stdlib.h>
   1.109 +
   1.110 +#include "SimParams.h"
   1.111 +#include "HWSim__Hello_World_HW/HWSim__Hello_World_HW.h"
   1.112 +
   1.113 +/*
   1.114 + *
   1.115 + * 
   1.116 + */
   1.117 +
   1.118 +int main( int argc, char **argv )
   1.119 + { ParamBag      *simParams;
   1.120 +   HWSimResults  *simResults;
   1.121 +
   1.122 +   printf( "param file name: %s\n", argv[1] );
   1.123 +
   1.124 +   simParams = makeParamBag();
   1.125 +   readParamFileIntoBag( argv[1], simParams );
   1.126 +   
   1.127 +   netlist = createPingPongNetlist();
   1.128 +   simResults = 
   1.129 +    HWSim__run_simulation( simParams, netlist );
   1.130 +
   1.131 +      //HWSim 
   1.132 +   printSimResults( simResults );
   1.133 +   
   1.134 +   fflush(stdin);
   1.135 +   exit(0); //cleans up
   1.136 + }
   1.137 +