html conversion changes

nmps/lib/nmps/src/nmps_plc.c

 /* 
- * Proview   $Id: nmps_plc.c,v 1.1 2006-01-12 05:57:43 claes Exp $
+ * Proview   $Id: nmps_plc.c,v 1.2 2006-01-26 08:15:11 claes Exp $
  * Copyright (C) 2005 SSAB Oxelsund AB.
  *
  * This program is free software; you can redistribute it and/or 
@@ -115,7 +115,7 @@ pwr_sClass_NMpsCell  *object;
 	}
 }
 
-/**
+/*_*
   @aref nmpscell NMpsCell
 */
 
@@ -678,7 +678,7 @@ pwr_sClass_NMpsStoreCell  *object;
 	}
 }
 
-/**
+/*_*
   NMpsStoreCell
 
   @aref nmpsstorecell NMpsStoreCell
@@ -1412,7 +1412,7 @@ void NMpsStoreCell_exec(
 	object->NumberOfData = object->DataSelected;
 }
 
-/**
+/*_*
   NMpsOutCell
 
   @aref nmpsoutcell NMpsOutCell
@@ -1441,7 +1441,7 @@ void NMpsOutCell_exec(
 }
 
 
-/**
+/*_*
   NMpsTrp
 
   @aref nmpstrp NMpsTrp
@@ -1865,7 +1865,7 @@ trp_return:
 	}
 }
 
-/**
+/*_*
   NMpsTrpRR
 
   @aref nmpstrprr NMpsTrpRR
@@ -2290,7 +2290,7 @@ trprr_return:
 	}
 }
 
-/**
+/*_*
   NMpsTrpFF
 
   @aref nmpstrpff NMpsTrpFF
@@ -2716,7 +2716,7 @@ trpff_return:
 	}
 }
 
-/**
+/*_*
   DataSelect
 
   @aref dataselect DataSelect
@@ -2777,7 +2777,7 @@ pwr_sClass_NMpsMirrorCell  *object;
 	object->InitFlag = 1;
 }
 
-/**
+/*_*
   NMpsMirrorCell
 
   @aref nmpsmirrorcell NMpsMirrorCell

nmps/lib/nmps/src/nmps_plc_display.c

 /* 
- * Proview   $Id: nmps_plc_display.c,v 1.1 2006-01-12 05:57:43 claes Exp $
+ * Proview   $Id: nmps_plc_display.c,v 1.2 2006-01-26 08:15:12 claes Exp $
  * Copyright (C) 2005 SSAB Oxelsund AB.
  *
  * This program is free software; you can redistribute it and/or 
@@ -78,7 +78,7 @@ typedef struct {
   pwr_tFloat32                        *Cell;
 } nmps_sCellInput;
 
-/**
+/*_*
   @aref celldisp CellDisp
 */
 void CellDisp_init( pwr_sClass_CellDisp  *object)
@@ -691,7 +691,7 @@ void CellDisp_exec(
 	object->OldLastIndex = num;
 }
 
-/**
+/*_*
   @aref celldispmir CellDispMir
 */
 void CellDispMir_init( pwr_sClass_CellDispMir  *object)
@@ -1244,7 +1244,7 @@ void CellDispMir_exec(
 }
 
 
-/**
+/*_*
   @aref cellupdate CellUpdate
 */
 void CellUpdate_init( pwr_sClass_CellUpdate  *object)

nmps/lib/nmps/src/nmps_plc_macro.h

 /* 
- * Proview   $Id: nmps_plc_macro.h,v 1.1 2006-01-12 05:57:43 claes Exp $
+ * Proview   $Id: nmps_plc_macro.h,v 1.2 2006-01-26 08:15:12 claes Exp $
  * Copyright (C) 2005 SSAB Oxelsund AB.
  *
  * This program is free software; you can redistribute it and/or 
@@ -47,7 +47,7 @@ typedef struct {
 	pwr_tRefId	Data_Dlid;
 	} plc_t_DataInfoMirCell;
 
-/**
+/*_*
   DataCopy
 
   @aref datacopy DataCopy
@@ -59,7 +59,7 @@ typedef struct {
       memcpy( *object->DataToP, *object->DataFromP, datasize);		\
   }
 
-/**
+/*_*
   DataReset
 
   @aref datareset DataReset
@@ -71,7 +71,7 @@ typedef struct {
       memset( *object->DataP, 0, datasize);				\
   }
 
-/**
+/*_*
   NMpsCellSubWind
 
   @aref nmpscellsubwind NMpsCellSubWind
@@ -95,7 +95,7 @@ typedef struct {
     }									\
   }
 
-/**
+/*_*
   NMpsStoreCellSubWind
 
   @aref nmpscellstoresubwind NMpsStoreCellSubWind
@@ -119,7 +119,7 @@ typedef struct {
     }									\
   }
 
-/**
+/*_*
   CLoop
 
   @aref cloop CLoop
@@ -136,7 +136,7 @@ typedef struct {
     }									\
   }
 
-/**
+/*_*
   GetDap
 
   @aref getdap GetDap
@@ -145,7 +145,7 @@ typedef struct {
   memcpy( &object->OutDataP, &attribute, 				\
 	sizeof( object->OutDataP) + sizeof( object->OutData_ObjId));
 
-/**
+/*_*
   GetObjidp
 
   @aref getobjidp GetObjidp
@@ -153,7 +153,7 @@ typedef struct {
 #define GetObjidp_exec( object, attribute)				\
   object->ObjId = attribute;
 
-/**
+/*_*
   Func
 
   @aref func Func
@@ -180,7 +180,7 @@ typedef struct {
     subwindow;							\
   }
 
-/**
+/*_*
   FuncExtend
 
   @aref funcextend FuncExtend
@@ -203,7 +203,7 @@ typedef struct {
   if ( object->d7P) object->d7 = *object->d7P;			\
   if ( object->d8P) object->d8 = *object->d8P;
 
-/**
+/*_*
   FuncInput
 
   @aref funcinput FuncInput
@@ -226,7 +226,7 @@ typedef struct {
   object->d7 = funcobject->d7;					\
   object->d8 = funcobject->d8;
 
-/**
+/*_*
   FuncOutput
 
   @aref funcoutput FuncOutput
@@ -249,7 +249,7 @@ typedef struct {
   funcobject->od7 = *object->od7P;					\
   funcobject->od8 = *object->od8P;
 
-/**
+/*_*
   NMpsMirrorCellSubWind
 
   @aref nmpsmirrorcellsubwind NMpsMirroCellSubWind
@@ -270,56 +270,6 @@ typedef struct {
     subwindow;								\
   }
 
-/**
-  RemTransSend
-
-  @aref remtranssend RemTransSend
-*/
-#define RemTransSend_exec( object, subwindow) \
-  if ( *object->SendP && !object->Send) { \
-    if ( ((pwr_sClass_RemTrans *)(*object->RemTransP))->DataValid > 0) \
-      object->Error = 1; \
-    else { \
-      subwindow; \
-      ((pwr_sClass_RemTrans *)(*object->RemTransP))->DataValid = 1; \
-      object->Error = 0; \
-    } \
-  } \
-  else \
-    object->Error = \
-        EVEN( ((pwr_sClass_RemTrans *)(*object->RemTransP))->LastSts); \
- \
-  object->Send = *object->SendP; \
- \
-  if ( ((pwr_sClass_RemTrans *)(*object->RemTransP))->DataValid > 0) \
-    object->Occupied = 1; \
-  else \
-    object->Occupied = 0; \
- \
-  if ( ((pwr_sClass_RemTrans *)(*object->RemTransP))->Buffers > 0) { \
-    object->Buffer = 1; \
-    if ( ((pwr_sClass_RemTrans *)(*object->RemTransP))->Buffers >= \
-         ((pwr_sClass_RemTrans *)(*object->RemTransP))->MaxBuffers) \
-      object->Occupied = 1; \
-  } \
-  else \
-    object->Buffer = 0;
-
-/**
-  RemTransRcv
-
-  @aref remtransrcv RemTransRcv
-*/
-#define RemTransRcv_exec( object, subwindow) \
-  if ( ((pwr_sClass_RemTrans *)(*object->RemTransP))->DataValid > 0) { \
-    subwindow; \
-    ((pwr_sClass_RemTrans *)(*object->RemTransP))->DataValid = 0; \
-      object->Received = 1; \
-  } \
-  else \
-    object->Received = 0;
-
-
 
 
 

nmps/lib/nmps/src/nmps_plc_runtime.c

 /* 
- * Proview   $Id: nmps_plc_runtime.c,v 1.1 2006-01-12 05:57:43 claes Exp $
+ * Proview   $Id: nmps_plc_runtime.c,v 1.2 2006-01-26 08:15:12 claes Exp $
  * Copyright (C) 2005 SSAB Oxelsund AB.
  *
  * This program is free software; you can redistribute it and/or 
@@ -37,7 +37,7 @@
 #endif
 
 
-/**
+/*_*
   RunningTime
 
   @aref runningtime RunningTime

nmps/lib/nmps/src/os_linux/hw_x86/makefile

@@ -10,3 +10,7 @@ endif
 ifeq ($($(type_name)_generic_mk),)
  include $(pwre_kroot)/tools/bld/src/$(type_name)_generic.mk
 endif
+
+-include ../../special.mk
+-include ../special.mk
+-include special.mk

nmps/wbl/nmps/src/nmps_c_celldisp.wb_load

 ! 
-!  Proview   $Id: nmps_c_celldisp.wb_load,v 1.4 2005-09-01 14:58:00 claes Exp $
+!  Proview   $Id: nmps_c_celldisp.wb_load,v 1.5 2006-01-26 08:15:12 claes Exp $
 !  Copyright (C) 2005 SSAB Oxelsund AB.
 !
 !  This program is free software; you can redistribute it and/or 
@@ -21,7 +21,7 @@
 SObject NMps:Class
 !/**
 !  @Version 1.0
-!  @Code rs_plc_nmps_display.c
+!  @Code nmps_plc_display.c
 !  @Group MaterialPlanning,Plc
 !  @Summary Display contents of data object in NMps cells.
 !  CellDisp objects are used to display the content of data objects

nmps/wbl/nmps/src/nmps_c_celldispmir.wb_load

 ! 
-!  Proview   $Id: nmps_c_celldispmir.wb_load,v 1.3 2005-09-01 14:58:00 claes Exp $
+!  Proview   $Id: nmps_c_celldispmir.wb_load,v 1.4 2006-01-26 08:15:12 claes Exp $
 !  Copyright (C) 2005 SSAB Oxelsund AB.
 !
 !  This program is free software; you can redistribute it and/or 
@@ -21,7 +21,7 @@
 SObject NMps:Class
 !/**
 !  @Version 1.0
-!  @Code rs_plc_nmps_display.c
+!  @Code nmps_plc_display.c
 !  @Group MaterialPlanning,Plc
 !  @Summary Display contents of data object in NMpsMirrorCells.
 !  CellDispMir objects are used to display the content of data objects

nmps/wbl/nmps/src/nmps_c_cellupdate.wb_load

 ! 
-!  Proview   $Id: nmps_c_cellupdate.wb_load,v 1.4 2005-09-01 14:58:00 claes Exp $
+!  Proview   $Id: nmps_c_cellupdate.wb_load,v 1.5 2006-01-26 08:15:12 claes Exp $
 !  Copyright (C) 2005 SSAB Oxelsund AB.
 !
 !  This program is free software; you can redistribute it and/or 
@@ -21,7 +21,7 @@
 SObject NMps:Class
 !/**
 !  @Version 1.0
-!  @Code rs_plc_nmps_display.c
+!  @Code nmps_plc_display.c
 !  @Group MaterialPlanning,Plc
 !  @Summary Display and update contents of data object in NMps cells.
 !  CellUpdate objects are used to display and update the content of data objects

nmps/wbl/nmps/src/nmps_c_cloop.wb_load

 ! 
-!  Proview   $Id: nmps_c_cloop.wb_load,v 1.4 2005-09-01 14:58:00 claes Exp $
+!  Proview   $Id: nmps_c_cloop.wb_load,v 1.5 2006-01-26 08:15:12 claes Exp $
 !  Copyright (C) 2005 SSAB Oxelsund AB.
 !
 !  This program is free software; you can redistribute it and/or 
@@ -21,7 +21,7 @@
 SObject NMps:Class
 !/**
 !  @Version 1.0
-!  @Code rs_plc_macro_nmps.h
+!  @Code nmps_plc_macro.h
 !  @Group Plc
 !  @Summary A loop object with a subwindow that is executed a number of times each plcscan.
 !

nmps/wbl/nmps/src/nmps_c_datacopy.wb_load

 ! 
-!  Proview   $Id: nmps_c_datacopy.wb_load,v 1.4 2005-09-01 14:58:00 claes Exp $
+!  Proview   $Id: nmps_c_datacopy.wb_load,v 1.5 2006-01-26 08:15:12 claes Exp $
 !  Copyright (C) 2005 SSAB Oxelsund AB.
 !
 !  This program is free software; you can redistribute it and/or 
@@ -21,7 +21,7 @@
 SObject NMps:Class
 !/**
 !  @Version 1.0
-!  @Code rs_plc_macro_nmps.h
+!  @Code nmps_plc_macro.h
 !  @Group Plc,PlcData
 !  @Summary Copy a data object.
 !

nmps/wbl/nmps/src/nmps_c_datareset.wb_load

 ! 
-!  Proview   $Id: nmps_c_datareset.wb_load,v 1.4 2005-09-01 14:58:00 claes Exp $
+!  Proview   $Id: nmps_c_datareset.wb_load,v 1.5 2006-01-26 08:15:12 claes Exp $
 !  Copyright (C) 2005 SSAB Oxelsund AB.
 !
 !  This program is free software; you can redistribute it and/or 
@@ -21,7 +21,7 @@
 SObject NMps:Class
 !/**
 !  @Version 1.0
-!  @Code rs_plc_macro_nmps.h
+!  @Code nmps_plc_macro.h
 !  @Group Plc,PlcData
 !  @Summary Reset a data object.
 !

nmps/wbl/nmps/src/nmps_c_dataselect.wb_load

 ! 
-!  Proview   $Id: nmps_c_dataselect.wb_load,v 1.4 2005-09-01 14:58:00 claes Exp $
+!  Proview   $Id: nmps_c_dataselect.wb_load,v 1.5 2006-01-26 08:15:12 claes Exp $
 !  Copyright (C) 2005 SSAB Oxelsund AB.
 !
 !  This program is free software; you can redistribute it and/or 
@@ -21,7 +21,7 @@
 SObject NMps:Class
 !/**
 !  @Version 1.0
-!  @Code rs_plc_nmps.c
+!  @Code nmps_plc.c
 !  @Group Plc,PlcData
 !  @Summary Select one data input due to the suppied index.
 !

nmps/wbl/nmps/src/nmps_c_nmpscell.wb_load

 ! 
-!  Proview   $Id: nmps_c_nmpscell.wb_load,v 1.6 2005-09-01 14:58:00 claes Exp $
+!  Proview   $Id: nmps_c_nmpscell.wb_load,v 1.7 2006-01-26 08:15:12 claes Exp $
 !  Copyright (C) 2005 SSAB Oxelösund AB.
 !
 !  This program is free software; you can redistribute it and/or 
@@ -21,7 +21,7 @@
 SObject NMps:Class
 !/**
 !  @Version 1.0
-!  @Code rs_plc_nmps.c
+!  @Code nmps_plc.c
 !  @Group MaterialPlanning,Plc
 !  @Summary Container of data objects.
 !

nmps/wbl/nmps/src/nmps_c_nmpsmirrorcell.wb_load

 ! 
-!  Proview   $Id: nmps_c_nmpsmirrorcell.wb_load,v 1.4 2005-09-01 14:58:00 claes Exp $
+!  Proview   $Id: nmps_c_nmpsmirrorcell.wb_load,v 1.5 2006-01-26 08:15:12 claes Exp $
 !  Copyright (C) 2005 SSAB Oxelsund AB.
 !
 !  This program is free software; you can redistribute it and/or 
@@ -21,7 +21,7 @@
 SObject NMps:Class
 !/**
 !  @Version 1.0
-!  @Code rs_plc_nmps.c
+!  @Code nmps_plc.c
 !  @Group MaterialPlanning,Plc
 !  @Summary Mirror the contents of cell objects.
 !

nmps/wbl/nmps/src/nmps_c_nmpsoutcell.wb_load

 ! 
-!  Proview   $Id: nmps_c_nmpsoutcell.wb_load,v 1.5 2005-09-01 14:58:00 claes Exp $
+!  Proview   $Id: nmps_c_nmpsoutcell.wb_load,v 1.6 2006-01-26 08:15:12 claes Exp $
 !  Copyright (C) 2005 SSAB Oxelsund AB.
 !
 !  This program is free software; you can redistribute it and/or 
@@ -21,7 +21,7 @@
 SObject NMps:Class
 !/**
 !  @Version 1.0
-!  @Code rs_plc_nmps.c
+!  @Code nmps_plc.c
 !  @Group MaterialPlanning,Plc
 !  @Summary End station in a NMpsCell sequence.
 !

nmps/wbl/nmps/src/nmps_c_nmpsstorecell.wb_load

 ! 
-!  Proview   $Id: nmps_c_nmpsstorecell.wb_load,v 1.6 2005-09-01 14:58:00 claes Exp $
+!  Proview   $Id: nmps_c_nmpsstorecell.wb_load,v 1.7 2006-01-26 08:15:12 claes Exp $
 !  Copyright (C) 2005 SSAB Oxelsund AB.
 !
 !  This program is free software; you can redistribute it and/or 
@@ -21,7 +21,7 @@
 SObject NMps:Class
 !/**
 !  @Version 1.0
-!  @Code rs_plc_nmps.c
+!  @Code nmps_plc.c
 !  @Group MaterialPlanning,Plc
 !  @Summary Container of data objects with select function.
 !

nmps/wbl/nmps/src/nmps_c_nmpstrp.wb_load

 ! 
-!  Proview   $Id: nmps_c_nmpstrp.wb_load,v 1.5 2005-09-01 14:58:00 claes Exp $
+!  Proview   $Id: nmps_c_nmpstrp.wb_load,v 1.6 2006-01-26 08:15:12 claes Exp $
 !  Copyright (C) 2005 SSAB Oxelösund AB.
 !
 !  This program is free software; you can redistribute it and/or 
@@ -21,7 +21,7 @@
 SObject NMps:Class
 !/**
 !  @Version 1.0
-!  @Code rs_plc_nmps.c
+!  @Code nmps_plc.c
 !  @Group MaterialPlanning,Plc
 !  @Summary Transport of dataobjects between NMpsCell objects.
 !

nmps/wbl/nmps/src/nmps_c_nmpstrpff.wb_load

 ! 
-!  Proview   $Id: nmps_c_nmpstrpff.wb_load,v 1.4 2005-09-01 14:58:00 claes Exp $
+!  Proview   $Id: nmps_c_nmpstrpff.wb_load,v 1.5 2006-01-26 08:15:12 claes Exp $
 !  Copyright (C) 2005 SSAB Oxelsund AB.
 !
 !  This program is free software; you can redistribute it and/or 
@@ -21,7 +21,7 @@
 SObject NMps:Class
 !/**
 !  @Version 1.0
-!  @Code rs_plc_nmps.c
+!  @Code nmps_plc.c
 !  @Group MaterialPlanning,Plc
 !  @Summary Transport of dataobjects between front ends of NMpsCell objects.
 !

nmps/wbl/nmps/src/nmps_c_nmpstrprr.wb_load

 ! 
-!  Proview   $Id: nmps_c_nmpstrprr.wb_load,v 1.4 2005-09-01 14:58:00 claes Exp $
+!  Proview   $Id: nmps_c_nmpstrprr.wb_load,v 1.5 2006-01-26 08:15:12 claes Exp $
 !  Copyright (C) 2005 SSAB Oxelsund AB.
 !
 !  This program is free software; you can redistribute it and/or 
@@ -21,7 +21,7 @@
 SObject NMps:Class
 !/**
 !  @Version 1.0
-!  @Code rs_plc_nmps.c
+!  @Code nmps_plc.c
 !  @Group MaterialPlanning,Plc
 !  @Summary Transport of dataobjects between rear ends of NMpsCell objects.
 !

nmps/wbl/nmps/src/nmps_c_runningtime.wb_load

 ! 
-!  Proview   $Id: nmps_c_runningtime.wb_load,v 1.4 2005-09-01 14:58:00 claes Exp $
+!  Proview   $Id: nmps_c_runningtime.wb_load,v 1.5 2006-01-26 08:15:12 claes Exp $
 !  Copyright (C) 2005 SSAB Oxelsund AB.
 !
 !  This program is free software; you can redistribute it and/or 
@@ -21,7 +21,7 @@
 SObject NMps:Class
 !/**
 !  @Version 1.0
-!  @Code rs_plc_runtime.c
+!  @Code nmps_plc_runtime.c
 !  @Group Plc
 !  @Summary Running time measurement
 !  Running time Measurement.

nmps/wbl/nmps/src/os_linux/hw_x86/makefile

@@ -62,6 +62,7 @@ $(doc_dir)/en_us/orm/nmps_allclasses.html :
 	@ co_convert -w -d $(doc_dir)/en_us/orm -g $(pwre_sroot)/wbl/nmps/src/cnv_setup.dat "$(pwre_sroot)/wbl/nmps/src/nmps_*.wb_load"
 	@ echo "Generating html files for nmps structs en_us..."
 	@ co_convert -c -d $(doc_dir)/en_us/orm $(inc_dir)/pwr_nmpsclasses.h
+	@ co_convert -c -d $(doc_dir)/en_us/orm $(inc_dir)/pwr_nmpsclasses.hpp
 	@ echo "Generating html files for nmps code en_us..."
 	@ co_convert -c -d $(doc_dir)/en_us/orm "$(pwre_sroot)/lib/rs/src/rs_plc_macro_nmps.h"
 	@ co_convert -c -d $(doc_dir)/en_us/orm "$(pwre_sroot)/lib/rs/src/rs_plc_*.c"
@@ -69,6 +70,7 @@ $(doc_dir)/en_us/orm/nmps_allclasses.html :
 	@ co_convert -w -l sv_se -d $(doc_dir)/sv_se/orm -g $(pwre_sroot)/wbl/nmps/src/cnv_setup.dat "$(pwre_sroot)/wbl/nmps/src/nmps_*.wb_load"
 	@ echo "Generating html files for nmps structs sv_se..."
 	@ co_convert -c -d $(doc_dir)/sv_se/orm $(inc_dir)/pwr_nmpsclasses.h
+	@ co_convert -c -d $(doc_dir)/sv_se/orm $(inc_dir)/pwr_nmpsclasses.hpp
 	@ echo "Generating html files for nmps code sv_se..."
 	@ co_convert -c -d $(doc_dir)/sv_se/orm "$(pwre_sroot)/lib/rs/src/rs_plc_macro_nmps.h"
 	@ co_convert -c -d $(doc_dir)/sv_se/orm "$(pwre_sroot)/lib/rs/src/rs_plc_*.c"
@@ -86,3 +88,7 @@ clean_wbl :
 		$(rm) $(rmflags) $(load_dir)/nmps.dbs; \
 	  fi
 
+
+
+
+