Skip to content

P
proview
Commit 8a42f8d2 authored by Claes Sjofors's avatar Claes Sjofors
Browse files
Options

Init value area objects changed to InitArea class with UInt64 array

parent fb1fe519
Hide whitespace changes
Inline Side-by-side
Showing with 92 additions and 40 deletions
src/changelog.txt
View file @ 8a42f8d2
......@@ -130,4 +130,7 @@
091211 cs pwre Format of pwre database changed. Delimiter character changed from : to ;.
100111 cs pwrb Attribute (and method) Photo added to signal objects.
100111 cs co Set language is prepared for all languages and checks if language is installed.
100129 cs emon Event object and sup object changed from objid to attrref. Increased size of eventname.
\ No newline at end of file
100129 cs emon Event object and sup object changed from objid to attrref. Increased size of eventname.
100209 cs wbl New class InitArea for the initial value area objects.
100209 cs gdh gdh_RefObjectInfoList returns error status for invalid local attribute.
100202 cs errh Log message sent via qcom, null termination was lost.
\ No newline at end of file
src/exe/rt_ini/src/ini.c
View file @ 8a42f8d2
......@@ -2362,32 +2362,32 @@ create_active_io ()
sts = gdh_CreateObject("pwrNode-active-io-iv", pwr_cClass_IvArea,
iv_cnt * sizeof(((pwr_sClass_IvArea*)0)->Value[0]),
&oid, pwr_cNObjid, 0, pwr_cNObjid);
sts = gdh_CreateObject("pwrNode-active-io-dv_init", pwr_cClass_IvArea,
dv_cnt * sizeof(((pwr_sClass_IvArea*)0)->Value[0]),
sts = gdh_CreateObject("pwrNode-active-io-dv_init", pwr_cClass_InitArea,
dv_cnt * sizeof(((pwr_sClass_InitArea*)0)->Value[0]),
&oid, pwr_cNObjid, 0, pwr_cNObjid);
sts = gdh_CreateObject("pwrNode-active-io-av_init", pwr_cClass_IvArea,
av_cnt * sizeof(((pwr_sClass_IvArea*)0)->Value[0]),
sts = gdh_CreateObject("pwrNode-active-io-av_init", pwr_cClass_InitArea,
av_cnt * sizeof(((pwr_sClass_InitArea*)0)->Value[0]),
&oid, pwr_cNObjid, 0, pwr_cNObjid);
sts = gdh_CreateObject("pwrNode-active-io-iv_init", pwr_cClass_IvArea,
iv_cnt * sizeof(((pwr_sClass_IvArea*)0)->Value[0]),
sts = gdh_CreateObject("pwrNode-active-io-iv_init", pwr_cClass_InitArea,
iv_cnt * sizeof(((pwr_sClass_InitArea*)0)->Value[0]),
&oid, pwr_cNObjid, 0, pwr_cNObjid);
sts = gdh_CreateObject("pwrNode-active-io-ai_init", pwr_cClass_IvArea,
ai_cnt * sizeof(((pwr_sClass_IvArea*)0)->Value[0]),
sts = gdh_CreateObject("pwrNode-active-io-ai_init", pwr_cClass_InitArea,
ai_cnt * sizeof(((pwr_sClass_InitArea*)0)->Value[0]),
&oid, pwr_cNObjid, 0, pwr_cNObjid);
sts = gdh_CreateObject("pwrNode-active-io-ao_init", pwr_cClass_IvArea,
ao_cnt * sizeof(((pwr_sClass_IvArea*)0)->Value[0]),
sts = gdh_CreateObject("pwrNode-active-io-ao_init", pwr_cClass_InitArea,
ao_cnt * sizeof(((pwr_sClass_InitArea*)0)->Value[0]),
&oid, pwr_cNObjid, 0, pwr_cNObjid);
sts = gdh_CreateObject("pwrNode-active-io-di_init", pwr_cClass_IvArea,
di_cnt * sizeof(((pwr_sClass_IvArea*)0)->Value[0]),
sts = gdh_CreateObject("pwrNode-active-io-di_init", pwr_cClass_InitArea,
di_cnt * sizeof(((pwr_sClass_InitArea*)0)->Value[0]),
&oid, pwr_cNObjid, 0, pwr_cNObjid);
sts = gdh_CreateObject("pwrNode-active-io-do_init", pwr_cClass_IvArea,
do_cnt * sizeof(((pwr_sClass_IvArea*)0)->Value[0]),
sts = gdh_CreateObject("pwrNode-active-io-do_init", pwr_cClass_InitArea,
do_cnt * sizeof(((pwr_sClass_InitArea*)0)->Value[0]),
&oid, pwr_cNObjid, 0, pwr_cNObjid);
sts = gdh_CreateObject("pwrNode-active-io-ii_init", pwr_cClass_IvArea,
ii_cnt * sizeof(((pwr_sClass_IvArea*)0)->Value[0]),
sts = gdh_CreateObject("pwrNode-active-io-ii_init", pwr_cClass_InitArea,
ii_cnt * sizeof(((pwr_sClass_InitArea*)0)->Value[0]),
&oid, pwr_cNObjid, 0, pwr_cNObjid);
sts = gdh_CreateObject("pwrNode-active-io-io_init", pwr_cClass_IvArea,
io_cnt * sizeof(((pwr_sClass_IvArea*)0)->Value[0]),
sts = gdh_CreateObject("pwrNode-active-io-io_init", pwr_cClass_InitArea,
io_cnt * sizeof(((pwr_sClass_InitArea*)0)->Value[0]),
&oid, pwr_cNObjid, 0, pwr_cNObjid);
}
......
src/exe/rt_ini/src/rt_ini.c
View file @ 8a42f8d2
......@@ -845,9 +845,9 @@ load_backup ()
pwr_sClass_AvArea *avp;
pwr_sClass_DvArea *dvp;
pwr_sClass_IvArea *ivp;
pwr_sClass_IvArea *iavp;
pwr_sClass_IvArea *idvp;
pwr_sClass_IvArea *iivp;
pwr_sClass_InitArea *iavp;
pwr_sClass_InitArea *idvp;
pwr_sClass_InitArea *iivp;
pwr_tStatus sts;
int i;
pwr_sClass_IOHandler *iop;
......
src/exp/rt/src/rt_plc_process.c
View file @ 8a42f8d2
......@@ -491,15 +491,15 @@ link_io_base_areas (
dlink_area((plc_sDlink *)&pp->base.ii_a, "pwrNode-active-io-ii", pp->IOHandler->IiCount * sizeof(pwr_tInt32));
dlink_area((plc_sDlink *)&pp->base.io_a, "pwrNode-active-io-io", pp->IOHandler->IoCount * sizeof(pwr_tInt32));
dlink_area((plc_sDlink *)&pp->base.iv_a, "pwrNode-active-io-iv", pp->IOHandler->IvCount * sizeof(pwr_tInt32));
dlink_area((plc_sDlink *)&pp->base.av_i, "pwrNode-active-io-av_init", pp->IOHandler->AvCount * sizeof(pwr_tInt32));
dlink_area((plc_sDlink *)&pp->base.dv_i, "pwrNode-active-io-dv_init", pp->IOHandler->DvCount * sizeof(pwr_tInt32));
dlink_area((plc_sDlink *)&pp->base.iv_i, "pwrNode-active-io-iv_init", pp->IOHandler->IvCount * sizeof(pwr_tInt32));
dlink_area((plc_sDlink *)&pp->base.ai_i, "pwrNode-active-io-ai_init", pp->IOHandler->AiCount * sizeof(pwr_tInt32));
dlink_area((plc_sDlink *)&pp->base.ao_i, "pwrNode-active-io-ao_init", pp->IOHandler->AoCount * sizeof(pwr_tInt32));
dlink_area((plc_sDlink *)&pp->base.di_i, "pwrNode-active-io-di_init", pp->IOHandler->DiCount * sizeof(pwr_tInt32));
dlink_area((plc_sDlink *)&pp->base.do_i, "pwrNode-active-io-do_init", pp->IOHandler->DoCount * sizeof(pwr_tInt32));
dlink_area((plc_sDlink *)&pp->base.ii_i, "pwrNode-active-io-ii_init", pp->IOHandler->IiCount * sizeof(pwr_tInt32));
dlink_area((plc_sDlink *)&pp->base.io_i, "pwrNode-active-io-io_init", pp->IOHandler->IoCount * sizeof(pwr_tInt32));
dlink_area((plc_sDlink *)&pp->base.av_i, "pwrNode-active-io-av_init", pp->IOHandler->AvCount * sizeof(pwr_tUInt64));
dlink_area((plc_sDlink *)&pp->base.dv_i, "pwrNode-active-io-dv_init", pp->IOHandler->DvCount * sizeof(pwr_tUInt64));
dlink_area((plc_sDlink *)&pp->base.iv_i, "pwrNode-active-io-iv_init", pp->IOHandler->IvCount * sizeof(pwr_tUInt64));
dlink_area((plc_sDlink *)&pp->base.ai_i, "pwrNode-active-io-ai_init", pp->IOHandler->AiCount * sizeof(pwr_tUInt64));
dlink_area((plc_sDlink *)&pp->base.ao_i, "pwrNode-active-io-ao_init", pp->IOHandler->AoCount * sizeof(pwr_tUInt64));
dlink_area((plc_sDlink *)&pp->base.di_i, "pwrNode-active-io-di_init", pp->IOHandler->DiCount * sizeof(pwr_tUInt64));
dlink_area((plc_sDlink *)&pp->base.do_i, "pwrNode-active-io-do_init", pp->IOHandler->DoCount * sizeof(pwr_tUInt64));
dlink_area((plc_sDlink *)&pp->base.ii_i, "pwrNode-active-io-ii_init", pp->IOHandler->IiCount * sizeof(pwr_tUInt64));
dlink_area((plc_sDlink *)&pp->base.io_i, "pwrNode-active-io-io_init", pp->IOHandler->IoCount * sizeof(pwr_tUInt64));
}
/* Link to I/O copy areas.
......
src/lib/rt/src/rt_io_base.c
View file @ 8a42f8d2
......@@ -211,7 +211,7 @@ pwr_tStatus io_init_ai_signals(
pwr_tAName buf;
pwr_tUInt32 sig_count = 0;
pwr_tClassId class;
pwr_sClass_IvArea *iarea_op;
pwr_sClass_InitArea *iarea_op;
/* Get pointer to area-object */
sts = gdh_NameToObjid( "pwrNode-active-io-ai", &area_objid);
......@@ -315,7 +315,7 @@ pwr_tStatus io_init_ao_signals(
pwr_tAName buf;
pwr_tUInt32 sig_count = 0;
pwr_tClassId class;
pwr_sClass_IvArea *iarea_op;
pwr_sClass_InitArea *iarea_op;
/* Get pointer to area-object */
sts = gdh_NameToObjid( "pwrNode-active-io-ao", &area_objid);
......@@ -409,7 +409,7 @@ pwr_tStatus io_init_di_signals(
pwr_tAName buf;
pwr_tUInt32 sig_count = 0;
pwr_tClassId class;
pwr_sClass_IvArea *iarea_op;
pwr_sClass_InitArea *iarea_op;
/* Get pointer to area-object */
sts = gdh_NameToObjid( "pwrNode-active-io-di", &area_objid);
......@@ -504,7 +504,7 @@ pwr_tStatus io_init_do_signals(
pwr_tAName buf;
pwr_tUInt32 sig_count = 0;
pwr_tClassId class;
pwr_sClass_IvArea *iarea_op;
pwr_sClass_InitArea *iarea_op;
/* Get pointer to area-object */
sts = gdh_NameToObjid( "pwrNode-active-io-do", &area_objid);
......@@ -737,7 +737,7 @@ io_init_av_signals (
pwr_tStatus sts;
pwr_tFloat32 *p;
pwr_tInt32 av_count = 0;
pwr_sClass_IvArea *iarea_op;
pwr_sClass_InitArea *iarea_op;
/* Get pointer to area-object */
......@@ -805,7 +805,7 @@ io_init_dv_signals (
pwr_tStatus sts;
pwr_tBoolean *p;
pwr_tInt32 dv_count=0;
pwr_sClass_IvArea *iarea_op;
pwr_sClass_InitArea *iarea_op;
/* Get pointer to area-object */
sts = gdh_NameToObjid( "pwrNode-active-io-dv", &area_objid);
......@@ -874,7 +874,7 @@ pwr_tStatus io_init_ii_signals(
pwr_tAName buf;
pwr_tUInt32 sig_count = 0;
pwr_tClassId class;
pwr_sClass_IvArea *iarea_op;
pwr_sClass_InitArea *iarea_op;
// Get pointer to area-object
sts = gdh_NameToObjid( "pwrNode-active-io-ii", &area_objid);
......@@ -970,7 +970,7 @@ pwr_tStatus io_init_io_signals(
pwr_tAName buf;
pwr_tUInt32 sig_count = 0;
pwr_tClassId class;
pwr_sClass_IvArea *iarea_op;
pwr_sClass_InitArea *iarea_op;
// Get pointer to area-object
sts = gdh_NameToObjid( "pwrNode-active-io-io", &area_objid);
......@@ -1064,7 +1064,7 @@ io_init_iv_signals (
pwr_tStatus sts;
pwr_tInt32 *p;
pwr_tInt32 iv_count=0;
pwr_sClass_IvArea *iarea_op;
pwr_sClass_InitArea *iarea_op;
/* Get pointer to area-object */
sts = gdh_NameToObjid( "pwrNode-active-io-iv", &area_objid);
......
src/wbl/pwrb/src/pwrb_c_initarea.wb_load 0 → 100644
View file @ 8a42f8d2
!
! Proview $Id$
! Copyright (C) 2005 SSAB Oxelsund AB.
!
! This program is free software; you can redistribute it and/or
! modify it under the terms of the GNU General Public License as
! published by the Free Software Foundation, either version 2 of
! the License, or (at your option) any later version.
!
! This program is distributed in the hope that it will be useful
! but WITHOUT ANY WARRANTY; without even the implied warranty of
! MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
! GNU General Public License for more details.
!
! You should have received a copy of the GNU General Public License
! along with the program, if not, write to the Free Software
! Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
!
! pwrb_c_ivarea.wb_load -- Defines the class IvArea.
!
SObject pwrb:Class
!/**
! @Version 1.0
! @Summary Area object for initial value references.
! Area object for Initial value references.
!
! The object is created at runtime in the dynamic system volume pwrNode.
!*/
Object InitArea $ClassDef 540
Body SysBody
Attr Editor = pwr_eEditor_AttrEd
Attr Method = pwr_eMethod_Standard
EndBody
Object RtBody $ObjBodyDef 1
Body SysBody
Attr StructName = "InitArea"
EndBody
Object Value $Attribute 1
Body SysBody
Attr TypeRef = "pwrs:Type-$UInt64"
Attr Flags |= PWR_MASK_ARRAY
Attr Flags |= PWR_MASK_STATE
Attr Flags |= PWR_MASK_DYNAMIC
Attr Elements = 1
EndBody
EndObject
EndObject
EndObject
EndSObject
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7