stv0g/libiec61850
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

- some small fixes

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

6
config/stack_config.h
View file

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

6
src/iec61850/client/client_report.c
View file

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

2
src/iec61850/server/mms_mapping/mms_mapping.c
View file

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

2
src/iec61850/server/model/model.c
View file

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

3
src/vs/libiec61850-wo-goose.def
View file

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

9
src/vs/libiec61850.def
View file

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