Skip to content

P
proview
Commit 1b50c634 authored by claes's avatar claes
Browse files
Options

Ubuntu 11.04 build

parent 6546dcec
Show whitespace changes
Inline Side-by-side
Showing with 91 additions and 47 deletions
profibus/lib/rt/src/os_linux/cif_api.c
View file @ 1b50c634
......@@ -706,7 +706,7 @@ short DevExitBoard( unsigned short usDevNumber)
{
DEVIO_EXITCMD tBuffer;
unsigned int lBytesReturned;
unsigned short usDrvOpenCount;
unsigned short usDrvOpenCount = 0;
short sRet = DRV_NO_ERROR;
if( hDevDrv == INVALID_HANDLE_VALUE) {
......@@ -1798,7 +1798,7 @@ short RunFirmwareDownload( unsigned short usDevNumber,
tSendMsg.rx = RCS_TASK;
tSendMsg.tx = MSG_SYSTEM_TX;
tSendMsg.ln = (unsigned char)lSendLen;
tSendMsg.nr = ++tSendMsg.nr;
tSendMsg.nr++; // tSendMsg.nr = ++tSendMsg.nr;
tSendMsg.a = 0;
tSendMsg.f = 0;
tSendMsg.b = RCS_B_LOADFKT;
......@@ -1838,7 +1838,7 @@ short RunFirmwareDownload( unsigned short usDevNumber,
case RCS_CONT_MSK:
tSendMsg.e = RCS_CONT_MSK;
tSendMsg.ln = (unsigned char)lSendLen;
tSendMsg.nr = ++tSendMsg.nr;
tSendMsg.nr++; // tSendMsg.nr = ++tSendMsg.nr;
// Send next message
memcpy ( &tSendMsg.data[0], &pabData[lActIdx], lSendLen);
......@@ -1871,7 +1871,7 @@ short RunFirmwareDownload( unsigned short usDevNumber,
case RCS_LAST_MSK:
tSendMsg.ln = (unsigned char)lSendLen;
tSendMsg.nr = ++tSendMsg.nr;
tSendMsg.nr++; // tSendMsg.nr = ++tSendMsg.nr;
tSendMsg.e = RCS_LAST_MSK;
memcpy ( &tSendMsg.data[0], &pabData[lActIdx] , lSendLen);
......@@ -1994,7 +1994,7 @@ short RunConfigDownload( unsigned short usDevNumber,
tSendMsg.rx = RCS_TASK;
tSendMsg.tx = MSG_SYSTEM_TX;
tSendMsg.ln = (unsigned char)lSendLen;
tSendMsg.nr = ++tSendMsg.nr;
tSendMsg.nr++; // tSendMsg.nr = ++tSendMsg.nr;
tSendMsg.a = 0;
tSendMsg.f = 0;
tSendMsg.b = RCS_B_LOADFKT;
......@@ -2031,7 +2031,7 @@ short RunConfigDownload( unsigned short usDevNumber,
tSendMsg.rx = RCS_TASK;
tSendMsg.tx = MSG_SYSTEM_TX;
tSendMsg.ln = (unsigned char)lSendLen;
tSendMsg.nr = ++tSendMsg.nr;
tSendMsg.nr++; // tSendMsg.nr = ++tSendMsg.nr;
tSendMsg.a = 0;
tSendMsg.f = 0;
tSendMsg.b = RCS_B_LOADFKT;
......
src/lib/co/src/co_ccm.h
View file @ 1b50c634
......@@ -24,8 +24,10 @@
extern "C" {
#endif
/* co_ccm.h -- script interpreter */
#define CCM_DECL_STRING 1
#define CCM_DECL_INT 2
#define CCM_DECL_FLOAT 3
......@@ -120,7 +122,7 @@ typedef struct ccm_sFunc_ {
struct ccm_sFunc_ *next;
} ccm_sFunc;
typedef struct {
typedef struct ccm_sFileCtx_ {
ccm_sLine *main_start_line;
ccm_sLine *main_end_line;
int verify;
......@@ -160,7 +162,7 @@ typedef struct {
ccm_sOperand *list;
} *ccm_tRowCtx;
typedef struct {
typedef struct ccm_sFuncCtx_ {
char msg[80];
ccm_tFileCtx filectx;
ccm_sIntvar *locint_list;
......@@ -182,7 +184,7 @@ typedef struct {
} ccm_sSysFunc;
typedef struct {
typedef struct ccm_sSingeLineCtx_ {
ccm_tFuncCtx funcctx;
int result_decl;
ccm_tFloat result_float;
......
src/lib/rt/src/rt_io_supervise.h
View file @ 1b50c634
......@@ -37,7 +37,7 @@
typedef struct s_ASupLstLink sASupLstLink;
typedef struct s_DSupLstLink sDSupLstLink;
typedef struct {
typedef struct io_sSupCtx_ {
sASupLstLink *TimerLstP;
sASupLstLink *ASupAnaLstP;
sDSupLstLink *DSupDigLstP;
......
src/lib/rt/src/rt_mh_outunit.c
View file @ 1b50c634
......@@ -420,7 +420,7 @@ mh_OutunitReceive ()
return MH__QCOMGETMSG;
}
switch (msg.type.b) {
switch ((int)msg.type.b) {
case qcom_eBtype_qcom:
fromQcom(&msg);
......
src/lib/rt/src/rt_net.c
View file @ 1b50c634
......@@ -252,7 +252,7 @@ ConvertPut (
* Neth version 7 and later. If this is needed for more messages
* then a generic solution must be implemented.
*/
if (put->type.s == net_eMsg_volumes7) {
if (put->type.s == (qcom_eStype)net_eMsg_volumes7) {
put->type.s = net_eMsg_volumes;
fXdr = xdr_net_sVolumes7;
}
......@@ -303,7 +303,7 @@ ConvertGet (
* then a generic solution must be implemented.
*/
fXdr = func_xdr[(int)get->type.s];
if (get->type.s == net_eMsg_volumes) {
if (get->type.s == (qcom_eStype)net_eMsg_volumes) {
gdb_ScopeLock {
gnp = hash_Search(&lsts, gdbroot->nid_ht, &np->nid);
netver = gnp->netver;
......@@ -520,7 +520,7 @@ Request (
if (
get->type.b != net_cMsgClass ||
get->type.s != subtype
get->type.s != (qcom_eStype)subtype
) {
qcom_Free(NULL, gmp);
pwr_Return(NULL, sts, QCOM__WEIRD);
......
src/lib/rt/src/rt_procom.cpp
View file @ 1b50c634
......@@ -1334,7 +1334,7 @@ void rt_procom::provideStatus( pwr_tStatus rsts)
{
pwr_tStatus sts;
switch( m_getmsg->type.s) {
switch( (int)m_getmsg->type.s) {
case net_eMsg_getObjectInfo: {
qcom_sPut put;
net_sGetObjectInfoR *rmp;
......
src/tools/pkg/ubu/pwr/control
View file @ 1b50c634
Package: pwr48
Version: 4.8.1-2
Version: 4.8.2-1
Section: base
Priority: optional
Architecture: i386
Depends: libc6 (>= 2.12.1-0ubuntu6), libgtk2.0-0 (>= 2.22.0-0ubuntu1), libasound2 (>= 1.0.23-1ubuntu2), libdb4.8 (>=4.8.30-1), libdb4.8++ (>=4.8.30-1), libmysql++3 (>= 3.0.9-1ubuntu2), g++ (>= 4:4.4.4-1ubuntu2)
Depends: libc6 (>= 2.13-0ubuntu13), libgtk2.0-0 (>= 2.24.4-0ubuntu2), libasound2 (>= 1.0.24.1-0ubuntu5), libdb4.8 (>=4.8.30-5ubuntu2), libdb4.8++ (>=4.8.30-5ubuntu2), libmysql++3 (>= 3.0.9-1ubuntu2), g++ (>= 4:4.5.2-1ubuntu3), xfonts-100dpi
Replaces: pwrrt,pwr34,pwr39,pwr40,pwr41,pwr42,pwr43,pwr44,pwr45,pwr46,pwr47
Maintainer: Proview <postmaster@proview.se>
Description: Proview development and runtime environment package
......@@ -25,3 +25,8 @@ Description: Proview development and runtime environment package
- Wb object editor, Ctrl DoubleClick MB1 didn't work on attribute references.
- Flow alloc color problem fixed.
- wb locale fix for ubuntu.
4.8.2-1
- Support for Hilscher cifX boards.
- Support for Hilscher cifX Profinet Controller.
- UDP communication configured with IO objects.
- Support for USB joystick.
src/tools/pkg/ubu/pwrdemo/control
View file @ 1b50c634
Package: pwrdemo48
Version: 4.8.1-2
Version: 4.8.2-1
Section: base
Priority: optional
Architecture: i386
Depends: pwr48 (>= 4.8.1-2)
Depends: pwr48 (>= 4.8.2-1)
Replaces:
Maintainer: Proview <postmaster@proview.se>
Description: Proview Demo Project package
......
src/tools/pkg/ubu/pwrrt/control
View file @ 1b50c634
Package: pwrrt
Version: 4.8.1-2
Version: 4.8.2-1
Section: base
Priority: optional
Architecture: i386
Depends: libc6 (>= 2.12.1-0ubuntu6), libgtk2.0-0 (>= 2.22.0-0ubuntu1), libasound2 (>= 1.0.23-1ubuntu2), libdb4.8 (>=4.8.30-1)
Depends: libc6 (>= 2.13-0ubuntu13), libgtk2.0-0 (>= 2.24.4-0ubuntu2), libasound2 (>= 1.0.24.1-0ubuntu5), libdb4.8 (>=4.8.30-5ubuntu2), xfonts-100dpi
Replaces: pwr34,pwr39,pwr40,pwr41,pwr42,pwr43,pwr44,pwr45,pwr46,pwr47,pwr48
Maintainer: Proview <postmaster@proview.se>
Description:
......
src/tools/pkg/ubu/pwrsev/control
View file @ 1b50c634
Package: pwrsev
Version: 4.8.1-2
Version: 4.8.2-1
Section: base
Priority: optional
Architecture: i386
Depends: libc6 (>= 2.12.1-0ubuntu6), libgtk2.0-0 (>= 2.22.0-0ubuntu1), libasound2 (>= 1.0.23-1ubuntu2), libdb4.8 (>=4.8.30-1), libmysql++3 (>= 3.0.9-1ubuntu2)
Depends: libc6 (>= 2.13-0ubuntu13), libgtk2.0-0 (>= 2.24.4-0ubuntu2), libasound2 (>= 1.0.24.1-0ubuntu5), libdb4.8 (>=4.8.30-5ubuntu2), libmysql++3 (>= 3.0.9-1ubuntu2), xfonts-100dpi
Replaces: pwr34,pwr39,pwr40,pwr41,pwr42,pwr43,pwr44,pwr45,pwr46,pwr47,pwr48
Maintainer: Proview <postmaster@proview.se>
Description:
......
src/tools/pkg/ubu_x86_64/pwr/control
View file @ 1b50c634
Package: pwr48
Version: 4.8.1-2
Version: 4.8.2-1
Section: base
Priority: optional
Architecture: amd64
Depends: libc6 (>= 2.12.1-0ubuntu6), libgtk2.0-0 (>= 2.22.0-0ubuntu1), libasound2 (>= 1.0.23-1ubuntu2), libdb4.8 (>=4.8.30-1), libdb4.8++ (>=4.8.30-1), libmysql++3 (>= 3.0.9-1ubuntu2), g++ (>= 4:4.4.4-1ubuntu2)
Depends: libc6 (>= 2.13-0ubuntu13), libgtk2.0-0 (>= 2.24.4-0ubuntu2), libasound2 (>= 1.0.24.1-0ubuntu5), libdb4.8 (>=4.8.30-5ubuntu2), libdb4.8++ (>=4.8.30-5ubuntu2), libmysql++3 (>= 3.0.9-1ubuntu2), g++ (>= 4:4.5.2-1ubuntu3), xfonts-100dpi
Replaces: pwrrt,pwr34,pwr39,pwr40,pwr41,pwr42,pwr43,pwr44,pwr45,pwr46,pwr47
Maintainer: Proview <postmaster@proview.se>
Description: Proview development and runtime environment package
......@@ -25,3 +25,8 @@ Description: Proview development and runtime environment package
- Wb object editor, Ctrl DoubleClick MB1 didn't work on attribute references.
- Flow alloc color problem fixed.
- wb locale fix for ubuntu.
4.8.2-1
- Support for Hilscher cifX boards.
- Support for Hilscher cifX Profinet Controller.
- UDP communication configured with IO objects.
- Support for USB joystick.
src/tools/pkg/ubu_x86_64/pwrdemo/control
View file @ 1b50c634
Package: pwrdemo48
Version: 4.8.1-2
Version: 4.8.2-1
Section: base
Priority: optional
Architecture: amd64
Depends: pwr48 (>= 4.8.1-2)
Depends: pwr48 (>= 4.8.2-1)
Replaces:
Maintainer: Proview <postmaster@proview.se>
Description: Proview Demo Project package
......
src/tools/pkg/ubu_x86_64/pwrrt/control
View file @ 1b50c634
Package: pwrrt
Version: 4.8.1-2
Version: 4.8.2-1
Section: base
Priority: optional
Architecture: amd64
Depends: libc6 (>= 2.10.1-0ubuntu16), libgtk2.0-0 (>= 2.18.3-1ubuntu2.2), libasound2 (>= 1.0.20-3ubuntu6.1), libdb4.7 (>=4.7.25-7ubuntu2)
Depends: libc6 (>= 2.13-0ubuntu13), libgtk2.0-0 (>= 2.24.4-0ubuntu2), libasound2 (>= 1.0.24.1-0ubuntu5), libdb4.8 (>=4.8.30-5ubuntu2), xfonts-100dpi
Replaces: pwr34,pwr39,pwr40,pwr41,pwr42,pwr43,pwr44,pwr45,pwr46,pwr47
Maintainer: Proview <postmaster@proview.se>
Description:
......
src/tools/pkg/ubu_x86_64/pwrsev/control
View file @ 1b50c634
Package: pwrsev
Version: 4.8.1-2
Version: 4.8.2-1
Section: base
Priority: optional
Architecture: amd64
Depends: libc6 (>= 2.10.1-0ubuntu16), libgtk2.0-0 (>= 2.18.3-1ubuntu2.2), libasound2 (>= 1.0.20-3ubuntu6.1), libdb4.7 (>=4.7.25-7ubuntu2), libmysqlclient15off (>= 5.1.30really5.0.83-0ubuntu3)
Depends: libc6 (>= 2.13-0ubuntu13), libgtk2.0-0 (>= 2.24.4-0ubuntu2), libasound2 (>= 1.0.24.1-0ubuntu5), libdb4.8 (>=4.8.30-5ubuntu2), libmysql++3 (>= 3.0.9-1ubuntu2), xfonts-100dpi
Replaces: pwr34,pwr39,pwr40,pwr41,pwr42,pwr43,pwr44,pwr45,pwr46,pwr47
Maintainer: Proview <postmaster@proview.se>
Description:
......
src/tools/pwre/src/os_linux/pwre.pl
View file @ 1b50c634
......@@ -276,6 +276,7 @@ sub ebuild # args: pass flavour
my $build_opc = 0;
my $build_profibus = 0;
my $build_otherio = 0;
my $build_misc = 0;
my $build_ssabox = 0;
my $build_tlog = 0;
my $build_othermanu = 0;
......@@ -297,6 +298,7 @@ sub ebuild # args: pass flavour
elsif ( $value[0] eq "opc" && $value[1] eq "1" ) { $build_opc = 1; printf( "-- opc\n");}
elsif ( $value[0] eq "profibus" && $value[1] eq "1" ) { $build_profibus = 1; printf( "-- profibus\n");}
elsif ( $value[0] eq "otherio" && $value[1] eq "1" ) { $build_otherio = 1; printf( "-- otherio\n");}
elsif ( $value[0] eq "misc" && $value[1] eq "1" ) { $build_misc = 1; printf( "-- misc\n");}
elsif ( $value[0] eq "ssabox" && $value[1] eq "1" ) { $build_ssabox = 1; printf( "-- ssabox\n");}
elsif ( $value[0] eq "tlog" && $value[1] eq "1" ) { $build_tlog = 1; printf( "-- tlog\n");}
elsif ( $value[0] eq "othermanu" && $value[1] eq "1" ) { $build_othermanu = 1; printf( "-- othermanu\n");}
......@@ -367,6 +369,11 @@ sub ebuild # args: pass flavour
_build("lib", "rt", "src", "all");
merge();
}
if ( $build_misc == 1) {
_module("misc");
_build("lib", "misc", "src", "all");
merge();
}
if ( $build_ssabox == 1) {
_module("ssabox");
_build("lib", "rt", "src", "all");
......@@ -435,6 +442,10 @@ sub ebuild # args: pass flavour
_module("telemecanique");
merge();
}
if ( $build_misc == 1) {
_module("misc");
merge();
}
}
elsif ( $pass eq "op" ) {
_module("xtt");
......@@ -511,6 +522,11 @@ sub ebuild # args: pass flavour
_build("mmi", "*", "src", "copy");
merge();
}
if ( $build_misc == 1) {
_module("misc");
_build("mmi", "*", "src", "copy");
merge();
}
if ( $build_ssabox == 1) {
_module("ssabox");
_build("mmi", "*", "src", "copy");
......@@ -591,6 +607,9 @@ sub build_all_modules ()
_module("opc");
build_all( $flavour);
merge();
_module("misc");
build_all( $flavour);
merge();
_module("ssabox");
build_all( $flavour);
merge();
......@@ -689,6 +708,11 @@ sub build_all_wbl ()
system( "rm $load_dir/*.dbs");
_build("wbl", "bcomp", "src", "lib");
merge();
_module("misc");
my($load_dir) = $ENV{"pwr_load"};
system( "rm $load_dir/*.dbs");
_build("wbl", "misc", "src", "lib");
merge();
_module("ssabox");
my($load_dir) = $ENV{"pwr_load"};
system( "rm $load_dir/*.dbs");
......
src/tools/pwre/src/os_linux/pwre_configure.sh
View file @ 1b50c634
......@@ -115,6 +115,8 @@ pwre_config_check_lib()
conf_libmq=$conf_libmq" -l${lib%.*}"
elif test $4 == "wmq"; then
conf_libwmq=$conf_libwmq" -l${lib%.*}"
elif test $4 == "libusb"; then
conf_lib=$conf_lib" -lusb-1.0"
else
conf_lib=$conf_lib" -l${lib%%.*}"
fi
......@@ -301,34 +303,40 @@ if test $pwre_hw == "hw_arm"; then
else
#Gtk
echo ""
echo "Mandatory :"
pwre_config_check_lib gtk GTK gtk gtk 0 /usr/lib/libgtk-x11-2.0.so
pwre_config_check_lib motif MRM motif motif 0 /usr/lib/libMrm.so
pwre_config_check_lib libantlr LIBANTLR lib wb 0 /usr/local/lib/libantlr.a
pwre_config_check_lib librpcsvc LIBRPCSVC lib lib 0 /usr/lib/librpcsvc.so:/usr/lib/librpcsvc.a
pwre_config_check_lib librpcsvc LIBRPCSVC lib lib 0 /usr/lib/librpcsvc.so:/usr/lib/librpcsvc.a:/usr/lib/i386-linux-gnu/librpcsvc.a
pwre_config_check_lib libasound LIBASOUND lib lib 0 /usr/lib/libasound.so:/usr/lib/libasound.a
pwre_config_check_lib libpthread LIBPTHREAD lib lib 0 /usr/lib/libpthread.so:/usr/lib/libpthread.a
pwre_config_check_lib libm LIBM lib lib 0 /usr/lib/libm.so:/usr/lib/libm.a
pwre_config_check_lib libdb LIBDB lib lib 0 /usr/lib/libdb.so
pwre_config_check_lib libdb_cxx LIBDB_CXX lib wb 0 /usr/lib/libdb_cxx.so
pwre_config_check_lib libz LIBZ lib lib 0 /usr/lib/libz.so:/usr/lib/libz.a
pwre_config_check_lib libcrypt LIBCRYPT lib lib 0 /usr/lib/libcrypt.so:/usr/lib/libcrypt.a
pwre_config_check_lib libpthread LIBPTHREAD lib lib 0 /usr/lib/libpthread.so:/usr/lib/libpthread.a:/usr/lib/i386-linux-gnu/libpthread.so
pwre_config_check_lib libm LIBM lib lib 0 /usr/lib/libm.so:/usr/lib/libm.a:/usr/lib/i386-linux-gnu/libm.so
pwre_config_check_lib libdb LIBDB lib lib 0 /usr/lib/libdb.so:/usr/lib/i386-linux-gnu/libdb.so
pwre_config_check_lib libdb_cxx LIBDB_CXX lib wb 0 /usr/lib/libdb_cxx.so:/usr/lib/i386-linux-gnu/libdb_cxx.so
pwre_config_check_lib libz LIBZ lib lib 0 /usr/lib/libz.so:/usr/lib/libz.a:/usr/lib/i386-linux-gnu/libz.so
pwre_config_check_lib libcrypt LIBCRYPT lib lib 0 /usr/lib/libcrypt.so:/usr/lib/libcrypt.a:/usr/lib/i386-linux-gnu/libcrypt.so
pwre_config_check_lib librt LIBRT lib lib 0 /usr/lib/librt.so:/usr/lib/librt.a:/usr/lib/i386-linux-gnu/librt.so
pwre_config_check_lib libfl LIBFL lib lib 0 /usr/lib/libfl.so:/usr/lib/libfl.a
pwre_config_check_lib libX11 LIBX11 lib lib 0 /usr/lib/libX11.so:/usr/lib/i386-linux-gnu/libX11.so
pwre_config_check_include antlr ANTLR 1 /usr/local/include/antlr/CommonAST.hpp
pwre_config_check_include gtk GTK 1 /usr/local/include/gtk-2.0/gtk.h:/usr/local/include/gtk-2.0/gtk/gtk.h:/usr/include/gtk-2.0/gtk/gtk.h
pwre_config_check_include jni JNI 1 $jdk/include/jni.h
pwre_config_check_include jni JNI 0 $jdk/include/linux/jni_md.h
echo ""
echo "Optional :"
pwre_config_check_lib motif MRM motif motif 0 /usr/lib/libMrm.so
pwre_config_check_lib mysql MYSQL lib lib 1 /usr/lib/libmysqlclient.so:/usr/lib/mysql/libmysqlclient.so
pwre_config_check_lib mq MQ lib mq 1 /usr/lib/libdmq.so
pwre_config_check_lib wmq WMQ lib wmq 1 /usr/lib/libmqic.so
pwre_config_check_lib libpnioif PNAK lib lib 1 /usr/lib/libpnioif.a:/usr/local/lib/libpnioif.a
pwre_config_check_lib libusb LIBUSB lib lib 1 /usr/lib/libusb-1.0.so
pwre_config_check_lib libusb LIBUSB lib libusb 1 /usr/lib/libusb-1.0.so
pwre_config_check_lib libcifx LIBCIFX lib lib 1 /usr/lib/libcifx.so.1
pwre_config_check_lib librt LIBRT lib lib 0 /usr/lib/librt.so:/usr/lib/librt.a
pwre_config_check_lib libfl LIBFL lib lib 0 /usr/lib/libfl.so:/usr/lib/libfl.a
pwre_config_check_lib libX11 LIBX11 lib lib 0 /usr/lib/libX11.so
#set -o xtrace
pwre_config_check_include antlr ANTLR 1 /usr/local/include/antlr/CommonAST.hpp
pwre_config_check_include gtk GTK 1 /usr/local/include/gtk-2.0/gtk.h:/usr/local/include/gtk-2.0/gtk/gtk.h:/usr/include/gtk-2.0/gtk/gtk.h
pwre_config_check_include jni JNI 1 $jdk/include/jni.h
pwre_config_check_include jni JNI 0 $jdk/include/linux/jni_md.h
pwre_config_check_include wmq WMQ 1 /opt/mqm/inc/cmqc.h
pwre_config_check_include cifx CIFX 1 /usr/local/include/cifx/cifxlinux.h
......
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