Commit 3c61f262 authored by Claes Sjofors's avatar Claes Sjofors

Merge branch 'master'

parents 7d5d04f5 2b3d801a
This diff is collapsed.
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
<head>
<title>Trace</title>
<link rel="stylesheet" type="text/css" href="toolbar.css">
</head>
<body>
<div class="toolbar" role="toolbar">
<div id="toolitem1" tabindex="0" class="toolbar-item" role="button"><img src="toolbar_graph.png"><img></div>
<div id="toolitem2" tabindex="-1" class="toolbar-item" role="button"><img src="toolbar_navigator.png"><img></div>
<div id="toolitem3" tabindex="-1" class="toolbar-item" role="button"><img src="toolbar_history.png"><img></div>
<div id="toolitem4" tabindex="-1" class="toolbar-item" role="button"><img src="toolbar_object.png"><img></div>
</div>
<!-- <div style="height:300px;overflow:auto;"> --!>
<canvas id="flowcanvas" width="1200" height="800"></canvas>
<script src=flow.js></script>
<!-- </div> --!>
<hr>
<address><a href="mailto:claes@debian86.ssab.com"></a></address>
<!-- Created: Tue Mar 13 16:22:00 CET 2018 -->
<!-- hhmts start -->
Last modified: Tue May 15 08:59:01 CEST 2018
<!-- hhmts end -->
</body>
</html>
This diff is collapsed.
include $(pwre_dir_symbols)
-include $(pwre_kroot)/tools/bld/src/$(os_name)/$(hw_name)/$(type_name)_generic.mk
ifeq ($($(type_name)_generic_mk),)
-include $(pwre_kroot)/tools/bld/src/$(os_name)/$(type_name)_generic.mk
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
<!DOCTYPE html>
<html>
<head>
<title>Ge graph</title>
<link rel="stylesheet" type="text/css" href="toolbar.css">
</head>
<body>
<!-- <div style="height:300px;overflow:auto;"> -->
<canvas id="flowcanvas" width="1200" height="800"></canvas>
<script src=ge.js></script>
<!-- </div> -->
<hr>
<address><a href="mailto:claes@debian86.ssab.com"></a></address>
</body>
</html>
This diff is collapsed.
include $(pwre_dir_symbols)
-include $(pwre_kroot)/tools/bld/src/$(os_name)/$(hw_name)/$(type_name)_generic.mk
ifeq ($($(type_name)_generic_mk),)
-include $(pwre_kroot)/tools/bld/src/$(os_name)/$(type_name)_generic.mk
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
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
<head>
<title>Operator window</title>
<link rel="stylesheet" type="text/css" href="toolbar.css">
<style>
.menu {
float:left;
width:20%;
height:100%;
}
.main {
float:left;
width:79%;
height:100%;
}
</style>
</head>
<body>
<iframe class="menu" src="opwind_menu.html"></iframe>
<iframe class="main" src="xtt_help_index.html"></iframe>
</body>
</html>
This diff is collapsed.
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
<head>
<title>Xtt</title>
<link rel="stylesheet" type="text/css" href="toolbar.css">
</head>
<body>
<div id="opwindmenu" width="120" height="800"></div>
<script src=opwind.js></script>
<hr>
<address><a href="mailto:claes@debian86.ssab.com"></a></address>
</body>
</html>
include $(pwre_dir_symbols)
-include $(pwre_kroot)/tools/bld/src/$(os_name)/$(hw_name)/$(type_name)_generic.mk
ifeq ($($(type_name)_generic_mk),)
-include $(pwre_kroot)/tools/bld/src/$(os_name)/$(type_name)_generic.mk
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
include $(pwre_dir_symbols)
-include $(pwre_kroot)/tools/bld/src/$(os_name)/$(hw_name)/$(type_name)_generic.mk
ifeq ($($(type_name)_generic_mk),)
-include $(pwre_kroot)/tools/bld/src/$(os_name)/$(type_name)_generic.mk
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
.annotate {
color: #366ED4;
font-style: italic;
}
.toolbar {
border-left: 1px solid #aaa;
margin-top: 10px;
margin: 0 0 0 0;
font-size: 0;
}
.toolbar-item {
display: inline-block;
padding: 0.0em 0.0em;
background: #fff;
margin: 0 0 0 0;
border: 0px solid #aaa;
border-left: none;
color: blue;
font-size: 16px;
line-height: 1.5em;
vertical-align: top;
}
.toolbar-item.selected {
background-color: #ccc;
color: black;
font-weight: bold;
}
.menu-wrapper {
display: inline-block;
font-size: 16px;
}
.menu-button {
padding-right: 2.5em;
position: relative;
}
.menu-button::after {
content: " ";
border-left: 0.4em solid transparent;
border-right: 0.4em solid transparent;
border-top: 0.4em solid black;
position: absolute;
right: 1em;
top: 1.1em;
}
.leftmenu-button {
width:100%;
}
\ No newline at end of file
<!DOCTYPE html>
<html>
<head>
<title>Xtt</title>
<link rel="stylesheet" type="text/css" href="toolbar.css">
</head>
<body>
<div class="toolbar" role="toolbar">
<div id="toolitem1" tabindex="0" class="toolbar-item" role="button"><img src="toolbar_graph.png"><img></div>
<div id="toolitem2" tabindex="-1" class="toolbar-item" role="button"><img src="toolbar_plc.png"><img></div>
<div id="toolitem3" tabindex="-1" class="toolbar-item" role="button"><img src="toolbar_history.png"><img></div>
<div id="toolitem4" tabindex="-1" class="toolbar-item" role="button"><img src="toolbar_object.png"><img></div>
<div id="toolitem5" tabindex="-1" class="toolbar-item" role="button"><img src="toolbar_crossref.png"><img></div>
<div id="toolitem6" tabindex="-1" class="toolbar-item" role="button"><img src="toolbar_help.png"><img></div>
<div id="toolitem7" tabindex="-1" class="toolbar-item" role="button"><img src="toolbar_classhelp.png"><img></div>
</div>
<!-- <div style="height:300px;overflow:auto;"> -->
<canvas id="flowcanvas" width="1200" height="800"></canvas>
<script src=xtt.js></script>
<!-- </div> -->
<hr>
<address><a href="mailto:claes@debian86.ssab.com"></a></address>
</body>
</html>
This diff is collapsed.
......@@ -46,11 +46,9 @@
/*_Include filer_________________________________________________________*/
#if defined OS_POSIX
#include <stdio.h>
#include <stdlib.h>
#include <math.h>
#endif
#include "pwr_nmpsclasses.h"
......
......@@ -49,12 +49,10 @@
/*_Include filer_________________________________________________________*/
#if defined OS_POSIX
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <math.h>
#endif
#include "pwr_nmpsclasses.h"
#include "co_cdh.h"
......
......@@ -48,12 +48,10 @@
/*_Include filer_________________________________________________________*/
#if defined OS_POSIX
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <math.h>
#endif
#include "pwr_baseclasses.h"
#include "pwr_nmpsclasses.h"
......
......@@ -34,10 +34,8 @@
* General Public License plus this exception.
*/
#if defined OS_POSIX
#include <stdio.h>
#include <string.h>
#endif
#include "pwr_nmpsclasses.h"
#include "co_cdh.h"
......
......@@ -34,9 +34,7 @@
* General Public License plus this exception.
*/
#if defined OS_POSIX
#include <stdio.h>
#endif
#include "pwr_nmpsclasses.h"
......
......@@ -57,7 +57,6 @@ public:
QLabel* msg_label;
QLabel* cmd_prompt;
CoWowFocusTimerQt focustimer;
CoWowFocusTimerQt maptimer;
CoWowRecall* value_recall;
CoWowEntryQt* cmd_entry;
......
......@@ -80,7 +80,7 @@ void PnViewer::update_devices()
pnet->fetch_devices(dev_vect);
conf_vect.clear();
sts = fetch_config(dev_vect);
sts = fetch_config(conf_vect);
if (EVEN(sts))
printf("Error reading configuration file\n");
......@@ -168,8 +168,8 @@ int PnViewer::fetch_config(std::vector<PnDevice>& vect)
strncpy(pndevice.devname, elemv[1], sizeof(pndevice.devname));
sts = sscanf(elemv[2], "%hhu.%hhu.%hhu.%hhu", &pndevice.ipaddress[0],
&pndevice.ipaddress[1], &pndevice.ipaddress[2], &pndevice.ipaddress[3]);
sts = sscanf(elemv[2], "%hhu.%hhu.%hhu.%hhu", &pndevice.ipaddress[3],
&pndevice.ipaddress[2], &pndevice.ipaddress[1], &pndevice.ipaddress[0]);
if (sts != 4) {
printf("Not a valid IP address: %s\n", elemv[2]);
pndevice.ipaddress[0] = 0;
......@@ -179,9 +179,9 @@ int PnViewer::fetch_config(std::vector<PnDevice>& vect)
}
sts = sscanf(elemv[3], "%hhx:%hhx:%hhx:%hhx:%hhx:%hhx",
&pndevice.macaddress[0], &pndevice.macaddress[1],
&pndevice.macaddress[2], &pndevice.macaddress[3],
&pndevice.macaddress[4], &pndevice.macaddress[5]);
&pndevice.macaddress[5], &pndevice.macaddress[4],
&pndevice.macaddress[3], &pndevice.macaddress[2],
&pndevice.macaddress[1], &pndevice.macaddress[0]);
if (sts != 6) {
printf("Not a valid MAC address: %s\n", elemv[3]);
pndevice.macaddress[0] = 0;
......
......@@ -54,7 +54,6 @@ public:
QLabel* msg_label;
QLabel* cmd_prompt;
QLineEdit* cmd_input;
QWidget* attrnav_form;
QAction* menubutton_copy;
QAction* menubutton_cut;
QAction* menubutton_paste;
......
......@@ -61,7 +61,6 @@ public:
QAction* menubutton_cut;
QAction* menubutton_paste;
QAction* menubutton_changevalue;
QAction* menubutton_viewio;
CoWowFocusTimerQt focustimer;
static CoWowRecall value_recall;
CoWowEntryQt* cmd_entry;
......
......@@ -51,13 +51,11 @@
/*_Include filer_________________________________________________________*/
#if defined OS_POSIX
#include <signal.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <sys/types.h>
#endif
#include "pwr_baseclasses.h"
#include "pwr_remoteclasses.h"
......@@ -260,7 +258,6 @@ static int logg_get_filename(char* inname, char* outname, char* ext)
strcat(outname, ext);
}
#if defined OS_POSIX
/* Get current time to use as "version number" */
time_GetTime(&time);
......@@ -275,8 +272,6 @@ static int logg_get_filename(char* inname, char* outname, char* ext)
comp_timestr[13] = 0;
// strcat(outname, comp_timestr);
#endif
return REM__SUCCESS;
}
......@@ -312,11 +307,7 @@ static pwr_tStatus logg_open_file(
/* Open file */
logg_get_filename(conflist_ptr->loggconf->LoggFile, filename, LOGG_FILE_EXT);
#if defined OS_POSIX
conflist_ptr->outfile = fopen(filename, "a+");
#else
conflist_ptr->outfile = fopen(filename, "w+", "shr=get");
#endif
if (conflist_ptr->outfile != NULL) {
/* Write a file header */
time_GetTime(&time);
......@@ -537,15 +528,11 @@ int main()
logg_t_loggconf_list* conflist_ptr;
int i;
#if defined OS_POSIX
/* Exit handler */
atexit(&exit_hdlr);
signal(SIGINT, interrupt_hdlr);
#endif
sts = gdh_Init("rs_remote_logg");
if (EVEN(sts))
LogAndExit(sts);
......
......@@ -128,7 +128,7 @@ enum cs_modes { TCP_CLIENT, TCP_SERVER } cs_mode;
void RemoteSleep(float time)
{
#if defined(OS_LYNX) || defined(OS_LINUX)
#if defined(OS_LINUX)
struct timespec rqtp, rmtp;
rqtp.tv_sec = 0;
......
......@@ -403,33 +403,23 @@ static ini_sContext* createContext(int argc, char** argv)
}
static void usage(char* name)
{
#if defined OS_POSIX
fprintf(stderr, "usage: %s -a arg -b arg -d arg -efg arg -hip arg -q arg -ru "
"arg -s arg -vwA arg -H arg\n",
name);
#else
fprintf(stderr,
"usage: %s -a arg -b arg -d arg -efhip arg -q arg -rvwA arg -H arg\n",
name);
#endif
fprintf(stderr, " -? : give help\n");
fprintf(stderr, " -a arg: use 'arg' as application file\n");
fprintf(stderr, " -b arg: use 'arg' as boot file\n");
fprintf(stderr, " -d arg: use files from directory 'arg'\n");
fprintf(stderr, " -e : ignore errors\n");
fprintf(stderr, " -f : ignore fatal errors\n");
#if defined OS_POSIX
fprintf(stderr, " -g arg: setgid to 'arg' before starting\n");
#endif
fprintf(stderr, " -h : give help\n");
fprintf(stderr, " -i : interactive, log to stdout\n");
fprintf(stderr, " -p arg: use 'arg' as PLC\n");
fprintf(stderr, " -q arg: use 'arg' as qcom bus id\n");
fprintf(stderr, " -r : restart with new versions of loadfiles and PLC\n");
#if defined OS_POSIX
fprintf(stderr, " -s : stop of Proview/R\n");
fprintf(stderr, " -u arg: setuid to 'arg' before starting\n");
#endif
fprintf(stderr, " -v : verbose\n");
fprintf(stderr, " -w : ignore warnings\n");
fprintf(stderr, " -A arg: use 'arg' as alias file\n");
......@@ -442,11 +432,7 @@ static pwr_tStatus events(ini_sContext* cp)
{
pwr_tStatus sts = INI__SUCCESS;
qcom_sGet get;
#if defined OS_POSIX
int tmo_ms = 1000;
#else
int tmo_ms = qcom_cTmoEternal;
#endif
cp->myQ.qix = 550715;
cp->myQ.nid = 0;
......
......@@ -3405,7 +3405,7 @@ Animation <t>Boolean <t>Different types of animation. <link>GeDynAnimation
Video <t>- <t>Display a continuously updated image file. <link>GeDynVideo
SliderBackground <t>- <t>Indicates that the subgraph is background to a slider component. <link>GeDynSliderBackground
DigCommand <t>Boolean <t>Executes a command when signal gets high. <link>GeDynDigCommand
DigCommand <t>Boolean <t>Executes a script when signal gets high. <link>GeDynDigScript
DigScript <t>Boolean <t>Executes a script when signal gets high. <link>GeDynDigScript
ScrollingText <t>Boolean <t>Display a scrolling text. <link>GeDynScrollingText
<h2>Inherit
......
......@@ -246,6 +246,7 @@ copy : \
$(doc_dir)/en_us/man_exlib_index.html \
$(doc_dir)/en_us/man_exlib.pdf \
$(doc_dir)/en_us/man_exlib.ps \
$(web_dir)/pwr_logga.png \
$(mediatargets) $(csstargets) \
$(export_html) $(export_html_en_us) $(export_html_sv_se) \
$(doc_dir)/en_us/changelog.html | silent
......@@ -464,6 +465,10 @@ $(doc_dir)/en_us/changelog.html : $(pwre_croot)/src/changelog.txt \
@ $(co_convert) -e
@ mv $(pwre_croot)/src/doc/man/en_us/changelog.html $(target)
$(web_dir)/pwr_logga.png : $(pwre_sroot)/doc/man/src/pwr_logga.png
@ $(log_h_h)
@ $(cp) $(cpflags) $(source) $(target)
# implicit rules, docbook-related, added by jonas_h 2006-04-nn
#%.fo :: %.xml
......@@ -494,6 +499,8 @@ $(doc_dir)/% :: $(pwre_sroot)/doc/man/src/%
@ echo "copy $(source)"
@ cp $(source) $(target)
# Rule for creating titlepage xsl templates
#$(pwre_sroot)/doc/man/src/pwrtitlepages.xsl :: $(pwre_sroot)/doc/man/src/pwrtitlepage.spec.xml
# $(xsltproc) -o $(target) $(docbook_stylesheetdir)/template/titlepage.xsl $(source)
......
/*! \file doxygen.dx
/*! \file doxygen.c
\brief Contains group definitions for doxygen.
*/
......
......@@ -31,7 +31,7 @@ PROJECT_NAME = "Proview Programmer's Reference Manual"
# This could be handy for archiving the generated documentation or
# if some version control system is used.
PROJECT_NUMBER = V5.5.0
PROJECT_NUMBER = V5.6.1
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put.
......@@ -105,7 +105,7 @@ INLINE_INHERITED_MEMB = NO
# path before files name in the file list and in the header files. If set
# to NO the shortest path that makes the file name unique will be used.
FULL_PATH_NAMES = YES
FULL_PATH_NAMES = NO
# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag
# can be used to strip a user-defined part of the path. Stripping is
......@@ -186,7 +186,7 @@ ALIASES =
# For instance, some of the names that are used will be different. The list
# of all members will be omitted, etc.
OPTIMIZE_OUTPUT_FOR_C = YES
OPTIMIZE_OUTPUT_FOR_C = NO
# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java
# sources only. Doxygen will then generate output that is more tailored for
......@@ -282,7 +282,7 @@ TYPEDEF_HIDES_STRUCT = NO
# Private class members and static file members will be hidden unless
# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
EXTRACT_ALL = YES
EXTRACT_ALL = NO
# If the EXTRACT_PRIVATE tag is set to YES all private members of a class
# will be included in the documentation.
......@@ -512,20 +512,20 @@ QUIET = YES
# generated by doxygen. Possible values are YES and NO. If left blank
# NO is used.
WARNINGS = NO
WARNINGS = YES
# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings
# for undocumented members. If EXTRACT_ALL is set to YES then this flag will
# automatically be disabled.
WARN_IF_UNDOCUMENTED = NO
WARN_IF_UNDOCUMENTED = YES
# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for
# potential errors in the documentation, such as not documenting some
# parameters in a documented function, or documenting parameters that
# don't exist or using markup commands wrongly.
WARN_IF_DOC_ERROR = NO
WARN_IF_DOC_ERROR = YES
# This WARN_NO_PARAMDOC option can be abled to get warnings for
# functions that are documented, but have no documentation for their parameters
......@@ -559,26 +559,31 @@ WARN_LOGFILE =
# directories like "/usr/src/myproject". Separate the files or directories
# with spaces.
INPUT = $(pwre_sroot)/doc/prm/src/doxygen.dx \
$(pwre_sroot)/exp/inc \
$(pwre_sroot)/lib/co/src \
$(pwre_sroot)/lib/rt/src \
$(pwre_croot)/abb/lib \
$(pwre_croot)/bcomp/lib \
$(pwre_croot)/misc/lib \
$(pwre_croot)/nmps/lib \
$(pwre_croot)/opc/lib \
$(pwre_croot)/otherio/lib \
$(pwre_croot)/profibus/lib \
$(pwre_croot)/remote/lib \
$(pwre_croot)/sev/lib \
$(pwre_croot)/siemens/lib \
$(pwre_croot)/simul/lib \
$(pwre_croot)/ssabox/lib \
$(pwre_croot)/tlog/lib \
$(pwre_croot)/wb/lib \
$(pwre_croot)/xtt/lib \
$(pwre_sroot)/doc/prm/src \
INPUT = $(pwre_sroot)/doc/prm/src/doxygen.c \
$(pwre_sroot)/exp/inc/src/pwr.h \
$(pwre_sroot)/lib/co/src/co_time.h \
$(pwre_sroot)/lib/co/src/co_cdh.h \
$(pwre_sroot)/lib/rt/src/rt_gdh.h \
$(pwre_sroot)/lib/rt/src/rt_errh.h \
$(pwre_sroot)/lib/rt/src/rt_mh_appl.h \
$(pwre_sroot)/lib/rt/src/rt_qcom.h \
$(pwre_sroot)/lib/rt/src/rt_sevcli.h \
$(pwre_croot)/nmps/lib/nmps/src/nmps_appl.h \
$(pwre_sroot)/lib/rt/src/rt_aproc.h \
$(pwre_sroot)/lib/rt/src/rt_aproc.c \
$(pwre_sroot)/lib/rt/src/rt_net.c \
$(pwre_sroot)/lib/rt/src/rt_appl.h \
$(pwre_sroot)/lib/rt/src/rt_appl.cpp \
$(pwre_sroot)/lib/co/src/co_time.c \
$(pwre_sroot)/lib/co/src/co_cdh.c \
$(pwre_sroot)/lib/rt/src/rt_gdh.c \
$(pwre_sroot)/lib/rt/src/rt_errh.c \
$(pwre_sroot)/lib/rt/src/rt_mh_appl.c \
$(pwre_sroot)/lib/rt/src/rt_qcom.c \
$(pwre_sroot)/lib/rt/src/rt_sevcli.c \
$(pwre_croot)/nmps/lib/nmps/src/nmps_appl.c \
$(pwre_sroot)/doc/prm/src/ra_appl.cpp \
$(pwre_sroot)/doc/prm/src/ra_advappl.cpp \
$(pwr_inc)/rt_gdh_msg.h \
$(pwr_inc)/rt_hash_msg.h
......@@ -598,7 +603,6 @@ INPUT_ENCODING = UTF-8
# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90
FILE_PATTERNS = *.cpp \
*.cqt \
*.c \
*.h
......@@ -1441,7 +1445,7 @@ HIDE_UNDOC_RELATIONS = YES
# toolkit from AT&T and Lucent Bell Labs. The other options in this section
# have no effect if this option is set to NO (the default)
HAVE_DOT = YES
HAVE_DOT = NO
# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is
# allowed to run in parallel. When set to 0 (the default) doxygen will
......@@ -1571,7 +1575,7 @@ DOTFILE_DIRS =
# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note
# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
DOT_GRAPH_MAX_NODES = 500
DOT_GRAPH_MAX_NODES = 50
# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the
# graphs generated by dot. A depth value of 3 means that only nodes reachable
......
......@@ -40,8 +40,8 @@ silent :
$(clean_html) : clean_%.html : %.html
@ $(rm) $(rmflags) $(doc_dir)/prm/$*.html
$(doc_dir)/prm/index.html : ../../doxygen.dx
@ echo "doxygen documentation $(source) $(target)"
$(doc_dir)/prm/index.html : ../../doxygen.c
@ echo "Generating Programmer documentation: doxygen $(source) $(target)"
@ doxygen
# @ if [ "`eval which pdflatex`" != "" ]; then \
# ./repl.sh latex/*.tex; \
......@@ -55,8 +55,3 @@ $(doc_dir)/prm/index.html : ../../doxygen.dx
# rm -f repl.tmp; \
# fi; \
# rm -r -f latex;
......@@ -36,7 +36,7 @@
* Link the program with
* g++ -o $pwrp_exe/ra_appl ra_appl.cpp $pwr_obj/pwr_msg_rt.o
* $pwr_obj/pwr_msg_co.o
* -DOS_POSIX -I$pwr_inc -L$pwr_lib -lpwr_rt -lpwr_co -lpwr_msg_dummy -lrt
* -I$pwr_inc -L$pwr_lib -lpwr_rt -lpwr_co -lpwr_msg_dummy -lrt
*
* @see ra_appl.cpp
*/
......
......@@ -58,14 +58,8 @@ static int gdk_init_done = 0;
#endif
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#if defined OS_LYNX
#define __NO_INCLUDE_WARN__ 1
#endif
#include <X11/extensions/shape.h>
#include <Imlib.h>
#if defined OS_LYNX
#undef __NO_INCLUDE_WARN__
#endif
static ImlibData* imlib = 0;
static Display* display = 0;
......
......@@ -654,7 +654,6 @@ void CnvReadWbl::attribute_init()
strcpy(attr_elements, "");
attr_pointer = 0;
attr_array = 0;
attr_rtvirtual = 0;
attr_elem = 0;
attr_isclass = 0;
}
......@@ -687,8 +686,6 @@ int CnvReadWbl::attribute_attr(char* name, char* value)
attr_pointer = 1;
if (streq(value, "PWR_MASK_ARRAY"))
attr_array = 1;
if (streq(value, "PWR_MASK_RTVIRTUAL"))
attr_rtvirtual = 1;
if (streq(value, "PWR_MASK_CLASS"))
attr_isclass = 1;
} else {
......@@ -706,8 +703,6 @@ int CnvReadWbl::attribute_attr(char* name, char* value)
attr_pointer = 1;
if (flags_value & pwr_mAdef_array)
attr_array = 1;
if (flags_value & pwr_mAdef_rtvirtual)
attr_rtvirtual = 1;
if (flags_value & pwr_mAdef_class)
attr_isclass = 1;
}
......@@ -805,7 +800,6 @@ void CnvReadWbl::body_init()
strcpy(body_name, "");
strcpy(body_structname, "");
strcpy(body_flags, "");
body_rtvirtual = 0;
}
int CnvReadWbl::body_attr(char* name, char* value)
......@@ -819,9 +813,6 @@ int CnvReadWbl::body_attr(char* name, char* value)
strcat(body_flags, &value[9]);
else
strcat(body_flags, value);
if (streq(value, "pwr_mObjBodyDef_RtVirtual"))
body_rtvirtual = 1;
}
return 1;
}
......
......@@ -131,7 +131,6 @@ class CnvReadWbl {
CnvWblTo* wblto;
FILE* fp;
cread_eLine linetype;
int verbose;
int state;
int object_state;
char source_dir[200];
......@@ -143,7 +142,6 @@ class CnvReadWbl {
char attr_typeref_volume[80];
int attr_pointer;
int attr_array;
int attr_rtvirtual;
int attr_isclass;
char attr_elements[80];
int attr_elem;
......@@ -161,7 +159,6 @@ class CnvReadWbl {
char body_name[80];
char body_structname[80];
char body_flags[200];
int body_rtvirtual;
char graphplcnode_name[80];
char graphplccon_name[20];
char typedef_name[80];
......@@ -195,15 +192,11 @@ class CnvReadWbl {
char sobject_name[80];
char dir[120];
char ClassDef[80];
char ObjBodyDef[80];
char GraphPlcNode[80];
char GraphPlcCon[80];
char Attribute[80];
int read_wbl(char* filename);
int read_line(char* line, int maxsize, FILE* file);
int remove_spaces(char* in, char* out);
void attribute_init();
int attribute_attr(char* name, char* value);
int attribute_close();
......
......@@ -75,7 +75,6 @@ class CnvWblToHtml : public CnvWblTo {
std::ofstream fp_html_group[MAX_GROUPS];
std::ofstream fp_js_group[MAX_GROUPS];
char html_first[80];
char html_tmp_name[80];
int html_class_open;
int html_index_open;
bool js_all_first;
......
......@@ -69,7 +69,11 @@ class CnvXtthelpToPs : public CnvXtthelpTo {
Cnv_eXtthelpToType type()
{
return Cnv_eXtthelpToType_Ps;
if (ctx->generate_pdf) {
return Cnv_eXtthelpToType_Pdf;
} else {
return Cnv_eXtthelpToType_Ps;
}
}
void* insert(navh_eItemType item_type, const char* text1, const char* text2,
const char* text3, const char* link, const char* link_bookmark,
......
......@@ -116,23 +116,23 @@ int main(int argc, char* argv[])
int in_if = 0;
#if defined OS_LINUX
char os[] = "OS_LINUX";
char dos[] = "-DOS_LINUX -DOS_POSIX";
char dos[] = "-DOS_LINUX";
char cflags[] = "";
#elif defined OS_MACOS
char os[] = "OS_MACOS";
char dos[] = "-DOS_MACOS -DOS_POSIX";
char dos[] = "-DOS_MACOS";
char cflags[] = "";
#elif defined OS_FREEBSD
char os[] = "OS_FREEBSD";
char dos[] = "-DOS_FREEBSD -DOS_POSIX";
char dos[] = "-DOS_FREEBSD";
char cflags[] = "";
#elif defined OS_OPENBSD
char os[] = "OS_OPENBSD";
char dos[] = "-DOS_OPENBSD -DOS_POSIX";
char dos[] = "-DOS_OPENBSD";
char cflags[] = "";
#elif defined OS_CYGWIN
char os[] = "OS_CYGWIN";
char dos[] = "-DOS_CYGWIN -DOS_POSIX";
char dos[] = "-DOS_CYGWIN";
char cflags[] = "-I/usr/include/tirpc";
#endif
if (argc < 4) {
......
This diff is collapsed.
......@@ -71,14 +71,10 @@ pwr_tStatus bck_print(char*);
if ((sts) == -1) \
perror(str)
#if defined OS_POSIX
#define A_MODE
#define FGETNAME backup_confp->BackupFile
#define LOCK
#define UNLOCK
#else
#define A_MODE
#endif
/* Interface between the collector and the file writer */
......@@ -1121,13 +1117,8 @@ void* bck_coll_process(void* arg)
delta.tv_sec = cycletime / 10;
delta.tv_nsec = (cycletime % 10) * 100000000;
#if defined OS_LYNX && defined(PWR_LYNX_30)
abstime.tv_sec = delta.tv_sec;
abstime.tv_nsec = delta.tv_nsec;
#else
time_GetTime(&abstime);
time_Aadd(&abstime, &abstime, &delta);
#endif
sts4a = pthread_mutex_lock(&frcactmtx);
check4a(sts4a, "pthread_mutex_lock(&frcactmtx)");
......
This diff is collapsed.
......@@ -145,7 +145,6 @@ void ini_ProcTable(pwr_tStatus* status, ini_sContext* cp)
cPrio_fast, 0, pwr_cClass_DsFastConf, "", 0);
pp->proc.flags.b.system = 1;
#if defined OS_POSIX
pp = ini_ProcInsert(sts, cp, "pwr_remh", "pwr_remh_%d", 0, 1,
"rs_remotehandler", cPrio_remh, 0, pwr_cClass_RemoteConfig, "", 0);
pp->proc.flags.b.system = 1;
......@@ -217,7 +216,6 @@ void ini_ProcTable(pwr_tStatus* status, ini_sContext* cp)
pp = ini_ProcInsert(sts, cp, "pwr_sim", "pwr_sim_%d", 0, 1, "rt_sim",
cPrio_sim, 0, pwr_cClass_SimulateConfig, "", 0);
pp->proc.flags.b.system = 1;
#endif
if (!cp->plcfile_cnt) {
plc_idx = 0;
......
......@@ -34,9 +34,7 @@
* General Public License plus this exception.
*/
#if defined OS_POSIX
#include <string.h>
#endif
#include "rt_gdh.h"
#include "rt_ini_msg.h"
......@@ -56,11 +54,9 @@ void ini_StartApplications()
if (ODD(gdh_ObjidToPointer(objid, (pwr_tAddress*)&applp))) {
/* Found an object on this node, load the program */
#if defined OS_POSIX
errh_Error("NYI. start %s \"%s\" %d %d \"%s\"", applp->FileName,
applp->ProgramName, applp->StartWithDebug, applp->JobPriority,
applp->Arg);
#endif
} /* Local appl object */
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -641,7 +641,7 @@ EOF
#
<topic> index
<image> pwr_logga.gif
<image> pwr_logga.png
<h1>Welcome to $pname
<h2>Description
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
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