Profinet interface to Softing userspace stack

profibus/exe/profinet_viewer/src/pn_viewer_pnac.cpp

@@ -67,7 +67,7 @@ PnViewerPNAC::PnViewerPNAC( pwr_tStatus *sts, const char *dev_name)
 
   local = new io_sAgentLocal;
   pnak_init();
-  *sts = pnak_start_profistack(0, PNAK_CONTROLLER_MODE);
+  *sts = pnak_start_profistack(0, PNAK_SUPERVISOR_MODE);
 
   if (*sts != PNAK_OK) {
     printf("Starting profistack returned with error code\n");

profibus/lib/pnak_dummy/src/os_linux/pnak_dummy_functions.c

 /* 
- * Copyright (C) 2010 SSAB Oxelsund AB.
+ * Copyright (C) 2005-2015 SSAB EMEA AB.
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License as 
@@ -60,9 +60,9 @@ T_PNAK_RESULT    pnak_get_alarm_ack_ind                    (unsigned short a1, T
 
 /*--- Data interface functions ----------------------------------------------*/
 
-T_PNAK_RESULT    pnak_set_iocr_data                        (unsigned short a1, unsigned short a2, const unsigned char* a3, unsigned short a4) {return PNAK_OK;}
+T_PNAK_RESULT    pnak_set_iocr_data                        (unsigned short a1, unsigned short a2, const unsigned char* a3, unsigned short a4, unsigned char a5) {return PNAK_OK;}
 
-T_PNAK_RESULT    pnak_get_iocr_data                        (unsigned short a1, unsigned short a2, unsigned char* a3, unsigned short* a4, unsigned char* a5) {return PNAK_OK;}
+T_PNAK_RESULT    pnak_get_iocr_data                        (unsigned short a1, unsigned short a2, unsigned char* a3, unsigned short* a4, unsigned char* a5, unsigned char *a6) {return PNAK_OK;}
 T_PNAK_RESULT    pnak_get_consumer_data_changed_ind        (unsigned short a1, T_PNAK_DATA_CONSUMER_DATA_CHANGED* a2) {return PNAK_OK;}
 T_PNAK_RESULT    pnak_get_provider_data_updated            (unsigned short a1, T_PNAK_DATA_PROVIDER_DATA_UPDATED* a2) {return PNAK_OK;}
 

profibus/lib/rt/src/os_linux/rt_io_pnak_locals.h

@@ -191,6 +191,9 @@ class io_sAgentLocal {
 
   pthread_t handle_events;
   agent_args args;
+  
+  pthread_mutex_t  mutex;
+  pthread_cond_t   cond;
 
 };
 

src/tools/pwre/src/os_linux/pwre_configure.sh

@@ -462,7 +462,7 @@ else
   pwre_config_check_lib libhdf5   LIBHDF5  lib lib 0 "/usr/lib/libhdf5.so:/usr/lib/$hwpl-linux-$gnu/libhdf5.so"
   pwre_config_check_lib mq        MQ       lib mq  1 "/usr/lib/libdmq.so:/usr/local/dmq/lib/libdmq.so"
   pwre_config_check_lib wmq       WMQ      lib wmq 1 "/usr/lib/libmqic.so"
-  pwre_config_check_lib libpnioif PNAK     lib pnak 1 "/usr/lib/libpnioif.a:/usr/local/lib/libpnioif.a"
+  pwre_config_check_lib libprofinet PNAK     lib pnak 1 "/usr/lib/libprofinet.a"
   pwre_config_check_lib libusb    LIBUSB   lib libusb 1 "/usr/lib/libusb-1.0.so:/usr/lib/$hwpl-linux-$gnu/libusb-1.0.so"
   pwre_config_check_lib powerlink POWERLINK lib powerlink 1 "$epl/build/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"

wb/lib/wb/src/wb_lfu.cpp

@@ -2146,7 +2146,7 @@ pwr_tStatus lfu_SaveDirectoryVolume(
 	      sprintf( &str[strlen(str)], "-lpwr_rt ");
 	      
 	      if ( bop->SystemModules & pwr_mBuildOptionsMask_SoftingPNAK)
-		sprintf( &str[strlen(str)], "-lpnioif ");
+		sprintf( &str[strlen(str)], "-lprofinet ");
 	      else
 		sprintf( &str[strlen(str)], "-lpwr_pnak_dummy ");