seperated sample application code from platform pc code to make it easier to implement new applications

bin/pc/Makefile

@@ -18,9 +18,10 @@ CFLAGS= \
 	-g \
 	-I . \
 	-I$(ROOT) \
+	-I$(ROOT)/src \
 	-I$(ENCAP) \
 	-I$(CIP) \
-	-I$(PORT) \
+	-I$(PORT)/sample_application \
 	-DOPENER_WITH_TRACES \
 	-DOPENER_TRACE_LEVEL=0xFF \
 	-W -Wall -ansi -std=c99
@@ -42,7 +43,8 @@ SOURCES= \
 	$(ENCAP)/encap.c \
 	$(ENCAP)/endianconv.c \
 	$(PORT)/main.c \
-	$(PORT)/networkhandler.c
+	$(PORT)/networkhandler.c \
+	$(PORT)/sample_application/sampleapplication.c
 
 
 OBJECTS= \
@@ -60,7 +62,8 @@ OBJECTS= \
 	$(ENCAP)/encap.o \
 	$(ENCAP)/endianconv.o \
 	$(PORT)/main.o \
-	$(PORT)/networkhandler.o 
+	$(PORT)/networkhandler.o \
+	$(PORT)/sample_application/sampleapplication.o
 	
 SPLINTFLAGS = -I../../src \
 	-I$(ENCAP) \

src/ports/platform-pc/main.c

@@ -4,7 +4,6 @@
  *
  ******************************************************************************/
 #include <stdio.h>
-#include <string.h>
 #include <stdlib.h>
 #include <signal.h>
 
@@ -13,17 +12,7 @@
 #include "cipcommon.h"
 #include "trace.h"
 
-#define DEMO_APP_INPUT_ASSEMBLY_NUM                100 //0x064
-#define DEMO_APP_OUTPUT_ASSEMBLY_NUM               150 //0x096
-#define DEMO_APP_CONFIG_ASSEMBLY_NUM               151 //0x097
-#define DEMO_APP_HEARBEAT_INPUT_ONLY_ASSEMBLY_NUM  152 //0x098
-#define DEMO_APP_HEARBEAT_LISTEN_ONLY_ASSEMBLY_NUM 153 //0x099
-#define DEMO_APP_EXPLICT_ASSEMBLY_NUM              154 //0x09A
 
-/* global variables for demo application (4 assembly data fields)  ************/EIP_UINT8 g_assemblydata064[32]; /* Input */
-EIP_UINT8 g_assemblydata096[32]; /* Output */
-EIP_UINT8 g_assemblydata097[10]; /* Config */
-EIP_UINT8 g_assemblydata09A[32]; /* Explicit */
 
 extern int newfd;
 
@@ -111,143 +100,6 @@ main(int argc, char *arg[])
   return -1;
 }
 
-EIP_STATUS
-IApp_Init(void)
-{
-  /* create 3 assembly object instances*/
-  /*INPUT*/
-  createAssemblyObject(DEMO_APP_INPUT_ASSEMBLY_NUM, &g_assemblydata064[0],
-      sizeof(g_assemblydata064));
-
-  /*OUTPUT*/
-  createAssemblyObject(DEMO_APP_OUTPUT_ASSEMBLY_NUM, &g_assemblydata096[0],
-      sizeof(g_assemblydata096));
-
-  /*CONFIG*/
-  createAssemblyObject(DEMO_APP_CONFIG_ASSEMBLY_NUM, &g_assemblydata097[0],
-      sizeof(g_assemblydata097));
-
-  /*Heart-beat output assembly for Input only connections */
-  createAssemblyObject(DEMO_APP_HEARBEAT_INPUT_ONLY_ASSEMBLY_NUM, 0, 0);
-
-  /*Heart-beat output assembly for Listen only connections */
-  createAssemblyObject(DEMO_APP_HEARBEAT_LISTEN_ONLY_ASSEMBLY_NUM, 0, 0);
-
-  /* assembly for explicit messaging */
-  createAssemblyObject(DEMO_APP_EXPLICT_ASSEMBLY_NUM, &g_assemblydata09A[0],
-      sizeof(g_assemblydata09A));
-
-  configureExclusiveOwnerConnectionPoint(0, DEMO_APP_OUTPUT_ASSEMBLY_NUM,
-      DEMO_APP_INPUT_ASSEMBLY_NUM, DEMO_APP_CONFIG_ASSEMBLY_NUM);
-  configureInputOnlyConnectionPoint(0,
-      DEMO_APP_HEARBEAT_INPUT_ONLY_ASSEMBLY_NUM, DEMO_APP_INPUT_ASSEMBLY_NUM,
-      DEMO_APP_CONFIG_ASSEMBLY_NUM);
-  configureListenOnlyConnectionPoint(0,
-      DEMO_APP_HEARBEAT_LISTEN_ONLY_ASSEMBLY_NUM, DEMO_APP_INPUT_ASSEMBLY_NUM,
-      DEMO_APP_CONFIG_ASSEMBLY_NUM);
-
-  return EIP_OK;
-}
-
-void
-IApp_HandleApplication(void)
-{
-  /* check if application needs to trigger an connection */
-}
-
-void
-IApp_IOConnectionEvent(unsigned int pa_unOutputAssembly,
-    unsigned int pa_unInputAssembly, EIOConnectionEvent pa_eIOConnectionEvent)
-{
-  /* maintain a correct output state according to the connection state*/
-
-  (void) pa_unOutputAssembly; /* suppress compiler warning */
-  (void) pa_unInputAssembly; /* suppress compiler warning */
-  (void) pa_eIOConnectionEvent; /* suppress compiler warning */
-}
-
-EIP_STATUS
-IApp_AfterAssemblyDataReceived(S_CIP_Instance *pa_pstInstance)
-{
-  EIP_STATUS nRetVal = EIP_OK;
-
-  /*handle the data received e.g., update outputs of the device */
-  switch (pa_pstInstance->nInstanceNr)
-    {
-  case DEMO_APP_OUTPUT_ASSEMBLY_NUM:
-    /* Data for the output assembly has been received.
-     * Mirror it to the inputs */
-    memcpy(&g_assemblydata064[0], &g_assemblydata096[0],
-        sizeof(g_assemblydata064));
-    break;
-  case DEMO_APP_EXPLICT_ASSEMBLY_NUM:
-    /* do something interesting with the new data from
-     * the explicit set-data-attribute message */
-    break;
-  case DEMO_APP_CONFIG_ASSEMBLY_NUM:
-    /* Add here code to handle configuration data and check if it is ok
-     * The demo application does not handle config data.
-     * However in order to pass the test we accept any data given.
-     * EIP_ERROR
-     */
-    nRetVal = EIP_OK;
-    break;
-    }
-  return nRetVal;
-}
-
-EIP_BOOL8
-IApp_BeforeAssemblyDataSend(S_CIP_Instance *pa_pstInstance)
-{
-  /*update data to be sent e.g., read inputs of the device */
-  /*In this sample app we mirror the data from out to inputs on data receive
-   * therefore we need nothing to do here. Just return true to inform that
-   * the data is new.
-   */
-
-  if (pa_pstInstance->nInstanceNr == DEMO_APP_EXPLICT_ASSEMBLY_NUM)
-    {
-      /* do something interesting with the existing data
-       * for the explicit get-data-attribute message */
-    }
-  return true;
-}
-
-EIP_STATUS
-IApp_ResetDevice(void)
-{
-  /* add reset code here*/
-  return EIP_OK;
-}
-
-EIP_STATUS
-IApp_ResetDeviceToInitialConfiguration(void)
-{
-  /*rest the parameters */
-
-  /*than perform device reset*/
-  IApp_ResetDevice();
-  return EIP_OK;
-}
-
-void *
-IApp_CipCalloc(unsigned pa_nNumberOfElements, unsigned pa_nSizeOfElement)
-{
-  return calloc(pa_nNumberOfElements, pa_nSizeOfElement);
-}
-
-void
-IApp_CipFree(void *pa_poData)
-{
-  free(pa_poData);
-}
-
-void
-IApp_RunIdleChanged(EIP_UINT32 pa_nRunIdleValue)
-{
-  (void) pa_nRunIdleValue;
-}
-
 void
 leaveStack(int pa_nSig)
 {
@@ -255,4 +107,3 @@ leaveStack(int pa_nSig)
   OPENER_TRACE_STATE("got signal HUP\n");
   g_nEndStack = 1;
 }
-

src/ports/platform-pc/sample_application/sampleapplication.c

@@ -0,0 +1,162 @@
+/*******************************************************************************
+ * Copyright (c) 2012, Rockwell Automation, Inc.
+ * All rights reserved.
+ *
+ ******************************************************************************/
+
+#include "opener_api.h"
+#include <string.h>
+#include <stdlib.h>
+
+
+#define DEMO_APP_INPUT_ASSEMBLY_NUM                100 //0x064
+#define DEMO_APP_OUTPUT_ASSEMBLY_NUM               150 //0x096
+#define DEMO_APP_CONFIG_ASSEMBLY_NUM               151 //0x097
+#define DEMO_APP_HEARBEAT_INPUT_ONLY_ASSEMBLY_NUM  152 //0x098
+#define DEMO_APP_HEARBEAT_LISTEN_ONLY_ASSEMBLY_NUM 153 //0x099
+#define DEMO_APP_EXPLICT_ASSEMBLY_NUM              154 //0x09A
+
+/* global variables for demo application (4 assembly data fields)  ************/
+
+EIP_UINT8 g_assemblydata064[32]; /* Input */
+EIP_UINT8 g_assemblydata096[32]; /* Output */
+EIP_UINT8 g_assemblydata097[10]; /* Config */
+EIP_UINT8 g_assemblydata09A[32]; /* Explicit */
+
+EIP_STATUS
+IApp_Init(void)
+{
+  /* create 3 assembly object instances*/
+  /*INPUT*/
+  createAssemblyObject(DEMO_APP_INPUT_ASSEMBLY_NUM, &g_assemblydata064[0],
+      sizeof(g_assemblydata064));
+
+  /*OUTPUT*/
+  createAssemblyObject(DEMO_APP_OUTPUT_ASSEMBLY_NUM, &g_assemblydata096[0],
+      sizeof(g_assemblydata096));
+
+  /*CONFIG*/
+  createAssemblyObject(DEMO_APP_CONFIG_ASSEMBLY_NUM, &g_assemblydata097[0],
+      sizeof(g_assemblydata097));
+
+  /*Heart-beat output assembly for Input only connections */
+  createAssemblyObject(DEMO_APP_HEARBEAT_INPUT_ONLY_ASSEMBLY_NUM, 0, 0);
+
+  /*Heart-beat output assembly for Listen only connections */
+  createAssemblyObject(DEMO_APP_HEARBEAT_LISTEN_ONLY_ASSEMBLY_NUM, 0, 0);
+
+  /* assembly for explicit messaging */
+  createAssemblyObject(DEMO_APP_EXPLICT_ASSEMBLY_NUM, &g_assemblydata09A[0],
+      sizeof(g_assemblydata09A));
+
+  configureExclusiveOwnerConnectionPoint(0, DEMO_APP_OUTPUT_ASSEMBLY_NUM,
+      DEMO_APP_INPUT_ASSEMBLY_NUM, DEMO_APP_CONFIG_ASSEMBLY_NUM);
+  configureInputOnlyConnectionPoint(0,
+      DEMO_APP_HEARBEAT_INPUT_ONLY_ASSEMBLY_NUM, DEMO_APP_INPUT_ASSEMBLY_NUM,
+      DEMO_APP_CONFIG_ASSEMBLY_NUM);
+  configureListenOnlyConnectionPoint(0,
+      DEMO_APP_HEARBEAT_LISTEN_ONLY_ASSEMBLY_NUM, DEMO_APP_INPUT_ASSEMBLY_NUM,
+      DEMO_APP_CONFIG_ASSEMBLY_NUM);
+
+  return EIP_OK;
+}
+
+void
+IApp_HandleApplication(void)
+{
+  /* check if application needs to trigger an connection */
+}
+
+void
+IApp_IOConnectionEvent(unsigned int pa_unOutputAssembly,
+    unsigned int pa_unInputAssembly, EIOConnectionEvent pa_eIOConnectionEvent)
+{
+  /* maintain a correct output state according to the connection state*/
+
+  (void) pa_unOutputAssembly; /* suppress compiler warning */
+  (void) pa_unInputAssembly; /* suppress compiler warning */
+  (void) pa_eIOConnectionEvent; /* suppress compiler warning */
+}
+
+EIP_STATUS
+IApp_AfterAssemblyDataReceived(S_CIP_Instance *pa_pstInstance)
+{
+  EIP_STATUS nRetVal = EIP_OK;
+
+  /*handle the data received e.g., update outputs of the device */
+  switch (pa_pstInstance->nInstanceNr)
+    {
+  case DEMO_APP_OUTPUT_ASSEMBLY_NUM:
+    /* Data for the output assembly has been received.
+     * Mirror it to the inputs */
+    memcpy(&g_assemblydata064[0], &g_assemblydata096[0],
+        sizeof(g_assemblydata064));
+    break;
+  case DEMO_APP_EXPLICT_ASSEMBLY_NUM:
+    /* do something interesting with the new data from
+     * the explicit set-data-attribute message */
+    break;
+  case DEMO_APP_CONFIG_ASSEMBLY_NUM:
+    /* Add here code to handle configuration data and check if it is ok
+     * The demo application does not handle config data.
+     * However in order to pass the test we accept any data given.
+     * EIP_ERROR
+     */
+    nRetVal = EIP_OK;
+    break;
+    }
+  return nRetVal;
+}
+
+EIP_BOOL8
+IApp_BeforeAssemblyDataSend(S_CIP_Instance *pa_pstInstance)
+{
+  /*update data to be sent e.g., read inputs of the device */
+  /*In this sample app we mirror the data from out to inputs on data receive
+   * therefore we need nothing to do here. Just return true to inform that
+   * the data is new.
+   */
+
+  if (pa_pstInstance->nInstanceNr == DEMO_APP_EXPLICT_ASSEMBLY_NUM)
+    {
+      /* do something interesting with the existing data
+       * for the explicit get-data-attribute message */
+    }
+  return true;
+}
+
+EIP_STATUS
+IApp_ResetDevice(void)
+{
+  /* add reset code here*/
+  return EIP_OK;
+}
+
+EIP_STATUS
+IApp_ResetDeviceToInitialConfiguration(void)
+{
+  /*rest the parameters */
+
+  /*than perform device reset*/
+  IApp_ResetDevice();
+  return EIP_OK;
+}
+
+void *
+IApp_CipCalloc(unsigned pa_nNumberOfElements, unsigned pa_nSizeOfElement)
+{
+  return calloc(pa_nNumberOfElements, pa_nSizeOfElement);
+}
+
+void
+IApp_CipFree(void *pa_poData)
+{
+  free(pa_poData);
+}
+
+void
+IApp_RunIdleChanged(EIP_UINT32 pa_nRunIdleValue)
+{
+  (void) pa_nRunIdleValue;
+}
+