Commit a5ec05f6 authored by Claes Sjofors's avatar Claes Sjofors

Compile on Debian 64

parent 45ea6aef
...@@ -28,6 +28,8 @@ javac (jdk6) ...@@ -28,6 +28,8 @@ javac (jdk6)
Install the following packages Install the following packages
Mandatory:
make make
flex flex
gcc gcc
...@@ -38,23 +40,20 @@ libasound2-dev ...@@ -38,23 +40,20 @@ libasound2-dev
libdb5.1-dev libdb5.1-dev
libdb5.1++-dev libdb5.1++-dev
doxygen doxygen
libmysql++-dev (optional) libantlr-dev
libantlr-dev (version 2.7.7)
java: Download jdk-6u10-linux-i586.bin from java.sun.com. Define the
environment variable jdk to the path where the package is
extracted (e.g. /usr/local) and put $jdk/bin in the PATH.
export jdk=/usr/local/jdk1.6.0_10
export PATH=$PATH:$jdk/bin
Optional: Optional:
libmysql++-dev openjdk-6-jdk Web interface and java API
libsqlite3-dev libmysql++-dev History database with mysql
libusb-1.0-1-dev libsqlite3-dev History database with sqlite
librsvg2-dev libhdf5-openmpi-dev History database with hdf5
libusb-1.0.0-dev USB I/O cards (Velleman)
librsvg2-dev SVG image support in Ge
libgstreamer0.10-dev Network video camera
libgstreamer-plugins-base0.10-dev Network video camera
openPOWERLINK-V1.08.2 Ethernet Powerlink zip-file. Build from sources.
libpcap-dev Ethernet Powerlink
There has to be a valid display when building proview. There has to be a valid display when building proview.
......
...@@ -3024,7 +3024,7 @@ static int gdh_JidToPointer( int id, void **p) ...@@ -3024,7 +3024,7 @@ static int gdh_JidToPointer( int id, void **p)
static int gdh_JidStore( void *p, pwr_tRefId r, int *id) static int gdh_JidStore( void *p, pwr_tRefId r, int *id)
{ {
#if (defined POSIX) && defined HW_X86_64 #if ( defined OS_POSIX) && defined HW_X86_64
sJid *jp; sJid *jp;
pwr_tStatus sts; pwr_tStatus sts;
......
...@@ -104,17 +104,17 @@ public class JopXttApplet extends JopApplet ...@@ -104,17 +104,17 @@ public class JopXttApplet extends JopApplet
URL url = this.getCodeBase(); URL url = this.getCodeBase();
Logg.loggTo = Logg.TO_SCREEN; Logg.loggTo = Logg.TO_SCREEN;
Logg.loggPrio = 0; Logg.loggPrio = 0;
Logg.logg("JopXttApplet: Före XttTree-skapande", 6); Logg.logg("JopXttApplet: Before XttTree-creation", 6);
this.xttTree = new XttTree( session, url, this); this.xttTree = new XttTree( session, url, this);
this.getContentPane().add(this.xttTree); this.getContentPane().add(this.xttTree);
this.xttTree.createUserInputs(); this.xttTree.createUserInputs();
Logg.logg("JopXttApplet: XttTree-skapande klart", 6); Logg.logg("JopXttApplet: XttTree-created", 6);
} }
/** Description of the Method */ /** Description of the Method */
public void start() public void start()
{ {
Logg.logg("JopXttApplet: start() anropad", 6); Logg.logg("JopXttApplet: start() called", 6);
this.xttTree.tree.requestFocus(); this.xttTree.tree.requestFocus();
} }
......
...@@ -81,11 +81,11 @@ public class JopXttFrame extends JFrame implements GdhApplIfc ...@@ -81,11 +81,11 @@ public class JopXttFrame extends JFrame implements GdhApplIfc
URL url = null; URL url = null;
Logg.loggTo = Logg.TO_SCREEN; Logg.loggTo = Logg.TO_SCREEN;
Logg.loggPrio = 0; Logg.loggPrio = 0;
Logg.logg("JopXttApplet: Fre XttTree-skapande", 6); Logg.logg("JopXttApplet: Before XttTree-created", 6);
this.xttTree = new XttTree(this.session, url, this); this.xttTree = new XttTree(this.session, url, this);
this.getContentPane().add(this.xttTree); this.getContentPane().add(this.xttTree);
this.xttTree.createUserInputs(); this.xttTree.createUserInputs();
Logg.logg("JopXttApplet: XttTree-skapande klart", 6); Logg.logg("JopXttApplet: XttTree created", 6);
class WindowCatcher extends WindowAdapter class WindowCatcher extends WindowAdapter
{ {
......
...@@ -101,7 +101,7 @@ public class Logg ...@@ -101,7 +101,7 @@ public class Logg
{ {
Logg.loggTo = Logg.TO_SCREEN; Logg.loggTo = Logg.TO_SCREEN;
System.out.println(Logg.loggTo); System.out.println(Logg.loggTo);
Logg.logg("Tjoflöjt", 3); Logg.logg("Logg test", 3);
} }
} }
...@@ -156,9 +156,9 @@ public class MhClient extends JApplet ...@@ -156,9 +156,9 @@ public class MhClient extends JApplet
this.setSize(size); this.setSize(size);
messagePanel.add(labelMessage, BorderLayout.NORTH); messagePanel.add(labelMessage, BorderLayout.NORTH);
//Logg.logg("MhClient: Fre XttTree-skapande", 6); //Logg.logg("MhClient: Before XttTree-creation", 6);
this.mhTable = new MhTable(this, false, this.labelMessage); this.mhTable = new MhTable(this, false, this.labelMessage);
//Logg.logg("MhClient: mhTable-skapande klart", 6); //Logg.logg("MhClient: mhTable created", 6);
this.contentPane.add(this.mhTable.splitPane, BorderLayout.CENTER); this.contentPane.add(this.mhTable.splitPane, BorderLayout.CENTER);
} }
......
...@@ -157,9 +157,9 @@ public class MhFrame extends JFrame implements GdhApplIfc { ...@@ -157,9 +157,9 @@ public class MhFrame extends JFrame implements GdhApplIfc {
this.setSize(size); this.setSize(size);
messagePanel.add(labelMessage, BorderLayout.NORTH); messagePanel.add(labelMessage, BorderLayout.NORTH);
//Logg.logg("MhClient: Fre XttTree-skapande", 6); //Logg.logg("MhClient: Before XttTree-creation", 6);
this.mhTable = new MhTable(root, false, this.labelMessage); this.mhTable = new MhTable(root, false, this.labelMessage);
//Logg.logg("MhClient: mhTable-skapande klart", 6); //Logg.logg("MhClient: mhTable created", 6);
this.contentPane.add(this.mhTable.splitPane, BorderLayout.CENTER); this.contentPane.add(this.mhTable.splitPane, BorderLayout.CENTER);
} }
......
...@@ -94,7 +94,7 @@ public class MhTable extends JPanel ...@@ -94,7 +94,7 @@ public class MhTable extends JPanel
JopLang.transl("Time"), JopLang.transl("Time"),
JopLang.transl("Event Text"), JopLang.transl("Event Text"),
JopLang.transl("Object")}; JopLang.transl("Object")};
//JLabel eventTableLbl = new JLabel("Hndelselista");
Color ALarmColor = new Color(255,100,100); // Color.red; Color ALarmColor = new Color(255,100,100); // Color.red;
Color BLarmColor = Color.yellow; Color BLarmColor = Color.yellow;
Color CLarmColor = new Color(135,206,235); // Color.blue; Color CLarmColor = new Color(135,206,235); // Color.blue;
...@@ -346,8 +346,8 @@ public class MhTable extends JPanel ...@@ -346,8 +346,8 @@ public class MhTable extends JPanel
public final Object[] longValues = {"A", Boolean.TRUE, public final Object[] longValues = {"A", Boolean.TRUE,
"10-12-31 12:12:12.98", "10-12-31 12:12:12.98",
"QWERTYUIOPLK_JHGFDSAZXCVBNM__P", "QWERTYUIOPAAOLK_JHGFDSAZXCVBNM__P",
"QWERTYUIOPLK"}; "QWERTYUIOPAAOLK"};
/** /**
...@@ -588,8 +588,8 @@ public class MhTable extends JPanel ...@@ -588,8 +588,8 @@ public class MhTable extends JPanel
public final Object[] longValues = {"A", "Acknowledge", public final Object[] longValues = {"A", "Acknowledge",
"10-12-31 12:12:12.98", "10-12-31 12:12:12.98",
"QWERTYUIOPLK_JHGFDSAZXCVBNM__POIUYTRQWERTYUIOPL", "QWERTYUIOPAAOLK_JHGFDSAZXCVBNM__POIUYTRQWERTYUIOPAAOL",
"QWERTYUIOPLK"}; "QWERTYUIOPAAOLK"};
/** /**
...@@ -848,7 +848,7 @@ public class MhTable extends JPanel ...@@ -848,7 +848,7 @@ public class MhTable extends JPanel
{ {
out = new ObjectOutputStream( /*new BufferedOutputStream(*/socket.getOutputStream() /*)*/); out = new ObjectOutputStream( /*new BufferedOutputStream(*/socket.getOutputStream() /*)*/);
out.flush(); out.flush();
//varfr??? // why?
in = new ObjectInputStream( /*new BufferedInputStream(*/socket.getInputStream() /*)*/); in = new ObjectInputStream( /*new BufferedInputStream(*/socket.getInputStream() /*)*/);
} }
catch(IOException e) catch(IOException e)
...@@ -1015,7 +1015,7 @@ public class MhTable extends JPanel ...@@ -1015,7 +1015,7 @@ public class MhTable extends JPanel
//} //}
this.setText("D"); this.setText("D");
} }
//annars mste det vara ett meddelande qqq?? // or this has to be a message qqq??
else else
{ {
//if(isNotReturned) //if(isNotReturned)
...@@ -1101,7 +1101,7 @@ public class MhTable extends JPanel ...@@ -1101,7 +1101,7 @@ public class MhTable extends JPanel
} }
this.setText("D"); this.setText("D");
} }
//annars mste det vara ett meddelande qqq?? // or it has to be a message qqq??
else else
{ {
if(setColor) if(setColor)
......
...@@ -172,14 +172,14 @@ public class XttObj extends DynamicObj implements JopDynamic ...@@ -172,14 +172,14 @@ public class XttObj extends DynamicObj implements JopDynamic
if( ((obj.flags & Pwr.mAdef_array) > 0) && if( ((obj.flags & Pwr.mAdef_array) > 0) &&
((obj.flags & Pwr.mAdef_class) <= 0) ) ((obj.flags & Pwr.mAdef_class) <= 0) )
{ {
Logg.logg("XttObj: Hittat array, vad ska jag gra nu?? " + s, 6); Logg.logg("XttObj: Found array, what to do now?? " + s, 6);
XttArrayAttr arrayAttr = new XttArrayAttr(s); XttArrayAttr arrayAttr = new XttArrayAttr(s);
DefaultMutableTreeNode arrayChildNode = new DefaultMutableTreeNode(arrayAttr); DefaultMutableTreeNode arrayChildNode = new DefaultMutableTreeNode(arrayAttr);
obj.treeNode.add(arrayChildNode); obj.treeNode.add(arrayChildNode);
} }
else if((obj.flags & Pwr.mAdef_class) > 0) else if((obj.flags & Pwr.mAdef_class) > 0)
{ {
Logg.logg("XttObj: Hittat klass, vad ska jag gra nu?? " + this.fullName + " " + obj.name , 1); Logg.logg("XttObj: Found class, what to do now?? " + this.fullName + " " + obj.name , 1);
// CdhrObjid cdhrObjid = gdh.nameToObjid(this.fullName + obj.name); // CdhrObjid cdhrObjid = gdh.nameToObjid(this.fullName + obj.name);
// System.out.println("nameToObjid " + cdhrObjid.getSts()); // System.out.println("nameToObjid " + cdhrObjid.getSts());
...@@ -206,14 +206,14 @@ public class XttObj extends DynamicObj implements JopDynamic ...@@ -206,14 +206,14 @@ public class XttObj extends DynamicObj implements JopDynamic
this.en, this.en,
this.fullName + obj.name, this.fullName + obj.name,
obj.name, obj.name,
"Tjofljt", "Test",
cdhrObjid, cdhrObjid,
cdhrClassId); cdhrClassId);
*/ */
// DefaultMutableTreeNode classChildNode = new DefaultMutableTreeNode(classObj); // DefaultMutableTreeNode classChildNode = new DefaultMutableTreeNode(classObj);
// obj.treeNode.add(classChildNode); // obj.treeNode.add(classChildNode);
} }
//p grund av bugg i nuvarande proviewversion DataPointer borde vara PRIVATE // Data pointer should be PRIVATE but id not?
else if(obj.name.compareTo("DataPointer") != 0) else if(obj.name.compareTo("DataPointer") != 0)
{ {
refVec.add(s); refVec.add(s);
...@@ -238,7 +238,7 @@ public class XttObj extends DynamicObj implements JopDynamic ...@@ -238,7 +238,7 @@ public class XttObj extends DynamicObj implements JopDynamic
Logg.logg("XttObj: refObjectInfo_Vector(" + s + ") Error ", 1); Logg.logg("XttObj: refObjectInfo_Vector(" + s + ") Error ", 1);
} }
//p grund av bugg i nuvarande proviewversion DataPointer borde vara PRIVATE // DataPointer should be PRIVATE but is not?
while(j < attrVector.size() && while(j < attrVector.size() &&
(((XttObjAttr)attrVector.get(j)).name.compareTo("DataPointer") == 0 || (((XttObjAttr)attrVector.get(j)).name.compareTo("DataPointer") == 0 ||
((((XttObjAttr)attrVector.get(j)).flags & Pwr.mAdef_array) > 0) || ((((XttObjAttr)attrVector.get(j)).flags & Pwr.mAdef_array) > 0) ||
...@@ -374,7 +374,7 @@ public class XttObj extends DynamicObj implements JopDynamic ...@@ -374,7 +374,7 @@ public class XttObj extends DynamicObj implements JopDynamic
} }
*/ */
} }
//p grund av bugg i nuvarande proviewversion DataPointer borde vara PRIVATE // DataPointer should be PRIVATE but is not?
else if(obj.name.compareTo("DataPointer") != 0) else if(obj.name.compareTo("DataPointer") != 0)
{ {
Logg.logg(" " + obj.refObj.refid.rix, 6); Logg.logg(" " + obj.refObj.refid.rix, 6);
......
...@@ -204,7 +204,7 @@ public class XttRefObj extends DynamicObj implements JopDynamic ...@@ -204,7 +204,7 @@ public class XttRefObj extends DynamicObj implements JopDynamic
// this.showableClassName = showableClassName; // this.showableClassName = showableClassName;
if(index < 0) if(index < 0)
{ {
Logg.logg("Fel vid frsk att debugga", 0); Logg.logg("Error at debug attempt", 0);
return; return;
} }
CdhrObjAttr oa = AttrObj[index]; CdhrObjAttr oa = AttrObj[index];
...@@ -218,7 +218,7 @@ public class XttRefObj extends DynamicObj implements JopDynamic ...@@ -218,7 +218,7 @@ public class XttRefObj extends DynamicObj implements JopDynamic
} }
else else
{ {
Logg.logg("Kan ej debugga " + fullname + " cid: " + cid + " p index " + index, 0); Logg.logg("Can not debug " + fullname + " cid: " + cid + " on index " + index, 0);
} }
} }
......
This diff is collapsed.
...@@ -168,7 +168,7 @@ void setup_io() ...@@ -168,7 +168,7 @@ void setup_io()
); );
if ((long)clk_map < 0) { if ((long)clk_map < 0) {
printf("clk mmap error %d\n", (int)clk_map); printf("clk mmap error %d\n", (int)((long int)clk_map));
exit (-1); exit (-1);
} }
clk = (volatile unsigned *)clk_map; clk = (volatile unsigned *)clk_map;
...@@ -197,7 +197,7 @@ void setup_io() ...@@ -197,7 +197,7 @@ void setup_io()
); );
if ((long)gpio_map < 0) { if ((long)gpio_map < 0) {
printf("gpio mmap error %d\n", (int)gpio_map); printf("gpio mmap error %d\n", (int)((long int)gpio_map));
exit (-1); exit (-1);
} }
gpio = (volatile unsigned *)gpio_map; gpio = (volatile unsigned *)gpio_map;
...@@ -225,7 +225,7 @@ void setup_io() ...@@ -225,7 +225,7 @@ void setup_io()
); );
if ((long)pwm_map < 0) { if ((long)pwm_map < 0) {
printf("pwm mmap error %d\n", (int)pwm_map); printf("pwm mmap error %d\n", (int)((long int)pwm_map));
exit (-1); exit (-1);
} }
pwm = (volatile unsigned *)pwm_map; pwm = (volatile unsigned *)pwm_map;
...@@ -253,7 +253,7 @@ void setup_io() ...@@ -253,7 +253,7 @@ void setup_io()
); );
if ((long)spi0_map < 0) { if ((long)spi0_map < 0) {
printf("spi0 mmap error %d\n", (int)spi0_map); printf("spi0 mmap error %d\n", (int)((long int)spi0_map));
exit (-1); exit (-1);
} }
spi0 = (volatile unsigned *)spi0_map; spi0 = (volatile unsigned *)spi0_map;
...@@ -281,7 +281,7 @@ void setup_io() ...@@ -281,7 +281,7 @@ void setup_io()
); );
if ((long)uart_map < 0) { if ((long)uart_map < 0) {
printf("uart mmap error %d\n", (int)uart_map); printf("uart mmap error %d\n", (int)((long int)uart_map));
exit (-1); exit (-1);
} }
uart = (volatile unsigned *)uart_map; uart = (volatile unsigned *)uart_map;
......
...@@ -40,6 +40,7 @@ ...@@ -40,6 +40,7 @@
#include "pwr_basecomponentclasses.h" #include "pwr_basecomponentclasses.h"
#include "pwr_otherioclasses.h" #include "pwr_otherioclasses.h"
#include "co_time.h" #include "co_time.h"
#include "co_cdh.h"
#include "rt_io_base.h" #include "rt_io_base.h"
#include "rt_io_card_init.h" #include "rt_io_card_init.h"
#include "rt_io_card_close.h" #include "rt_io_card_close.h"
......
...@@ -2214,7 +2214,7 @@ int ItemPnDevice::scan( GsdmlAttrNav *attrnav, void *p) ...@@ -2214,7 +2214,7 @@ int ItemPnDevice::scan( GsdmlAttrNav *attrnav, void *p)
if ( !first_scan) { if ( !first_scan) {
if (old_value == 0) { if (old_value == 0) {
GsdmlAttrNav::device_changed_ok( attrnav, (void *)old_value); GsdmlAttrNav::device_changed_ok( attrnav, (void *)((long int)old_value));
return 1; return 1;
} }
else { else {
...@@ -2227,7 +2227,7 @@ int ItemPnDevice::scan( GsdmlAttrNav *attrnav, void *p) ...@@ -2227,7 +2227,7 @@ int ItemPnDevice::scan( GsdmlAttrNav *attrnav, void *p)
"All configuration data will be lost when changing the device.\n" "All configuration data will be lost when changing the device.\n"
"Do you really want to change the device ?", "Do you really want to change the device ?",
GsdmlAttrNav::device_changed_ok, GsdmlAttrNav::device_changed_cancel, GsdmlAttrNav::device_changed_ok, GsdmlAttrNav::device_changed_cancel,
(void *)old_value); (void *)((long int)old_value));
attrnav->device_confirm_active = 1; attrnav->device_confirm_active = 1;
return 1; return 1;
} }
......
...@@ -38,9 +38,9 @@ T_PNAK_RESULT pnak_mask_multiple_objects (unsigned short a1, c ...@@ -38,9 +38,9 @@ T_PNAK_RESULT pnak_mask_multiple_objects (unsigned short a1, c
T_PNAK_RESULT pnak_get_exception (unsigned short a1, T_PNAK_EXCEPTION* a2) {return PNAK_OK;} T_PNAK_RESULT pnak_get_exception (unsigned short a1, T_PNAK_EXCEPTION* a2) {return PNAK_OK;}
T_PNAK_RESULT pnak_get_version (unsigned short a1, T_PNAK_VERSIONS* a2) {return PNAK_OK;} T_PNAK_RESULT pnak_get_version (unsigned short a1, T_PNAK_VERSIONS* a2) {return PNAK_OK;}
T_PNAK_RESULT pnak_snmp_get_data (unsigned short a1, T_PNAK_OID* a2, void* a3, unsigned long* a4, unsigned long* a5, unsigned char a6, PN_BOOL a7) {return PNAK_OK;} T_PNAK_RESULT pnak_snmp_get_data (unsigned short a1, T_PNAK_OID* a2, void* a3, unsigned int* a4, unsigned int* a5, unsigned char a6, PN_BOOL a7) {return PNAK_OK;}
T_PNAK_RESULT pnak_snmp_check_data (unsigned short a1, T_PNAK_OID* a2, void* a3, unsigned long a4, unsigned long a5, unsigned char a6) {return PNAK_OK;} T_PNAK_RESULT pnak_snmp_check_data (unsigned short a1, T_PNAK_OID* a2, void* a3, unsigned int a4, unsigned int a5, unsigned char a6) {return PNAK_OK;}
T_PNAK_RESULT pnak_snmp_set_data (unsigned short a1, T_PNAK_OID* a2, void* a3, unsigned long a4, unsigned long a5) {return PNAK_OK;} T_PNAK_RESULT pnak_snmp_set_data (unsigned short a1, T_PNAK_OID* a2, void* a3, unsigned int a4, unsigned int a5) {return PNAK_OK;}
/*--- Service interface functions -------------------------------------------*/ /*--- Service interface functions -------------------------------------------*/
......
...@@ -98,9 +98,9 @@ int sev_repair::check() ...@@ -98,9 +98,9 @@ int sev_repair::check()
int fail_cnt = 0; int fail_cnt = 0;
printf( "-- Number of tables to check: %u\n", m_db->m_items.size()); printf( "-- Number of tables to check: %u\n", (unsigned int)m_db->m_items.size());
for ( unsigned int i = 0; i < m_db->m_items.size(); i++) { for ( unsigned int i = 0; i < m_db->m_items.size(); i++) {
printf( "\n-- Processing %u (%u) %s\n", i, m_db->m_items.size(), m_db->m_items[i].tablename); printf( "\n-- Processing %u (%u) %s\n", i, (unsigned int)m_db->m_items.size(), m_db->m_items[i].tablename);
m_db->repair_table( &sts, m_db->m_items[i].tablename); m_db->repair_table( &sts, m_db->m_items[i].tablename);
if ( EVEN(sts)) if ( EVEN(sts))
fail_cnt++; fail_cnt++;
...@@ -144,9 +144,9 @@ int sev_repair::alter_engine() ...@@ -144,9 +144,9 @@ int sev_repair::alter_engine()
int fail_cnt = 0; int fail_cnt = 0;
printf( "-- Number of tables to alter: %u\n", m_db->m_items.size()); printf( "-- Number of tables to alter: %u\n", (unsigned int)m_db->m_items.size());
for ( unsigned int i = 0; i < m_db->m_items.size(); i++) { for ( unsigned int i = 0; i < m_db->m_items.size(); i++) {
printf( "\n-- Processing %u (%u) %s\n", i, m_db->m_items.size(), m_db->m_items[i].tablename); printf( "\n-- Processing %u (%u) %s\n", i, (unsigned int)m_db->m_items.size(), m_db->m_items[i].tablename);
m_db->alter_engine( &sts, m_db->m_items[i].tablename); m_db->alter_engine( &sts, m_db->m_items[i].tablename);
if ( EVEN(sts)) if ( EVEN(sts))
fail_cnt++; fail_cnt++;
...@@ -164,9 +164,9 @@ int sev_repair::optimize() ...@@ -164,9 +164,9 @@ int sev_repair::optimize()
int fail_cnt = 0; int fail_cnt = 0;
printf( "-- Number of tables to optimize: %u\n", m_db->m_items.size()); printf( "-- Number of tables to optimize: %u\n", (unsigned int)m_db->m_items.size());
for ( unsigned int i = 0; i < m_db->m_items.size(); i++) { for ( unsigned int i = 0; i < m_db->m_items.size(); i++) {
printf( "-- Processing %u (%u) %s\n", i, m_db->m_items.size(), m_db->m_items[i].tablename); printf( "-- Processing %u (%u) %s\n", i, (unsigned int)m_db->m_items.size(), m_db->m_items[i].tablename);
m_db->optimize( &sts, m_db->m_items[i].tablename); m_db->optimize( &sts, m_db->m_items[i].tablename);
if ( EVEN(sts)) if ( EVEN(sts))
fail_cnt++; fail_cnt++;
...@@ -208,7 +208,7 @@ void sev_repair::clean() ...@@ -208,7 +208,7 @@ void sev_repair::clean()
{ {
int i; int i;
printf( " \n-- Number of tables to clean: %u\n", m_db->m_items.size()); printf( " \n-- Number of tables to clean: %u\n", (unsigned int)m_db->m_items.size());
for ( i = 0; i < (int)m_db->m_items.size(); i++) { for ( i = 0; i < (int)m_db->m_items.size(); i++) {
clean_item( i, 1); clean_item( i, 1);
} }
...@@ -246,7 +246,7 @@ void sev_repair::clean_item( int idx, int print_idx) ...@@ -246,7 +246,7 @@ void sev_repair::clean_item( int idx, int print_idx)
if( m_db->m_items[idx].attrnum > 1 ) { if( m_db->m_items[idx].attrnum > 1 ) {
if ( print_idx) if ( print_idx)
printf( "-- Processing %d (%u) %s\n", idx, m_db->m_items.size(), m_db->m_items[idx].tablename); printf( "-- Processing %d (%u) %s\n", idx, (unsigned int)m_db->m_items.size(), m_db->m_items[idx].tablename);
else else
printf( "-- Processing %s\n", m_db->m_items[idx].tablename); printf( "-- Processing %s\n", m_db->m_items[idx].tablename);
m_db->delete_old_objectdata( &m_sts, m_db->m_items[idx].tablename, m_db->delete_old_objectdata( &m_sts, m_db->m_items[idx].tablename,
...@@ -254,7 +254,7 @@ void sev_repair::clean_item( int idx, int print_idx) ...@@ -254,7 +254,7 @@ void sev_repair::clean_item( int idx, int print_idx)
} }
else { else {
if ( print_idx) if ( print_idx)
printf( "-- Processing %d (%u) %s\n", idx, m_db->m_items.size(), m_db->m_items[idx].tablename); printf( "-- Processing %d (%u) %s\n", idx, (unsigned int)m_db->m_items.size(), m_db->m_items[idx].tablename);
else else
printf( "-- Processing %s\n", m_db->m_items[idx].tablename); printf( "-- Processing %s\n", m_db->m_items[idx].tablename);
m_db->delete_old_data( &m_sts, m_db->m_items[idx].tablename, m_db->delete_old_data( &m_sts, m_db->m_items[idx].tablename,
...@@ -270,7 +270,7 @@ int sev_repair::list() ...@@ -270,7 +270,7 @@ int sev_repair::list()
printf( " "); printf( " ");
printf( " %s\n", m_db->m_items[i].oname); printf( " %s\n", m_db->m_items[i].oname);
} }
printf( "-- Number of tables: %u\n", m_db->m_items.size()); printf( "-- Number of tables: %u\n", (unsigned int)m_db->m_items.size());
return 1; return 1;
} }
......
...@@ -3240,8 +3240,6 @@ isValidOutunit ( ...@@ -3240,8 +3240,6 @@ isValidOutunit (
if (op->birthTime.tv_sec != hp->birthTime.tv_sec) { if (op->birthTime.tv_sec != hp->birthTime.tv_sec) {
if ( hp->type == mh_eMsg_OutunitInfo) { if ( hp->type == mh_eMsg_OutunitInfo) {
printf( "Outunit restart old x%x qid %d,%d aid %d,%d\n", (unsigned int)op, op->link.qid.nid,op->link.qid.qix,op->link.aid.nid,op->link.aid.aix);
printf( " new x%x qid %d,%d aid %d,%d\n", (unsigned int)hp, hp->qid.nid,hp->qid.qix,aid->nid,aid->aix);
//sendToOutunit(op, mh_eMsg_OutunitClear, 0, NULL, 0); //sendToOutunit(op, mh_eMsg_OutunitClear, 0, NULL, 0);
if ( hp->nix == l.head.nix) if ( hp->nix == l.head.nix)
handlerEvent(pwr_eSystemEventTypeEnum_OutunitRestart, hp->nix, 1); handlerEvent(pwr_eSystemEventTypeEnum_OutunitRestart, hp->nix, 1);
......
...@@ -122,7 +122,7 @@ log_done = ...@@ -122,7 +122,7 @@ log_done =
#cinc := -I$(inc_dir) -I$(einc_dir) -I$(hw_source) -I$(os_source) -I$(co_source) -I/usr/X11R6/include -I$(jdk)/include -I$(jdk)/include/linux \ #cinc := -I$(inc_dir) -I$(einc_dir) -I$(hw_source) -I$(os_source) -I$(co_source) -I/usr/X11R6/include -I$(jdk)/include -I$(jdk)/include/linux \
`pkg-config --cflags gtk+-2.0` -DPREFIX=\"/usr/local\" -DSYSCONFDIR=\"/etc\" -DDATADIR=\"/usr/share\" -DLIBDIR=\"/usr/lib\" $(cmysql) $(cgtk) $(clibusb) `pkg-config --cflags gtk+-2.0` -DPREFIX=\"/usr/local\" -DSYSCONFDIR=\"/etc\" -DDATADIR=\"/usr/share\" -DLIBDIR=\"/usr/lib\" $(cmysql) $(cgtk) $(clibusb)
csetos := $(pwre_conf_cc_define) csetos := $(pwre_conf_cc_define)
cinc := -I$(inc_dir) -I$(einc_dir) -I$(hw_source) -I$(os_source) -I$(co_source) $(pwre_conf_incdir) $(pwre_conf_incdirgtk) cinc := -I$(inc_dir) -I$(einc_dir) -I$(hw_source) -I$(os_source) -I$(co_source) $(pwre_conf_incdir) $(pwre_conf_incdirgtk) $(pwre_conf_incdirgst)
rm := rm rm := rm
cp := cp cp := cp
cpflags := cpflags :=
......
...@@ -283,7 +283,7 @@ let lib_cnt=0 ...@@ -283,7 +283,7 @@ let lib_cnt=0
let i=0 let i=0
hwpl=`eval uname -i` hwpl=`eval uname -i`
machine=`eval uname -m` machine=`eval uname -m`
if [ $machine == "i686" ]; then if [ $machine == "i686" ] || [ $machine == "x86_64" ]; then
hwpl=$machine hwpl=$machine
fi fi
if [ ${machine:0:3} == "arm" ]; then if [ ${machine:0:3} == "arm" ]; then
...@@ -301,6 +301,7 @@ else ...@@ -301,6 +301,7 @@ else
hwpl=i386 hwpl=i386
fi fi
fi fi
echo "hwpl $hwpl"
# Bash # Bash
if [ "$SHELL" != "/bin/bash" ] && [ "$SHELL" != "/usr/local/bin/bash" ]; then if [ "$SHELL" != "/bin/bash" ] && [ "$SHELL" != "/usr/local/bin/bash" ]; then
...@@ -468,8 +469,8 @@ else ...@@ -468,8 +469,8 @@ else
pwre_config_check_lib powerlinkcn POWERLINKCN lib powerlinkcn 1 "$epl/buildcn/Examples/X86/Generic/powerlink_user_lib/libpowerlink.a" pwre_config_check_lib powerlinkcn POWERLINKCN lib powerlinkcn 1 "$epl/buildcn/Examples/X86/Generic/powerlink_user_lib/libpowerlink.a"
pwre_config_check_lib libpcap LIBPCAP lib libpcap 1 "/usr/lib/libpcap.so:/usr/lib/$hwpl-linux-$gnu/libpcap.so" pwre_config_check_lib libpcap LIBPCAP lib libpcap 1 "/usr/lib/libpcap.so:/usr/lib/$hwpl-linux-$gnu/libpcap.so"
pwre_config_check_lib librsvg LIBRSVG lib librsvg 1 "/usr/lib/librsvg-2.so:/usr/lib/$hwpl-linux-$gnu/librsvg-2.so" pwre_config_check_lib librsvg LIBRSVG lib librsvg 1 "/usr/lib/librsvg-2.so:/usr/lib/$hwpl-linux-$gnu/librsvg-2.so"
pwre_config_check_include gst GST 1 "/opt/gstreamer-sdk/include/gstreamer-0.10/gst/gst.h" pwre_config_check_include gst GST 1 "/usr/include/gstreamer-0.10/gst/gst.h:/opt/gstreamer-sdk/include/gstreamer-0.10/gst/gst.h"
pwre_config_check_lib gst GST gst gst 0 "/opt/gstreamer-sdk/lib/libgstreamer-0.10.so" pwre_config_check_lib gst GST gst gst 0 "/usr/lib/$hwpl-linux-$gnu/libgstreamer-0.10.so:/opt/gstreamer-sdk/lib/libgstreamer-0.10.so"
if [ $pwre_hw == "hw_arm" ]; then if [ $pwre_hw == "hw_arm" ]; then
pwre_config_check_lib libpiface LIBPIFACE lib libpiface 1 "/usr/local/lib/libpiface-1.0.a" pwre_config_check_lib libpiface LIBPIFACE lib libpiface 1 "/usr/local/lib/libpiface-1.0.a"
pwre_config_check_include piface PIFACE 1 "/usr/local/include/libpiface-1.0/pfio.h" pwre_config_check_include piface PIFACE 1 "/usr/local/include/libpiface-1.0/pfio.h"
......
...@@ -3373,7 +3373,7 @@ GtkWidget *WttGtk::build_submenu( GtkWidget *Parent, int MenuType, ...@@ -3373,7 +3373,7 @@ GtkWidget *WttGtk::build_submenu( GtkWidget *Parent, int MenuType,
// Pushbutton // Pushbutton
W = gtk_menu_item_new_with_label( Items[*idx].Name); W = gtk_menu_item_new_with_label( Items[*idx].Name);
gtk_widget_set_sensitive( W, Items[*idx].Flags.f.Sensitive ? TRUE : FALSE); gtk_widget_set_sensitive( W, Items[*idx].Flags.f.Sensitive ? TRUE : FALSE);
g_object_set_data( (GObject *)W, "userdata", (gpointer)*idx); g_object_set_data( (GObject *)W, "userdata", (gpointer)((long int)*idx));
if ( Callback) if ( Callback)
g_signal_connect( W, "activate", g_signal_connect( W, "activate",
G_CALLBACK(Callback), CallbackData); G_CALLBACK(Callback), CallbackData);
......
...@@ -3820,7 +3820,7 @@ int utl_set_object_parameter ( ...@@ -3820,7 +3820,7 @@ int utl_set_object_parameter (
sts = trv_get_objects_hier_class_name( ldhses, hierobjdid, classp, name, sts = trv_get_objects_hier_class_name( ldhses, hierobjdid, classp, name,
(trv_tBcFunc) utl_set_parameter, ldhses, parameter, valuestr, (trv_tBcFunc) utl_set_parameter, ldhses, parameter, valuestr,
(void *)element, utlctx); (void *)((long int)element), utlctx);
if ( sts != FOE__ABORTSEARCH) if ( sts != FOE__ABORTSEARCH)
if (EVEN(sts)) return sts; if (EVEN(sts)) return sts;
...@@ -4541,13 +4541,14 @@ pwr_tStatus utl_show_class_classhier ( ...@@ -4541,13 +4541,14 @@ pwr_tStatus utl_show_class_classhier (
if ( contents || all ) if ( contents || all )
{ {
sts = trv_get_class_hier( ldhses, hierobjdid, name, classclass_ptr, sts = trv_get_class_hier( ldhses, hierobjdid, name, classclass_ptr,
(trv_tBcFunc) utl_print_aref, ldhses, utlctx, (void *)contents, 0, 0); (trv_tBcFunc) utl_print_aref, ldhses, utlctx,
(void *)((long int)contents), 0, 0);
if ( EVEN (sts)) return sts; if ( EVEN (sts)) return sts;
} }
else else
{ {
sts = trv_get_class_hier( ldhses, hierobjdid, name, classclass_ptr, sts = trv_get_class_hier( ldhses, hierobjdid, name, classclass_ptr,
(trv_tBcFunc) utl_print_class, ldhses, utlctx, (void *)full, 0, 0); (trv_tBcFunc) utl_print_class, ldhses, utlctx, (void *)((long int)full), 0, 0);
if ( EVEN (sts)) return sts; if ( EVEN (sts)) return sts;
} }
......
...@@ -467,7 +467,7 @@ GtkWidget *XNavGtk::build_menu( GtkWidget *Parent, ...@@ -467,7 +467,7 @@ GtkWidget *XNavGtk::build_menu( GtkWidget *Parent,
// Pushbutton // Pushbutton
W = gtk_menu_item_new_with_label( CoWowGtk::translate_utf8(Items[*idx].Name)); W = gtk_menu_item_new_with_label( CoWowGtk::translate_utf8(Items[*idx].Name));
gtk_widget_set_sensitive( W, Items[*idx].Flags.f.Sensitive ? TRUE : FALSE); gtk_widget_set_sensitive( W, Items[*idx].Flags.f.Sensitive ? TRUE : FALSE);
g_object_set_data( (GObject *)W, "userdata", (gpointer)*idx); g_object_set_data( (GObject *)W, "userdata", (gpointer)((long int)*idx));
if ( Callback) if ( Callback)
g_signal_connect( W, "activate", g_signal_connect( W, "activate",
G_CALLBACK(Callback), CallbackData); G_CALLBACK(Callback), CallbackData);
......
...@@ -61,7 +61,7 @@ class XttCameraControl { ...@@ -61,7 +61,7 @@ class XttCameraControl {
public: public:
pwr_tURL url; pwr_tURL url;
XttCameraControl( char *x_url) {} XttCameraControl( char *x_url) {}
~XttCameraControl() {} virtual ~XttCameraControl() {}
virtual void zoom_relative( double factor) {} virtual void zoom_relative( double factor) {}
virtual void zoom_absolute( double factor) {} virtual void zoom_absolute( double factor) {}
virtual void pan_relative( double value) {} virtual void pan_relative( double value) {}
......
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