X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fmotech-lps-30x%2Fapi.c;h=de707f2d1ca946085959d8d53a65dd05fc3570dd;hb=d9251a2c9f1ca4380c27240ccca90c9f9ed46d3f;hp=59061530af4b0ffbe3c67d96a63519ae1bdc2ee0;hpb=bee2b0168c087676c1b365861d8c2d4714afa9b9;p=libsigrok.git

diff --git a/src/hardware/motech-lps-30x/api.c b/src/hardware/motech-lps-30x/api.c
index 59061530..de707f2d 100644
--- a/src/hardware/motech-lps-30x/api.c
+++ b/src/hardware/motech-lps-30x/api.c
@@ -18,9 +18,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file
- *  <em>Motech LPS-30x series</em> power supply driver
- *  @internal
+/**
+ * @file
+ *
+ * <em>Motech LPS-30x series</em> power supply driver
+ *
+ * @internal
  */
 
 #include <config.h>
@@ -173,7 +176,7 @@ SR_PRIV int lps_cmd_ok(struct sr_serial_dev_inst *serial, const char *fmt, ...)
 	va_list args;
 	char buf[LINELEN_MAX];
 	char *bufptr;
-	int  buflen;
+	int buflen;
 
 	/* Send command */
 	va_start(args, fmt);
@@ -194,8 +197,9 @@ SR_PRIV int lps_cmd_ok(struct sr_serial_dev_inst *serial, const char *fmt, ...)
 	return SR_ERR;
 }
 
-/** Send command and read reply string.
- *  @param reply Pointer to buffer of size LINELEN_MAX. Will be NUL-terminated.
+/**
+ * Send command and read reply string.
+ * @param reply Pointer to buffer of size LINELEN_MAX. Will be NUL-terminated.
  */
 SR_PRIV int lps_cmd_reply(char *reply, struct sr_serial_dev_inst *serial, const char *fmt, ...)
 {
@@ -203,7 +207,7 @@ SR_PRIV int lps_cmd_reply(char *reply, struct sr_serial_dev_inst *serial, const
 	va_list args;
 	char buf[LINELEN_MAX];
 	char *bufptr;
-	int  buflen;
+	int buflen;
 
 	reply[0] = '\0';
 
@@ -307,9 +311,11 @@ static gint64 calc_timeout_ms(gint64 start_us)
 	return result;
 }
 
-/** Read message into buf until "OK" received.
- *  @retval SR_OK Msg received; buf and buflen contain result, if any except OK.
- *  @retval SR_ERR Error, including timeout.
+/**
+ * Read message into buf until "OK" received.
+ *
+ * @retval SR_OK Msg received; buf and buflen contain result, if any except OK.
+ * @retval SR_ERR Error, including timeout.
 */
 SR_PRIV int lps_read_reply(struct sr_serial_dev_inst *serial, char **buf, int *buflen)
 {
@@ -431,7 +437,7 @@ static GSList *do_scan(lps_modelid modelid, struct sr_dev_driver *drv, GSList *o
 		g_strstrip(buf);
 		verstr = buf + 4;
 	}
-	else  /* Bug in device FW 1.17: Querying version string fails while output is active.
+	else /* Bug in device FW 1.17: Querying version string fails while output is active.
 		Therefore just print an error message, but do not exit with error. */
 		sr_err("Failed to query for hardware version: %s.",
 			sr_strerror(ret));
@@ -725,10 +731,10 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
 	case SR_CONF_DEVICE_OPTIONS:
 		if ((ch_idx == 0) || (ch_idx == 1)) /* CH1, CH2 */
 			*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
-				  devopts_ch12, ARRAY_SIZE(devopts_ch12), sizeof(uint32_t));
+				devopts_ch12, ARRAY_SIZE(devopts_ch12), sizeof(uint32_t));
 		else /* Must be CH3 */
 			*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
-				  devopts_ch3, ARRAY_SIZE(devopts_ch3), sizeof(uint32_t));
+				devopts_ch3, ARRAY_SIZE(devopts_ch3), sizeof(uint32_t));
 		break;
 	case SR_CONF_VOLTAGE_TARGET:
 		g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY);
@@ -780,12 +786,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 	return SR_OK;
 }
 
-static int dev_acquisition_stop(struct sr_dev_inst *sdi)
-{
-	return std_serial_dev_acquisition_stop(sdi, std_serial_dev_close,
-			sdi->conn);
-}
-
 static struct sr_dev_driver motech_lps_301_driver_info = {
 	.name = "motech-lps-301",
 	.longname = "Motech LPS-301",
@@ -801,7 +801,7 @@ static struct sr_dev_driver motech_lps_301_driver_info = {
 	.dev_open = std_serial_dev_open,
 	.dev_close = std_serial_dev_close,
 	.dev_acquisition_start = dev_acquisition_start,
-	.dev_acquisition_stop = dev_acquisition_stop,
+	.dev_acquisition_stop = std_serial_dev_acquisition_stop,
 	.context = NULL,
 };
 SR_REGISTER_DEV_DRIVER(motech_lps_301_driver_info);