X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fmaynuo-m97%2Fapi.c;h=3ded72e9f49acabacc825dcff98bbb024dc2c9d3;hb=6ad2fbaad2722f0aa18c3600cdbdddf812784b2d;hp=84e90b5e7bcd7e7d0e4fa4d06a18bae52e7c649a;hpb=dd5c48a6d567a3cac62c4b0058588273bbeea171;p=libsigrok.git

diff --git a/src/hardware/maynuo-m97/api.c b/src/hardware/maynuo-m97/api.c
index 84e90b5e..3ded72e9 100644
--- a/src/hardware/maynuo-m97/api.c
+++ b/src/hardware/maynuo-m97/api.c
@@ -53,9 +53,11 @@ static const uint32_t devopts_cg[] = {
 	SR_CONF_OVER_TEMPERATURE_PROTECTION_ACTIVE | SR_CONF_GET,
 };
 
-/* The IDs in this list are only guessed and needs to be verified
-   against some real hardware. If at least a few of them matches,
-   it will probably be safe to enable the others. */
+/*
+ * The IDs in this list are only guessed and needs to be verified
+ * against some real hardware. If at least a few of them matches,
+ * it will probably be safe to enable the others.
+ */
 static const struct maynuo_m97_model supported_models[] = {
 //	{  53, "M9711"     ,   30, 150,    150 },
 //	{  54, "M9712"     ,   30, 150,    300 },
@@ -170,12 +172,12 @@ static int config_compare(gconstpointer a, gconstpointer b)
 static GSList *scan(struct sr_dev_driver *di, GSList *options)
 {
 	struct sr_config default_serialcomm = {
-	    .key = SR_CONF_SERIALCOMM,
-	    .data = g_variant_new_string("9600/8n1"),
+		.key = SR_CONF_SERIALCOMM,
+		.data = g_variant_new_string("9600/8n1"),
 	};
 	struct sr_config default_modbusaddr = {
-	    .key = SR_CONF_MODBUSADDR,
-	    .data = g_variant_new_uint64(1),
+		.key = SR_CONF_MODBUSADDR,
+		.data = g_variant_new_uint64(1),
 	};
 	GSList *opts = options, *devices;
 
@@ -224,8 +226,7 @@ static int dev_close(struct sr_dev_inst *sdi)
 			/* Wait for the last data that was requested from the device. */
 			uint16_t registers[devc->expecting_registers];
 			sr_modbus_read_holding_registers(modbus, -1,
-			                                 devc->expecting_registers,
-			                                 registers);
+				devc->expecting_registers, registers);
 		}
 
 		maynuo_m97_set_bit(modbus, PC1, 0);
@@ -445,7 +446,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 		return ret;
 
 	sr_sw_limits_acquisition_start(&devc->limits);
-	std_session_send_df_header(sdi, LOG_PREFIX);
+	std_session_send_df_header(sdi);
 
 	return maynuo_m97_capture_start(sdi);
 }
@@ -457,7 +458,7 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi)
 	if (sdi->status != SR_ST_ACTIVE)
 		return SR_ERR_DEV_CLOSED;
 
-	std_session_send_df_end(sdi, LOG_PREFIX);
+	std_session_send_df_end(sdi);
 
 	modbus = sdi->conn;
 	sr_modbus_source_remove(sdi->session, modbus);