Profinet, some files renamed

build-howto.info

@@ -14,7 +14,7 @@ libdb4.6-dev  (Any Berkeley DB version > 4.3, on Fedora db4-devel)
 libdb4.6++-dev
 libasound2-dev (on Fedora alsa-lib-devel)
 doxygen
-libmysql++dev (optional)
+libmysql++-dev (optional)
 antlr (version 2.7.7)
 jdk
 
@@ -52,7 +52,7 @@ antlr: Download and build source package antlr-2.7.7 from www.antlr.org
        Hints: 
 	- You may have to rename /usr/bin/jikes and /usr/bin/java 	
           temporary during configure.
-        - Include <strings.h> in lib/cpp/antrl/CharScanner.hpp
+        - Include <strings.h> and <stdio.h> in lib/cpp/antlr/CharScanner.hpp
 
 There has to be a valid display when building proview.
 

profibus/exe/profinet_viewer/src/pn_viewer_pnac.cpp

@@ -23,8 +23,8 @@
 
 #include "co_error.h"
 #include "pn_viewer_pnac.h"
-#include "profinet.h"
-#include "pnak.h"
+#include "rt_profinet.h"
+#include "rt_pnak.h"
 #include "sys/socket.h"
 #include "sys/ioctl.h"
 #include "net/if.h"

profibus/lib/cow/src/cow_pn_gsdml_attr.h

@@ -23,7 +23,7 @@
 /* cow_pn_gsdml_attr.h -- Profinet gsdml attribute editor */
 
 #include "cow_pn_gsdml.h"
-#include "cow_pn_gsdml_data.h"
+#include "rt_pn_gsdml_data.h"
 
 typedef struct {
 	void	*value;

profibus/lib/cow/src/cow_pn_gsdml_attrnav.h

@@ -54,8 +54,8 @@ extern "C" {
 #include "cow_pn_gsdml_attr.h"
 #endif
 
-#ifndef cow_pn_gsdml_data_h
-#include "cow_pn_gsdml_data.h"
+#ifndef rt_pn_gsdml_data_h
+#include "rt_pn_gsdml_data.h"
 #endif
 
 typedef enum {

profibus/lib/rt/src/rt_io_m_pncontrollersoftingpnak.cpp

@@ -40,8 +40,8 @@
 #include "rt_io_agent_init.h"
 #include "rt_pb_msg.h"
 
-#include "profinet.h"
-#include "pnak.h"
+#include "rt_profinet.h"
+#include "rt_pnak.h"
 #include "co_dcli.h"
 #include "rt_pn_gsdml_data.h"
 #include "rt_io_pn_locals.h"

profibus/lib/rt/src/rt_io_m_pndevice.cpp

@@ -36,8 +36,8 @@
 #include "rt_errh.h"
 #include "rt_pb_msg.h"
 
-#include "profinet.h"
-#include "pnak.h"
+#include "rt_profinet.h"
+#include "rt_pnak.h"
 #include "co_dcli.h"
 #include "rt_pn_gsdml_data.h"
 #include "rt_io_pn_locals.h"

profibus/lib/rt/src/rt_io_m_pnmodule.cpp

@@ -36,8 +36,8 @@
 #include "rt_errh.h"
 #include "rt_pb_msg.h"
 
-#include "profinet.h"
-#include "pnak.h"
+#include "rt_profinet.h"
+#include "rt_pnak.h"
 #include "co_dcli.h"
 #include "rt_pn_gsdml_data.h"
 #include "rt_io_pn_locals.h"

profibus/lib/rt/src/rt_io_pn_locals.h

@@ -20,8 +20,8 @@
 #ifndef rt_io_pn_locals_h
 #define rt_io_pn_locals_h
 
-#include "profinet.h"
-#include "pnak.h"
+#include "rt_profinet.h"
+#include "rt_pnak.h"
 
 /* rt_io_pn_locals.h -- Profinet io handling locals. */
 

profibus/lib/cow/src/cow_pn_gsdml_data.cpp → profibus/lib/rt/src/rt_pn_gsdml_data.cpp

@@ -30,7 +30,7 @@
 #include "co_dcli.h"
 #include "co_xml_parser.h"
 #include "rt_pb_msg.h"
-#include "cow_pn_gsdml_data.h"
+#include "rt_pn_gsdml_data.h"
 
 typedef enum {
   gsdmldata_eTag_,

profibus/lib/cow/src/cow_pn_gsdml_data.h → profibus/lib/rt/src/rt_pn_gsdml_data.h

@@ -17,8 +17,8 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  **/
 
-#ifndef cow_pn_gsdml_data_h
-#define cow_pn_gsdml_data_h
+#ifndef rt_pn_gsdml_data_h
+#define rt_pn_gsdml_data_h
 
 /* cow_pn_gsdml_data.h -- Profinet configurator data file. */
 

profibus/lib/rt/src/rt_pn_iface.cpp

@@ -36,8 +36,8 @@
 #include "rt_errh.h"
 #include "rt_pb_msg.h"
 
-#include "profinet.h"
-#include "pnak.h"
+#include "rt_profinet.h"
+#include "rt_pnak.h"
 #include "co_dcli.h"
 #include "rt_pn_gsdml_data.h"
 #include "rt_io_base.h"

profibus/lib/rt/src/rt_pn_iface.h

@@ -32,7 +32,7 @@
 #endif
 
 #ifndef rt_io_pn_locals_h
-# include "rt_io_pn_locals_h.h"
+# include "rt_io_pn_locals.h"
 #endif
 
 

src/lib/rt/src/rt_io_supervise.h

@@ -30,7 +30,7 @@
 #include "pwr_class.h"
 #endif
 
-#ifndef PWR_BASECLASSES_H
+#ifndef pwr_baseclasses_h
 #include "pwr_baseclasses.h"
 #endif