- some small fixes

This commit is contained in:
Michael Zillgith 2015-10-19 16:12:58 +02:00
parent 94a98bcc6d
commit 584493cf53
6 changed files with 13 additions and 15 deletions

View file

@ -18,8 +18,8 @@
#define DEBUG_ISO_SERVER 0
#define DEBUG_ISO_CLIENT 0
#define DEBUG_IED_SERVER 0
#define DEBUG_IED_CLIENT 1
#define DEBUG_MMS_CLIENT 1
#define DEBUG_IED_CLIENT 0
#define DEBUG_MMS_CLIENT 0
#define DEBUG_MMS_SERVER 0
#define DEBUG_GOOSE_SUBSCRIBER 0
#define DEBUG_GOOSE_PUBLISHER 0
@ -34,7 +34,7 @@
* 0 ==> server runs in multi-threaded mode (one thread for each connection and
* one server background thread )
*/
#define CONFIG_MMS_SINGLE_THREADED 1
#define CONFIG_MMS_SINGLE_THREADED 0
/*
* Optimize stack for threadless operation - don't use semaphores

View file

@ -550,13 +550,13 @@ private_IedConnection_handleReport(IedConnection self, MmsValue* value)
}
}
printf("U0 sem wait\n");
Semaphore_wait(self->reportHandlerMutex);
printf("U1 call user\n");
if (matchingReport->callback != NULL)
matchingReport->callback(matchingReport->callbackParameter, matchingReport);
Semaphore_post(self->reportHandlerMutex);
printf("U2\n");
exit_function:
return;
}

View file

@ -1893,7 +1893,7 @@ mmsWriteHandler(void* parameter, MmsDomain* domain,
return DATA_ACCESS_ERROR_SUCCESS;
}
else
return DATA_ACCESS_ERROR_OBJECT_VALUE_INVALID;
return DATA_ACCESS_ERROR_OBJECT_NONE_EXISTENT;
}
return DATA_ACCESS_ERROR_OBJECT_ACCESS_DENIED;

View file

@ -408,7 +408,7 @@ LogicalDevice_getChildByMmsVariableName(LogicalDevice* logicalDevice, const char
char fcString[3];
char nameRef[65];
char* separator = strchr(mmsVariableName,'$');
const char* separator = strchr(mmsVariableName,'$');
if (separator == NULL)
return NULL;

View file

@ -486,11 +486,10 @@ EXPORTS
MmsValue_getUtcTimeBuffer
Timestamp_clearFlags
IedServer_setGooseInterfaceId
MmsServerIdentity_destroy
ClientReport_getBufOvfl
MmsValue_getUtcTimeInMsWithUs
IedModel_setIedNameForDynamicModel
ControlObjectClient_useConstantT
ControlObjectClient_setOrigin
LogicalDevice_getChildByMmsVariableName
LogicalNode_getDataset
LogicalNode_getDataSet

View file

@ -435,7 +435,7 @@ EXPORTS
ReportControlBlock_create
IedConnection_readBooleanValue
IedConnection_readFloatValue
IedConnection_readStringValue
IedConnection_readStringValue
IedConnection_readInt32Value
IedConnection_readUnsigned32Value
IedConnection_readTimestampValue
@ -475,8 +475,8 @@ EXPORTS
SettingGroupControlBlock_create
MmsConnection_setConnectTimeout
IedConnection_setConnectTimeout
MmsValue_newVisibleStringWithSize
MmsValue_newMmsStringWithSize
MmsValue_newVisibleStringWithSize
MmsValue_newMmsStringWithSize
MmsValue_setInt8
MmsValue_setInt16
LogicalDevice_getSettingGroupControlBlock
@ -510,11 +510,10 @@ EXPORTS
MmsValue_getUtcTimeBuffer
Timestamp_clearFlags
IedServer_setGooseInterfaceId
MmsServerIdentity_destroy
ClientReport_getBufOvfl
MmsValue_getUtcTimeInMsWithUs
IedModel_setIedNameForDynamicModel
ControlObjectClient_useConstantT
ControlObjectClient_setOrigin
LogicalDevice_getChildByMmsVariableName
LogicalNode_getDataset
LogicalNode_getDataSet