(ModbusMaster): небольшие стилистические правки

extensions/ModbusMaster/MBExchange.cc

@@ -2965,7 +2965,7 @@ bool MBExchange::poll()
 		dlog3 << myname << "(poll): ask addr=" << ModbusRTU::addr2str(d->mbaddr)
 			  << " regs=" << d->regmap.size() << endl;
 
-		unsigned int prev_numreply = d->numreply.load();
+		d->prev_numreply.store(d->numreply);
 
 		for( auto it = d->regmap.begin(); it != d->regmap.end(); ++it )
 		{
@@ -2980,7 +2980,10 @@ bool MBExchange::poll()
 				if( d->dtype == MBExchange::dtRTU || d->dtype == MBExchange::dtMTR )
 				{
 					if( pollRTU(d, it) )
+					{
 						d->numreply++;
+						allNotRespond = false;
+					}
 				}
 			}
 			catch( ModbusRTU::mbException& ex )
@@ -2995,9 +2998,6 @@ bool MBExchange::poll()
 					break;
 			}
 
-			if( d->numreply != prev_numreply )
-				allNotRespond = false;
-
 			if( it == d->regmap.end() )
 				break;
 
@@ -3050,11 +3050,8 @@ bool MBExchange::poll()
 bool MBExchange::RTUDevice::checkRespond()
 {
 	bool prev = resp_state;
-
 	resp_state = !resp_Delay.check( prev_numreply == numreply );
 
-	prev_numreply.store(numreply);
-
 	dlog4 << "(checkRespond): addr=" << ModbusRTU::addr2str(mbaddr)
 		  << " respond_id=" << resp_id
 		  << " state=" << resp_state
@@ -3064,6 +3061,7 @@ bool MBExchange::RTUDevice::checkRespond()
 		  << " prev_numreply=" << prev_numreply
 		  << " ]"
 		  << endl;
+
 	return (prev != resp_state);
 }
 // -----------------------------------------------------------------------------

extensions/ModbusMaster/RTUExchange.cc

@@ -212,7 +212,7 @@ bool RTUExchange::poll()
 			mbrtu->setSpeed(d->speed);
 		}
 
-		unsigned int prev_numreply = d->numreply;
+		d->prev_numreply.store(d->numreply);
 
 		if( d->dtype == MBExchange::dtRTU188 )
 		{
@@ -230,6 +230,7 @@ bool RTUExchange::poll()
 
 				d->rtu->poll(mbrtu);
 				d->numreply++;
+				allNotRespond = false;
 			}
 			catch( ModbusRTU::mbException& ex )
 			{
@@ -255,7 +256,10 @@ bool RTUExchange::poll()
 							mb->cleanupChannel();
 
 						if( pollRTU(d, it) )
+						{
 							d->numreply++;
+							allNotRespond = false;
+						}
 					}
 				}
 				catch( ModbusRTU::mbException& ex )
@@ -274,9 +278,6 @@ bool RTUExchange::poll()
 					return false;
 			}
 		}
-
-		if( d->numreply != prev_numreply )
-			allNotRespond = false;
 	}
 
 	// update SharedMemory...