[runtime.c, generator.c] bug fix in codegen, improved handling of replicated ports

replicated sub port is "derived" from etPort, casts can be avoided

2 files changed, 2 insertions, 14 deletions

diff --git a/runtime/org.eclipse.etrice.runtime.c/src/common/messaging/etMessageReceiver.h b/runtime/org.eclipse.etrice.runtime.c/src/common/messaging/etMessageReceiver.h
index eb0a4ceec..2eca06ebe 100644
--- a/runtime/org.eclipse.etrice.runtime.c/src/common/messaging/etMessageReceiver.h
+++ b/runtime/org.eclipse.etrice.runtime.c/src/common/messaging/etMessageReceiver.h
@@ -17,7 +17,7 @@
 

 #include "messaging/etMessage.h"

 

-typedef void (*etActorReceiveMessage)(void* self, void* ifitem, const etMessage*  msg);

+typedef void (*etActorReceiveMessage)(void* self, const void* ifitem, const etMessage*  msg);

 typedef etBool (*etDispatcherReceiveMessage)(const etMessage* msg);

 typedef void (*etDispatcherExecute)(void);

 

diff --git a/runtime/org.eclipse.etrice.runtime.c/src/common/modelbase/etPort.h b/runtime/org.eclipse.etrice.runtime.c/src/common/modelbase/etPort.h
index e16d2bf14..33008a9fc 100644
--- a/runtime/org.eclipse.etrice.runtime.c/src/common/modelbase/etPort.h
+++ b/runtime/org.eclipse.etrice.runtime.c/src/common/modelbase/etPort.h
@@ -38,20 +38,8 @@ typedef struct {
 } etPort;

 

 typedef struct {

-	void* varData;

-	etMessageService* msgService;

-	etAddressId peerAddress;

-	etAddressId localId;

+	etPort port;

 	etAddressId index;

-

-	#ifdef ET_ASYNC_MSC_LOGGER_ACTIVATE

-		const char* myInstName;

-		const char* peerInstName;

-	#endif

-	#ifdef etDEBUG

-	etAddressId address;

-	/* thread ID from msg service: msgService->threadId */

-	#endif

 } etReplSubPort;

 

 typedef struct {