# HG changeset patch # User hausers # Date 1329754016 -3600 # Node ID fa277c6ce6f256e11cb7405b9733f966b2f636a8 # Parent df53f52ef49c9ad6f266c4bd510062154b152214 first compilable version diff -r df53f52ef49c -r fa277c6ce6f2 CircuitNetlistCreator.c --- a/CircuitNetlistCreator.c Fri Feb 17 17:41:12 2012 +0100 +++ b/CircuitNetlistCreator.c Mon Feb 20 17:06:56 2012 +0100 @@ -60,6 +60,7 @@ elems[0] = createAPingPongElem( netlist ); //use info from netlist elems[1] = createAPingPongElem( netlist ); //on one of the elems, make reset trigger an action + //Stefan: FIXME elems[1]->inPorts[-1].triggeredActivityType = netlist->activityTypes[PING_PONG_TYPE]; //Connect elems together diff -r df53f52ef49c -r fa277c6ce6f2 HWSim__PingPong__HWDef/PingPongElem_Activities.c --- a/HWSim__PingPong__HWDef/PingPongElem_Activities.c Fri Feb 17 17:41:12 2012 +0100 +++ b/HWSim__PingPong__HWDef/PingPongElem_Activities.c Mon Feb 20 17:06:56 2012 +0100 @@ -28,12 +28,13 @@ */ void * pingPongElem_PingActivity_behavior( void *_params, HWSimElem *elem ) - { + { //Stefan: FIXME PingPongParams *params; params = (PingPongParams *)_params; // DEBUG( dbgHW, "ping pong activity\n", clone_PingPongParams(params) ); // HWSim__send_on_port( NO_MSG, PORT0, elem ); + return params; } HWSimTimeSpan diff -r df53f52ef49c -r fa277c6ce6f2 SimParams.c --- a/SimParams.c Fri Feb 17 17:41:12 2012 +0100 +++ b/SimParams.c Mon Feb 20 17:06:56 2012 +0100 @@ -26,25 +26,25 @@ ParamStruc *param; - //param = getParamFromBag( "GuestApplicationFileName", paramBag ); + param = getParamFromBag( "GuestApplicationFileName", paramBag ); guestAppFileName = param->strValue; - //param = getParamFromBag( "numBytesInGuestApp", paramBag ); + param = getParamFromBag( "numBytesInGuestApp", paramBag ); numBytesInGuestApp = param->intValue; simParams->guestApp = read_Machine_Code_From_File( numBytesInGuestApp, guestAppFileName ); - //param = getParamFromBag( "SystemCodeFileName", paramBag ); + param = getParamFromBag( "SystemCodeFileName", paramBag ); systemCodeFileName = param->strValue; - //param = getParamFromBag( "numBytesInSystemCode", paramBag ); + param = getParamFromBag( "numBytesInSystemCode", paramBag ); numBytesInSystemCode = param->intValue; simParams->systemCode = read_Machine_Code_From_File( numBytesInSystemCode, systemCodeFileName ); - //param = getParamFromBag( "numNodes", paramBag ); + param = getParamFromBag( "numNodes", paramBag ); simParams->numNodes = param->intValue; }