Merge branch 'master' of pwrcvs:/data1/git/pwr

profibus/changelog.txt

@@ -52,3 +52,7 @@
 120615 cs  profinet   Profinet configurator, sorting of moduletypes and iodata length settings
 120813 cs  profibus   Profibus configurator in xtt, bugfix in errorhandling for empty gsd-file (refs #112)
 120813 cs  profibus   Profibus device Janitza umg961 added
+120829 rk  profinet   IO offset caclulation bugfix for modules with both in- and output.
+121130 rk  profibus   Handling of large prm data areas. 
+121130 rk  profibus   Moved event handling to separate thread. Not dependant on io-read cycle time. 
+

profibus/lib/rt/src/os_linux/rt_io_m_pncontrollersoftingpnak.cpp

@@ -276,18 +276,18 @@ static pwr_tStatus IoAgentInit (
 	    for (ll = 0; ll < local->device_data[ii]->module_data[kk]->submodule_data.size(); ll++) {
 	      PnSubmoduleData *submodule;
 	      submodule = local->device_data[ii]->module_data[kk]->submodule_data[ll];
-	      if (submodule->type & type) {
-		if ((submodule->type == PROFINET_IO_SUBMODULE_TYPE_INPUT) ||
-		    (submodule->type == PROFINET_IO_SUBMODULE_TYPE_INPUT_AND_OUTPUT)) {
-		  submodule->offset_clean_io_in = offset_inputs;
-		  offset_inputs += submodule->io_in_data_length;
-		}
-		if ((submodule->type == PROFINET_IO_SUBMODULE_TYPE_OUTPUT) ||
-		    (submodule->type == PROFINET_IO_SUBMODULE_TYPE_INPUT_AND_OUTPUT)) {
-		  submodule->offset_clean_io_out = offset_outputs;
-		  offset_outputs += submodule->io_out_data_length;
-		}
-	      }
+              if ((type == PROFINET_IO_CR_TYPE_INPUT) &&
+                  ((submodule->type == PROFINET_IO_SUBMODULE_TYPE_INPUT) ||
+                   (submodule->type == PROFINET_IO_SUBMODULE_TYPE_INPUT_AND_OUTPUT))) {
+                submodule->offset_clean_io_in = offset_inputs;
+                offset_inputs += submodule->io_in_data_length;
+              }
+              else if ((type == PROFINET_IO_CR_TYPE_OUTPUT) &&
+                       ((submodule->type == PROFINET_IO_SUBMODULE_TYPE_OUTPUT) ||
+                        (submodule->type == PROFINET_IO_SUBMODULE_TYPE_INPUT_AND_OUTPUT))) {
+                submodule->offset_clean_io_out = offset_outputs;
+                offset_outputs += submodule->io_out_data_length;
+              }
 	    }
 	  }
 	  local->device_data[ii]->iocr_data[jj]->clean_io_data = (unsigned char *) calloc(1, offset_inputs + offset_outputs);
@@ -296,7 +296,7 @@ static pwr_tStatus IoAgentInit (
       } else {
 	errh_Error( "Download of Profinet Device configuration failed for: %s", device_vect[ii]->device_name);
 	/* Setup a dummy i/o area. Depending on exisiting channels this area needs to exist */
-
+        
 	for (jj = 0; jj <  local->device_data[ii]->iocr_data.size(); jj++) {
 	  local->device_data[ii]->iocr_data[jj]->clean_io_data = (unsigned char *) calloc(1, PROFINET_IO_DATA_MAX_LENGTH);
 	}

src/changelog.txt

@@ -221,3 +221,5 @@
 120823 cs  plc       Plc, serveral processes, handling of error log and process status
 120824 cs  plc       Plc, several plc processes, signal handling with rt_ini at start and restart
 120926 cs  neth      Size check in subscription client message to avoid rt_neth crash at bad network
+121203 rk  elog      Added executable rt_elog_dump that will dump historical event log to text-file.
+

src/exe/rt_elog_dump/src/os_templ/link_rule.mk

+ifndef link_rule_mk
+link_rule_mk := 1
+
+link = $(ld) $(linkflags) $(domap) -o $(export_exe) \
+	$(export_obj) $(objects) $(rt_msg_objs) \
+	$(pwr_obj)/rt_io_user.o \
+	$(pwre_conf_libdir) $(pwre_conf_libpwrrt) $(pwre_conf_lib)	
+
+endif