Needed to avoid name collsion in upcomming Nuttx logger changes (#4830)

src/modules/systemlib/mixer/mixer.h

@@ -427,7 +427,7 @@ public:
 protected:
 
 private:
-	mixer_simple_s			*_info;
+	mixer_simple_s			*_pinfo;
 
 	static int			parse_output_scaler(const char *buf, unsigned &buflen, mixer_scaler_s &scaler);
 	static int			parse_control_scaler(const char *buf,

src/modules/systemlib/mixer/mixer_simple.cpp

@@ -61,14 +61,14 @@ SimpleMixer::SimpleMixer(ControlCallback control_cb,
 			 uintptr_t cb_handle,
 			 mixer_simple_s *mixinfo) :
 	Mixer(control_cb, cb_handle),
-	_info(mixinfo)
+	_pinfo(mixinfo)
 {
 }
 
 SimpleMixer::~SimpleMixer()
 {
-	if (_info != nullptr) {
-		free(_info);
+	if (_pinfo != nullptr) {
+		free(_pinfo);
 	}
 }
 
@@ -279,7 +279,7 @@ SimpleMixer::mix(float *outputs, unsigned space, uint16_t *status_reg)
 {
 	float		sum = 0.0f;
 
-	if (_info == nullptr) {
+	if (_pinfo == nullptr) {
 		return 0;
 	}
 
@@ -287,26 +287,26 @@ SimpleMixer::mix(float *outputs, unsigned space, uint16_t *status_reg)
 		return 0;
 	}
 
-	for (unsigned i = 0; i < _info->control_count; i++) {
+	for (unsigned i = 0; i < _pinfo->control_count; i++) {
 		float input;
 
 		_control_cb(_cb_handle,
-			    _info->controls[i].control_group,
-			    _info->controls[i].control_index,
+			    _pinfo->controls[i].control_group,
+			    _pinfo->controls[i].control_index,
 			    input);
 
-		sum += scale(_info->controls[i].scaler, input);
+		sum += scale(_pinfo->controls[i].scaler, input);
 	}
 
-	*outputs = scale(_info->output_scaler, sum);
+	*outputs = scale(_pinfo->output_scaler, sum);
 	return 1;
 }
 
 void
 SimpleMixer::groups_required(uint32_t &groups)
 {
-	for (unsigned i = 0; i < _info->control_count; i++) {
-		groups |= 1 << _info->controls[i].control_group;
+	for (unsigned i = 0; i < _pinfo->control_count; i++) {
+		groups |= 1 << _pinfo->controls[i].control_group;
 	}
 }
 
@@ -318,30 +318,30 @@ SimpleMixer::check()
 
 	/* sanity that presumes that a mixer includes a control no more than once */
 	/* max of 32 groups due to groups_required API */
-	if (_info->control_count > 32) {
+	if (_pinfo->control_count > 32) {
 		return -2;
 	}
 
 	/* validate the output scaler */
-	ret = scale_check(_info->output_scaler);
+	ret = scale_check(_pinfo->output_scaler);
 
 	if (ret != 0) {
 		return ret;
 	}
 
 	/* validate input scalers */
-	for (unsigned i = 0; i < _info->control_count; i++) {
+	for (unsigned i = 0; i < _pinfo->control_count; i++) {
 
 		/* verify that we can fetch the control */
 		if (_control_cb(_cb_handle,
-				_info->controls[i].control_group,
-				_info->controls[i].control_index,
+				_pinfo->controls[i].control_group,
+				_pinfo->controls[i].control_index,
 				junk) != 0) {
 			return -3;
 		}
 
 		/* validate the scaler */
-		ret = scale_check(_info->controls[i].scaler);
+		ret = scale_check(_pinfo->controls[i].scaler);
 
 		if (ret != 0) {
 			return (10 * i + ret);