From 07aaf232386f3db983dc01b70539b87ad11352b5 Mon Sep 17 00:00:00 2001 From: Michael Zillgith Date: Sat, 25 Apr 2020 18:43:04 +0200 Subject: [PATCH] - fixed examples that have control handlers with old signature --- demos/beaglebone/beagle_demo.c | 6 +++--- examples/server_example_61400_25/server_example_61400_25.c | 2 +- examples/server_example_basic_io/server_example_basic_io.c | 2 +- examples/server_example_goose/server_example_goose.c | 2 +- .../server_example_password_auth.c | 4 ++-- .../server_example_threadless/server_example_threadless.c | 2 +- examples/tls_server_example/tls_server_example.c | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/demos/beaglebone/beagle_demo.c b/demos/beaglebone/beagle_demo.c index 82c1ac05..f1ed46d1 100644 --- a/demos/beaglebone/beagle_demo.c +++ b/demos/beaglebone/beagle_demo.c @@ -54,7 +54,7 @@ connectionIndicationHandler(IedServer server, ClientConnection connection, bool } static CheckHandlerResult -performCheckHandler(void* parameter, MmsValue* ctlVal, bool test, bool interlockCheck, ClientConnection connection) +performCheckHandler(ControlAction action, void* parameter, MmsValue* ctlVal, bool test, bool interlockCheck, ClientConnection connection) { if (controllingClient == NULL) { printf("Client takes control -> switch to remote control operation mode\n"); @@ -101,7 +101,7 @@ updateLED3stVal(bool newLedState, uint64_t timeStamp) { } static ControlHandlerResult -controlHandlerForBinaryOutput(void* parameter, MmsValue* value, bool test) +controlHandlerForBinaryOutput(ControlAction action, void* parameter, MmsValue* value, bool test) { if (test) return CONTROL_RESULT_OK; @@ -151,7 +151,7 @@ static int ledOffTimeMs = 1000; static int32_t opCnt = 0; static ControlHandlerResult -controlHandlerForInt32Controls(void* parameter, MmsValue* value, bool test) +controlHandlerForInt32Controls(ControlAction action, void* parameter, MmsValue* value, bool test) { if (test) return CONTROL_RESULT_OK; diff --git a/examples/server_example_61400_25/server_example_61400_25.c b/examples/server_example_61400_25/server_example_61400_25.c index c0664114..f91cbee5 100644 --- a/examples/server_example_61400_25/server_example_61400_25.c +++ b/examples/server_example_61400_25/server_example_61400_25.c @@ -43,7 +43,7 @@ void sigint_handler(int signalId) bool -controlHandlerForIntegerOutput(void* parameter, MmsValue* value, bool test) +controlHandlerForIntegerOutput(ControlAction action, void* parameter, MmsValue* value, bool test) { if (MmsValue_getType(value) != MMS_INTEGER) return false; diff --git a/examples/server_example_basic_io/server_example_basic_io.c b/examples/server_example_basic_io/server_example_basic_io.c index 3bd87ee2..4966f33d 100644 --- a/examples/server_example_basic_io/server_example_basic_io.c +++ b/examples/server_example_basic_io/server_example_basic_io.c @@ -28,7 +28,7 @@ sigint_handler(int signalId) } static ControlHandlerResult -controlHandlerForBinaryOutput(void* parameter, MmsValue* value, bool test) +controlHandlerForBinaryOutput(ControlAction action, void* parameter, MmsValue* value, bool test) { if (test) return CONTROL_RESULT_FAILED; diff --git a/examples/server_example_goose/server_example_goose.c b/examples/server_example_goose/server_example_goose.c index 84e36b0d..2fe77f47 100644 --- a/examples/server_example_goose/server_example_goose.c +++ b/examples/server_example_goose/server_example_goose.c @@ -26,7 +26,7 @@ void sigint_handler(int signalId) } void -controlHandlerForBinaryOutput(void* parameter, MmsValue* value) +controlHandlerForBinaryOutput(ControlAction action, void* parameter, MmsValue* value) { uint64_t timestamp = Hal_getTimeInMs(); diff --git a/examples/server_example_password_auth/server_example_password_auth.c b/examples/server_example_password_auth/server_example_password_auth.c index 0e94522f..bae9c2fe 100644 --- a/examples/server_example_password_auth/server_example_password_auth.c +++ b/examples/server_example_password_auth/server_example_password_auth.c @@ -88,7 +88,7 @@ clientAuthenticator(void* parameter, AcseAuthenticationParameter authParameter, } static CheckHandlerResult -performCheckHandler (void* parameter, MmsValue* ctlVal, bool test, bool interlockCheck, ClientConnection connection) +performCheckHandler (ControlAction action, void* parameter, MmsValue* ctlVal, bool test, bool interlockCheck, ClientConnection connection) { void* securityToken = ClientConnection_getSecurityToken(connection); @@ -99,7 +99,7 @@ performCheckHandler (void* parameter, MmsValue* ctlVal, bool test, bool interloc } static void -controlHandlerForBinaryOutput(void* parameter, MmsValue* value, bool test) +controlHandlerForBinaryOutput(ControlAction action, void* parameter, MmsValue* value, bool test) { MmsValue* timeStamp = MmsValue_newUtcTimeByMsTime(Hal_getTimeInMs()); diff --git a/examples/server_example_threadless/server_example_threadless.c b/examples/server_example_threadless/server_example_threadless.c index 7f1f5c8f..dd9dc354 100644 --- a/examples/server_example_threadless/server_example_threadless.c +++ b/examples/server_example_threadless/server_example_threadless.c @@ -26,7 +26,7 @@ sigint_handler(int signalId) } ControlHandlerResult -controlHandlerForBinaryOutput(void* parameter, MmsValue* value, bool test) +controlHandlerForBinaryOutput(ControlAction action, void* parameter, MmsValue* value, bool test) { if (MmsValue_getType(value) == MMS_BOOLEAN) { diff --git a/examples/tls_server_example/tls_server_example.c b/examples/tls_server_example/tls_server_example.c index 46316994..a8980d01 100644 --- a/examples/tls_server_example/tls_server_example.c +++ b/examples/tls_server_example/tls_server_example.c @@ -26,7 +26,7 @@ sigint_handler(int signalId) } static ControlHandlerResult -controlHandlerForBinaryOutput(void* parameter, MmsValue* value, bool test) +controlHandlerForBinaryOutput(ControlAction action, void* parameter, MmsValue* value, bool test) { if (test) return CONTROL_RESULT_FAILED;