Mercurial > cgi-bin > hgwebdir.cgi > PR > Applications > HWSim > HWSim__PingPong__HWDef

changeset 17:fa277c6ce6f2

find changesets by author, revision, files, or words in the commit message
first compilable version
author hausers
date Mon, 20 Feb 2012 17:06:56 +0100
parents df53f52ef49c
children b0e9969d8d15
files CircuitNetlistCreator.c HWSim__PingPong__HWDef/PingPongElem_Activities.c SimParams.c
diffstat 3 files changed, 8 insertions(+), 6 deletions(-) [+]
line diff
     1.1 --- a/CircuitNetlistCreator.c	Fri Feb 17 17:41:12 2012 +0100
     1.2 +++ b/CircuitNetlistCreator.c	Mon Feb 20 17:06:56 2012 +0100
     1.3 @@ -60,6 +60,7 @@
     1.4     elems[0] = createAPingPongElem( netlist ); //use info from netlist
     1.5     elems[1] = createAPingPongElem( netlist ); 
     1.6        //on one of the elems, make reset trigger an action   
     1.7 +	//Stefan: FIXME
     1.8     elems[1]->inPorts[-1].triggeredActivityType =
     1.9                netlist->activityTypes[PING_PONG_TYPE]; //Connect elems together
    1.10  			  

     2.1 --- a/HWSim__PingPong__HWDef/PingPongElem_Activities.c	Fri Feb 17 17:41:12 2012 +0100
     2.2 +++ b/HWSim__PingPong__HWDef/PingPongElem_Activities.c	Mon Feb 20 17:06:56 2012 +0100
     2.3 @@ -28,12 +28,13 @@
     2.4   */
     2.5  void *
     2.6  pingPongElem_PingActivity_behavior( void *_params, HWSimElem *elem )
     2.7 - {
     2.8 + { //Stefan: FIXME
     2.9     PingPongParams  *params;
    2.10     params    = (PingPongParams *)_params;
    2.11  //         DEBUG( dbgHW, "ping pong activity\n", clone_PingPongParams(params) );
    2.12     
    2.13  //   HWSim__send_on_port( NO_MSG, PORT0, elem );
    2.14 +	return params;
    2.15   }
    2.16  
    2.17  HWSimTimeSpan

     3.1 --- a/SimParams.c	Fri Feb 17 17:41:12 2012 +0100
     3.2 +++ b/SimParams.c	Mon Feb 20 17:06:56 2012 +0100
     3.3 @@ -26,25 +26,25 @@
     3.4     
     3.5        ParamStruc *param;
     3.6  
     3.7 -      //param = getParamFromBag( "GuestApplicationFileName", paramBag );
     3.8 +   param = getParamFromBag( "GuestApplicationFileName", paramBag );
     3.9     guestAppFileName = param->strValue;
    3.10  
    3.11 -      //param = getParamFromBag( "numBytesInGuestApp", paramBag );
    3.12 +   param = getParamFromBag( "numBytesInGuestApp", paramBag );
    3.13     numBytesInGuestApp = param->intValue;
    3.14  
    3.15     simParams->guestApp =
    3.16      read_Machine_Code_From_File( numBytesInGuestApp, guestAppFileName );
    3.17  
    3.18 -      //param = getParamFromBag( "SystemCodeFileName", paramBag );
    3.19 +   param = getParamFromBag( "SystemCodeFileName", paramBag );
    3.20     systemCodeFileName = param->strValue;
    3.21  
    3.22 -      //param = getParamFromBag( "numBytesInSystemCode", paramBag );
    3.23 +   param = getParamFromBag( "numBytesInSystemCode", paramBag );
    3.24     numBytesInSystemCode = param->intValue;
    3.25  
    3.26     simParams->systemCode =
    3.27      read_Machine_Code_From_File( numBytesInSystemCode, systemCodeFileName );
    3.28  
    3.29 -      //param = getParamFromBag( "numNodes", paramBag );
    3.30 +   param = getParamFromBag( "numNodes", paramBag );
    3.31     simParams->numNodes = param->intValue;
    3.32   }
    3.33