Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenrik Rentz-Reichert2012-02-23 15:08:01 +0000
committerHenrik Rentz-Reichert2012-02-23 15:08:01 +0000
commit7542ea621d90f804c9703d769372630ecc090804 (patch)
treea52b1704df8d068eb686cebb0ece5385a19c2915 /plugins/org.eclipse.etrice.generator.c/src/org/eclipse
parent238d6a7eec1393352e05a72eb4245149bf556084 (diff)
downloadorg.eclipse.etrice-7542ea621d90f804c9703d769372630ecc090804.tar.gz
org.eclipse.etrice-7542ea621d90f804c9703d769372630ecc090804.tar.xz
org.eclipse.etrice-7542ea621d90f804c9703d769372630ecc090804.zip
[generator.c, runtime.c] extracted generated generic function to runtime
Diffstat (limited to 'plugins/org.eclipse.etrice.generator.c/src/org/eclipse')
-rw-r--r--plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/CTranslationProvider.java2
-rw-r--r--plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/ProtocolClassGen.xtend13
2 files changed, 3 insertions, 12 deletions
diff --git a/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/CTranslationProvider.java b/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/CTranslationProvider.java
index 1ce05edd1..64a7a3b86 100644
--- a/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/CTranslationProvider.java
+++ b/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/CTranslationProvider.java
@@ -29,11 +29,9 @@ import com.google.inject.Inject;
public class CTranslationProvider implements ITranslationProvider {
@Inject private RoomExtensions roomExt;
- private ActorClass ac;
@Override
public void setActorClass(ActorClass ac) {
- this.ac = ac;
}
@Override
diff --git a/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/ProtocolClassGen.xtend b/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/ProtocolClassGen.xtend
index 9955ae4d8..09e8012cc 100644
--- a/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/ProtocolClassGen.xtend
+++ b/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/ProtocolClassGen.xtend
@@ -102,13 +102,6 @@ class ProtocolClassGen extends GenericProtocolClassGenerator {
#include "etMSCLogger.h"
«helpers.userCode(pc.userCode3)»
-
- static void sendMessage(const etPort* self, etInt16 evtId) {
- etMessage* msg = etMessageService_getMessageBuffer(self->msgService, sizeof(etMessage));
- msg->address = self->peerAddress;
- msg->evtID = evtId;
- etMessageService_pushMessage(self->msgService, msg);
- }
/*--------------------- port classes */
«portClassSource(pc, false)»
@@ -269,7 +262,7 @@ class ProtocolClassGen extends GenericProtocolClassGenerator {
void «portClassName»_«message.name»(const «portClassName»* self) {
ET_MSC_LOGGER_SYNC_ENTRY("«portClassName»", "«message.name»")
if (self->receiveMessageFunc!=NULL) {
- sendMessage(self, «memberInUse(pc.name, dir+message.name)»);
+ etPort_sendMessage(self, «memberInUse(pc.name, dir+message.name)»);
}
ET_MSC_LOGGER_SYNC_EXIT
}
@@ -278,7 +271,7 @@ class ProtocolClassGen extends GenericProtocolClassGenerator {
int i;
ET_MSC_LOGGER_SYNC_ENTRY("«replPortClassName»", "«message.name»")
for (i=0; i<self->size; ++i) {
- sendMessage((etPort*)(&self->ports[i]), «memberInUse(pc.name, dir+message.name)»);
+ etPort_sendMessage((etPort*)(&self->ports[i]), «memberInUse(pc.name, dir+message.name)»);
}
ET_MSC_LOGGER_SYNC_EXIT
}
@@ -286,7 +279,7 @@ class ProtocolClassGen extends GenericProtocolClassGenerator {
void «replPortClassName»_«message.name»(const «replPortClassName»* self, int idx) {
ET_MSC_LOGGER_SYNC_ENTRY("«replPortClassName»", "«message.name»")
if (0<=idx && idx<self->size) {
- sendMessage((etPort*)(&self->ports[idx]), «memberInUse(pc.name, dir+message.name)»);
+ etPort_sendMessage((etPort*)(&self->ports[idx]), «memberInUse(pc.name, dir+message.name)»);
}
ET_MSC_LOGGER_SYNC_EXIT
}

Back to the top