mechanical style fixups

apps/systemlib/mixer/mixer.cpp

@@ -116,6 +116,7 @@ NullMixer::mix(float *outputs, unsigned space)
 		*outputs = 0.0f;
 		return 1;
 	}
+
 	return 0;
 }
 
@@ -148,6 +149,7 @@ SimpleMixer::mix(float *outputs, unsigned space)
 
 	if (_info == nullptr)
 		return 0;
+
 	if (space < 1)
 		return 0;
 
@@ -161,6 +163,7 @@ SimpleMixer::mix(float *outputs, unsigned space)
 
 		sum += scale(_info->controls[i].scaler, input);
 	}
+
 	*outputs = scale(_info->output_scaler, sum);
 	return 1;
 }

apps/systemlib/mixer/mixer.h

@@ -131,7 +131,7 @@
 #include "drivers/drv_mixer.h"
 
 /**
- * Abstract class defining a mixer mixing zero or more inputs to 
+ * Abstract class defining a mixer mixing zero or more inputs to
  * one or more outputs.
  */
 class __EXPORT Mixer
@@ -149,10 +149,10 @@ public:
 	 * @param control		The returned control
 	 * @return			Zero if the value was fetched, nonzero otherwise.
 	 */
-	typedef int			(* ControlCallback)(uintptr_t handle,
-							    uint8_t control_group,
-							    uint8_t control_index,
-							    float &control);
+	typedef int	(* ControlCallback)(uintptr_t handle,
+					    uint8_t control_group,
+					    uint8_t control_index,
+					    float &control);
 
 	/**
 	 * Constructor.
@@ -237,8 +237,8 @@ public:
 	 *
 	 * Z:
 	 *
-	 * This mixer generates a constant zero output, and is normally used to 
-	 * skip over outputs that are not in use. 
+	 * This mixer generates a constant zero output, and is normally used to
+	 * skip over outputs that are not in use.
 	 *
 	 * Simple Mixer:
 	 *
@@ -336,8 +336,7 @@ private:
 class __EXPORT MultirotorMixer : public Mixer
 {
 public:
-	enum Geometry
-	{
+	enum Geometry {
 		MULTIROTOR_QUAD_PLUS,
 		MULTIROTOR_QUAD_X
 		/* XXX add more here */

apps/systemlib/mixer/mixer_group.cpp

@@ -171,10 +171,12 @@ mixer_load_simple(Mixer::ControlCallback control_cb, uintptr_t cb_handle, int fd
 
 	/* first, get the output scaler */
 	ret = mixer_getline(fd, buf, sizeof(buf));
+
 	if (ret < 1) {
 		debug("failed reading for output scaler");
 		goto fail;
 	}
+
 	if (mixer_parse_output_scaler(buf, mixinfo->output_scaler)) {
 		debug("failed parsing output scaler");
 		goto fail;
@@ -183,17 +185,20 @@ mixer_load_simple(Mixer::ControlCallback control_cb, uintptr_t cb_handle, int fd
 	/* now get any inputs */
 	for (unsigned i = 0; i < inputs; i++) {
 		ret = mixer_getline(fd, buf, sizeof(buf));
+
 		if (ret < 1) {
 			debug("failed reading for control scaler");
 			goto fail;
 		}
-		if (mixer_parse_control_scaler(buf, 
-				       mixinfo->controls[i].scaler,
-				       mixinfo->controls[i].control_group,
-				       mixinfo->controls[i].control_index)) {
+
+		if (mixer_parse_control_scaler(buf,
+					       mixinfo->controls[i].scaler,
+					       mixinfo->controls[i].control_group,
+					       mixinfo->controls[i].control_index)) {
 			debug("failed parsing control scaler");
 			goto fail;
 		}
+
 		debug("got control %d", i);
 	}
 
@@ -266,8 +271,10 @@ MixerGroup::add_mixer(Mixer *mixer)
 	Mixer **mpp;
 
 	mpp = &_first;
+
 	while (*mpp != nullptr)
 		mpp = &((*mpp)->_next);
+
 	*mpp = mixer;
 	mixer->_next = nullptr;
 }
@@ -282,6 +289,7 @@ MixerGroup::mix(float *outputs, unsigned space)
 		index += mixer->mix(outputs + index, space - index);
 		mixer = mixer->_next;
 	}
+
 	return index;
 }
 
@@ -303,6 +311,7 @@ MixerGroup::load_from_file(const char *path)
 		return -1;
 
 	int fd = open(path, O_RDONLY);
+
 	if (fd < 0) {
 		debug("failed to open %s", path);
 		return -1;