Commit 2852a3b7 authored by Claes Sjofors's avatar Claes Sjofors

plc, nmps lock wasn't removed at runtime stop

parent ba53dd46
...@@ -112,8 +112,9 @@ void NMpsCell_init( pwr_sClass_NMpsCell *object) ...@@ -112,8 +112,9 @@ void NMpsCell_init( pwr_sClass_NMpsCell *object)
{ {
plc_t_DataInfo *data_index; plc_t_DataInfo *data_index;
int i; int i;
pwr_tStatus sts;
// nmps_create_lock( &sts); nmps_create_lock( &sts);
if ( !(object->Function & NMPS_CELLFUNC_BACKUP)) if ( !(object->Function & NMPS_CELLFUNC_BACKUP))
NMpsCell_init_time( object); NMpsCell_init_time( object);
...@@ -705,8 +706,9 @@ void NMpsStoreCell_init( pwr_sClass_NMpsStoreCell *object) ...@@ -705,8 +706,9 @@ void NMpsStoreCell_init( pwr_sClass_NMpsStoreCell *object)
{ {
plc_t_DataInfo *data_index; plc_t_DataInfo *data_index;
int i; int i;
pwr_tStatus sts;
// nmps_create_lock( &sts); nmps_create_lock( &sts);
if ( !(object->Function & NMPS_CELLFUNC_BACKUP)) if ( !(object->Function & NMPS_CELLFUNC_BACKUP))
NMpsCell_init_time( (pwr_sClass_NMpsCell *) object); NMpsCell_init_time( (pwr_sClass_NMpsCell *) object);
......
...@@ -299,12 +299,12 @@ init_process ( char *name) ...@@ -299,12 +299,12 @@ init_process ( char *name)
exit(sts); exit(sts);
} }
nmps_create_lock( &sts); // nmps_create_lock( &sts);
if (EVEN(sts)) { // if (EVEN(sts)) {
errh_Fatal("nmps_create_lock, %m", sts); // errh_Fatal("nmps_create_lock, %m", sts);
errh_SetStatus( PWR__SRVTERM); // errh_SetStatus( PWR__SRVTERM);
exit(sts); // exit(sts);
} //}
if ( strstr( name, "rt_plc_core") != 0) if ( strstr( name, "rt_plc_core") != 0)
pp->is_core = 1; pp->is_core = 1;
...@@ -588,8 +588,6 @@ clean_all ( ...@@ -588,8 +588,6 @@ clean_all (
sts = gdh_UnrefObjectInfoAll(); sts = gdh_UnrefObjectInfoAll();
if (EVEN(sts)) if (EVEN(sts))
errh_Error("gdh_UnrefObjectInfoAll, %m", sts); errh_Error("gdh_UnrefObjectInfoAll, %m", sts);
nmps_delete_lock( &sts);
} }
/* Link to I/O base areas. /* Link to I/O base areas.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment