Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenrik Rentz-Reichert2013-03-27 18:01:18 +0000
committerHenrik Rentz-Reichert2013-03-27 18:02:01 +0000
commit540dd9b89fb9aaa454d9a5db8723e95da85fd931 (patch)
tree80fe7a353a0a4f4b67a25bc95bc9b5a4f6dde122
parent38dfd139d254d887001ab33999392186ad375987 (diff)
downloadorg.eclipse.etrice-540dd9b89fb9aaa454d9a5db8723e95da85fd931.tar.gz
org.eclipse.etrice-540dd9b89fb9aaa454d9a5db8723e95da85fd931.tar.xz
org.eclipse.etrice-540dd9b89fb9aaa454d9a5db8723e95da85fd931.zip
[modellib.c] removed // comments from timing service
-rw-r--r--runtime/org.eclipse.etrice.modellib.c/model/TimingService.room30
-rw-r--r--runtime/org.eclipse.etrice.modellib.c/src-gen/room/basic/service/timing/ATimingService.c20
-rw-r--r--runtime/org.eclipse.etrice.modellib.c/src-gen/room/basic/service/timing/ATimingService.h2
-rw-r--r--runtime/org.eclipse.etrice.modellib.c/src-gen/room/basic/service/timing/PTimer.c12
-rw-r--r--runtime/org.eclipse.etrice.modellib.c/src-gen/room/basic/service/timing/PTimer.h2
5 files changed, 35 insertions, 31 deletions
diff --git a/runtime/org.eclipse.etrice.modellib.c/model/TimingService.room b/runtime/org.eclipse.etrice.modellib.c/model/TimingService.room
index 80e7534f6..125d999e5 100644
--- a/runtime/org.eclipse.etrice.modellib.c/model/TimingService.room
+++ b/runtime/org.eclipse.etrice.modellib.c/model/TimingService.room
@@ -21,7 +21,7 @@ RoomModel room.basic.service.timing {
"
}
usercode2 {
- "//uc2"
+ "/*uc2*/"
}
usercode3{
"etTimerControlBlock tcbs[ET_NB_OF_TCBS];"
@@ -54,7 +54,7 @@ RoomModel room.basic.service.timing {
if (temp==0) return;
if (usedTcbsRoot->portIdx == idx){
- // element found, the first one
+ /* element found, the first one */
usedTcbsRoot = usedTcbsRoot->next;
returnTcb(temp);
return;
@@ -67,7 +67,7 @@ RoomModel room.basic.service.timing {
returnTcb(temp);
return;
}else{
- // try next
+ /* try next */
temp2=temp;
temp=temp->next;
}
@@ -78,7 +78,7 @@ RoomModel room.basic.service.timing {
etTimerControlBlock* temp2=usedTcbsRoot;
if (temp==0){
- // list empty put new block to root
+ /* list empty put new block to root */
block->next=0;
usedTcbsRoot=block;
return;
@@ -87,11 +87,11 @@ RoomModel room.basic.service.timing {
while(1){
if (temp != 0){
if (isTimeGreater(&block->expTime,&temp->expTime)){
- //try next position
+ /* try next position */
temp2=temp;
temp=temp->next;
}else{
- // right position found
+ /* right position found */
block->next=temp;
if(temp==usedTcbsRoot){
usedTcbsRoot=block;
@@ -101,7 +101,7 @@ RoomModel room.basic.service.timing {
return;
}
}else{
- // end of list reached
+ /* end of list reached */
block->next=0;
temp2->next=block;
return;
@@ -192,9 +192,9 @@ RoomModel room.basic.service.timing {
}
State Operational {
entry {
- "// prepare"
+ "/* prepare */"
} do {
- "// maintain timers"
+ "/* maintain timers */"
"etTimerControlBlock* temp;"
"etTargetTime_t t;"
""
@@ -205,10 +205,10 @@ RoomModel room.basic.service.timing {
"\t\ttemp=usedTcbsRoot;"
"\t\tusedTcbsRoot=usedTcbsRoot->next;"
"\t\tif((temp->pTime.sec==0)&&(temp->pTime.nSec==0)){"
- "\t\t\t// single shot timer"
+ "\t\t\t/* single shot timer */"
"\t\t\treturnTcb(temp);"
"\t\t}else{"
- "\t\t\t// periodic timer"
+ "\t\t\t/* periodic timer */"
"\t\t\taddTime(&temp->expTime,&temp->pTime);"
"\t\t\tputTcbToUsedList(temp);"
"\t\t\t}"
@@ -230,7 +230,7 @@ RoomModel room.basic.service.timing {
"
}
usercode2 {
- "//uc2 "
+ "/*uc2*/"
}
incoming {
Message startTimer(time: uint32)
@@ -257,13 +257,13 @@ RoomModel room.basic.service.timing {
"
}
handle outgoing timeout{
- "//TODO: clear active bit in case of single shot timer
+ "/* TODO: clear active bit in case of single shot timer */
if (status!=0){
if (status==ET_TIMER_RUNNING){
- // single shot timer
+ /* single shot timer */
status=0;
}
- // msg to fsm
+ /* msg to fsm */
(*receiveMessageFunc)(actor, self, msg);
}
"
diff --git a/runtime/org.eclipse.etrice.modellib.c/src-gen/room/basic/service/timing/ATimingService.c b/runtime/org.eclipse.etrice.modellib.c/src-gen/room/basic/service/timing/ATimingService.c
index f4ed0ccb9..ca2556917 100644
--- a/runtime/org.eclipse.etrice.modellib.c/src-gen/room/basic/service/timing/ATimingService.c
+++ b/runtime/org.eclipse.etrice.modellib.c/src-gen/room/basic/service/timing/ATimingService.c
@@ -61,10 +61,10 @@ static int getState(ATimingService* self) {
/* Entry and Exit Codes */
static void entry_Operational(ATimingService* self) {
- // prepare
+ /* prepare */
}
static void do_Operational(ATimingService* self) {
- // maintain timers
+ /* maintain timers */
etTimerControlBlock* temp;
etTargetTime_t t;
@@ -75,10 +75,10 @@ static void do_Operational(ATimingService* self) {
temp=usedTcbsRoot;
usedTcbsRoot=usedTcbsRoot->next;
if((temp->pTime.sec==0)&&(temp->pTime.nSec==0)){
- // single shot timer
+ /* single shot timer */
ATimingService_returnTcb(self, temp) /* ORIG: returnTcb(temp) */;
}else{
- // periodic timer
+ /* periodic timer */
ATimingService_addTime(self, &temp->expTime, &temp->pTime) /* ORIG: addTime(&temp->expTime,&temp->pTime) */;
ATimingService_putTcbToUsedList(self, temp) /* ORIG: putTcbToUsedList(temp) */;
}
@@ -327,7 +327,7 @@ void ATimingService_removeTcbFromUsedList(ATimingService* self, int32 idx) {
if (temp==0) return;
if (usedTcbsRoot->portIdx == idx){
- // element found, the first one
+ /* element found, the first one */
usedTcbsRoot = usedTcbsRoot->next;
ATimingService_returnTcb(self, temp) /* ORIG: returnTcb(temp) */;
return;
@@ -340,7 +340,7 @@ void ATimingService_removeTcbFromUsedList(ATimingService* self, int32 idx) {
ATimingService_returnTcb(self, temp) /* ORIG: returnTcb(temp) */;
return;
}else{
- // try next
+ /* try next */
temp2=temp;
temp=temp->next;
}
@@ -352,7 +352,7 @@ void ATimingService_putTcbToUsedList(ATimingService* self, etTimerControlBlock*
etTimerControlBlock* temp2=usedTcbsRoot;
if (temp==0){
- // list empty put new block to root
+ /* list empty put new block to root */
block->next=0;
usedTcbsRoot=block;
return;
@@ -361,11 +361,11 @@ void ATimingService_putTcbToUsedList(ATimingService* self, etTimerControlBlock*
while(1){
if (temp != 0){
if (ATimingService_isTimeGreater(self, &block->expTime, &temp->expTime) /* ORIG: isTimeGreater(&block->expTime,&temp->expTime) */){
- //try next position
+ /* try next position */
temp2=temp;
temp=temp->next;
}else{
- // right position found
+ /* right position found */
block->next=temp;
if(temp==usedTcbsRoot){
usedTcbsRoot=block;
@@ -375,7 +375,7 @@ void ATimingService_putTcbToUsedList(ATimingService* self, etTimerControlBlock*
return;
}
}else{
- // end of list reached
+ /* end of list reached */
block->next=0;
temp2->next=block;
return;
diff --git a/runtime/org.eclipse.etrice.modellib.c/src-gen/room/basic/service/timing/ATimingService.h b/runtime/org.eclipse.etrice.modellib.c/src-gen/room/basic/service/timing/ATimingService.h
index 9ab795689..c56397599 100644
--- a/runtime/org.eclipse.etrice.modellib.c/src-gen/room/basic/service/timing/ATimingService.h
+++ b/runtime/org.eclipse.etrice.modellib.c/src-gen/room/basic/service/timing/ATimingService.h
@@ -77,7 +77,7 @@ void ATimingService_addTime(ATimingService* self, etTargetTime_t* t1, etTargetTi
void ATimingService_printList(ATimingService* self);
/*--------------------- begin user code ---------------------*/
-//uc2
+/*uc2*/
/*--------------------- end user code ---------------------*/
#endif /* _ATIMINGSERVICE_H_ */
diff --git a/runtime/org.eclipse.etrice.modellib.c/src-gen/room/basic/service/timing/PTimer.c b/runtime/org.eclipse.etrice.modellib.c/src-gen/room/basic/service/timing/PTimer.c
index ec13551c6..de4c5d058 100644
--- a/runtime/org.eclipse.etrice.modellib.c/src-gen/room/basic/service/timing/PTimer.c
+++ b/runtime/org.eclipse.etrice.modellib.c/src-gen/room/basic/service/timing/PTimer.c
@@ -34,7 +34,6 @@ void PTimerReplPort_timeout(const PTimerReplPort* self, int idx) {
ET_MSC_LOGGER_SYNC_EXIT
}
-
etInt32 PTimerReplPort_getReplication(const PTimerReplPort* self) {
return ((etReplPort*)self)->size;
}
@@ -59,6 +58,7 @@ void PTimerConjReplPort_startTimer(const PTimerConjReplPort* self, int idx, uint
PTimerConjPort_startTimer((etPort*)&((etReplPort*)self)->ports[idx], data);
}
+
void PTimerConjPort_startTimeout(const PTimerConjPort* self, uint32 data) {
if (((PTimerConjPort_var*)(self->varData))->status /* ORIG: status */==0){
((PTimerConjPort_var*)(self->varData))->status /* ORIG: status */ = ET_TIMER_RUNNING;
@@ -77,6 +77,7 @@ void PTimerConjReplPort_startTimeout(const PTimerConjReplPort* self, int idx, ui
PTimerConjPort_startTimeout((etPort*)&((etReplPort*)self)->ports[idx], data);
}
+
void PTimerConjPort_kill(const PTimerConjPort* self) {
if (((PTimerConjPort_var*)(self->varData))->status /* ORIG: status */!=0){
@@ -96,7 +97,10 @@ void PTimerConjReplPort_kill(const PTimerConjReplPort* self, int idx) {
PTimerConjPort_kill((etPort*)&((etReplPort*)self)->ports[idx]);
}
+/* begin PTimerConjPort specific */
+
/*--------------------- operations ---------------------*/
+/* end PTimerConjPort specific */
etInt32 PTimerConjReplPort_getReplication(const PTimerConjReplPort* self) {
return ((etReplPort*)self)->size;
@@ -104,13 +108,13 @@ etInt32 PTimerConjReplPort_getReplication(const PTimerConjReplPort* self) {
/* receiver handlers */
void PTimerConjPort_timeout_receiveHandler(PTimerConjPort* self, const etMessage* msg, void * actor, etActorReceiveMessage receiveMessageFunc){
- //TODO: clear active bit in case of single shot timer
+ /* TODO: clear active bit in case of single shot timer */
if (((PTimerConjPort_var*)(self->varData))->status /* ORIG: status */!=0){
if (((PTimerConjPort_var*)(self->varData))->status /* ORIG: status */==ET_TIMER_RUNNING){
- // single shot timer
+ /* single shot timer */
((PTimerConjPort_var*)(self->varData))->status /* ORIG: status */=0;
}
- // msg to fsm
+ /* msg to fsm */
(*receiveMessageFunc)(actor, self, msg);
}
/* hand over the message to the actor: */
diff --git a/runtime/org.eclipse.etrice.modellib.c/src-gen/room/basic/service/timing/PTimer.h b/runtime/org.eclipse.etrice.modellib.c/src-gen/room/basic/service/timing/PTimer.h
index 7c440edbb..0f1b7a1eb 100644
--- a/runtime/org.eclipse.etrice.modellib.c/src-gen/room/basic/service/timing/PTimer.h
+++ b/runtime/org.eclipse.etrice.modellib.c/src-gen/room/basic/service/timing/PTimer.h
@@ -72,7 +72,7 @@ etInt32 PTimerConjReplPort_getReplication(const PTimerConjReplPort* self);
const char* PTimer_getMessageString(int msg_id);
/*--------------------- begin user code ---------------------*/
-//uc2
+/*uc2*/
/*--------------------- end user code ---------------------*/
#endif /* _PTIMER_H_ */

Back to the top