X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fgmc-mh-1x-2x%2Fapi.c;h=8bac10f14c7cc10e48a9f3cf580512af3646fbf8;hb=f1ba6b4b2c9a8ecf90bb31efb218752aa7e49d1a;hp=6b2508dd76c6f8b5f6f2a304e80ac63501cbfb10;hpb=1b38775baa3016fb4d613c971dce5a4f26cacb7b;p=libsigrok.git

diff --git a/src/hardware/gmc-mh-1x-2x/api.c b/src/hardware/gmc-mh-1x-2x/api.c
index 6b2508dd..8bac10f1 100644
--- a/src/hardware/gmc-mh-1x-2x/api.c
+++ b/src/hardware/gmc-mh-1x-2x/api.c
@@ -17,9 +17,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file
- *  Gossen Metrawatt Metrahit 1x/2x drivers
- *  @internal
+/**
+ * @file
+ *
+ * Gossen Metrawatt Metrahit 1x/2x drivers
+ *
+ * @internal
  */
 
 #include <config.h>
@@ -40,7 +43,7 @@ static const uint32_t scanopts[] = {
 /** Hardware capabilities for Metrahit 1x/2x devices in send mode. */
 static const uint32_t devopts_sm[] = {
 	SR_CONF_MULTIMETER,
-	SR_CONF_THERMOMETER,    /**< All GMC 1x/2x multimeters seem to support this */
+	SR_CONF_THERMOMETER, /**< All GMC 1x/2x multimeters seem to support this */
 	SR_CONF_CONTINUOUS,
 	SR_CONF_LIMIT_SAMPLES | SR_CONF_GET | SR_CONF_SET,
 	SR_CONF_LIMIT_MSEC | SR_CONF_GET | SR_CONF_SET,
@@ -49,7 +52,7 @@ static const uint32_t devopts_sm[] = {
 /** Hardware capabilities for Metrahit 2x devices in bidirectional Mode. */
 static const uint32_t devopts_bd[] = {
 	SR_CONF_MULTIMETER,
-	SR_CONF_THERMOMETER,    /**< All GMC 1x/2x multimeters seem to support this */
+	SR_CONF_THERMOMETER, /**< All GMC 1x/2x multimeters seem to support this */
 	SR_CONF_CONTINUOUS,
 	SR_CONF_LIMIT_SAMPLES | SR_CONF_GET | SR_CONF_SET,
 	SR_CONF_LIMIT_MSEC | SR_CONF_GET | SR_CONF_SET,
@@ -118,7 +121,7 @@ static enum model scan_model_sm(struct sr_serial_dev_inst *serial)
 			for (cnt = 0; cnt < 4; cnt++) {
 				byte = read_byte(serial, timeout_us);
 				if ((byte == -1) ||
-						((byte & MSGID_MASK) != MSGID_DATA))
+					((byte & MSGID_MASK) != MSGID_DATA))
 				{
 					model = METRAHIT_NONE;
 					bytecnt = 100;
@@ -320,11 +323,9 @@ static GSList *scan_2x_bd232(struct sr_dev_driver *di, GSList *options)
 exit_err:
 	sr_info("scan_2x_bd232(): Error!");
 
-	if (serial)
-		sr_serial_dev_inst_free(serial);
+	sr_serial_dev_inst_free(serial);
 	g_free(devc);
-	if (sdi)
-		sr_dev_inst_free(sdi);
+	sr_dev_inst_free(sdi);
 
 	return NULL;
 }
@@ -333,13 +334,11 @@ static int dev_close(struct sr_dev_inst *sdi)
 {
 	struct dev_context *devc;
 
-	std_serial_dev_close(sdi);
+	devc = sdi->priv;
 
-	sdi->status = SR_ST_INACTIVE;
-	if ((devc = sdi->priv))
-		devc->model = METRAHIT_NONE;
+	devc->model = METRAHIT_NONE;
 
-	return SR_OK;
+	return std_serial_dev_close(sdi);
 }
 
 static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,
@@ -426,9 +425,6 @@ static int dev_acquisition_start_1x_2x_rs232(const struct sr_dev_inst *sdi)
 	struct dev_context *devc;
 	struct sr_serial_dev_inst *serial;
 
-	if (sdi->status != SR_ST_ACTIVE)
-		return SR_ERR_DEV_CLOSED;
-
 	devc = sdi->priv;
 	devc->settings_ok = FALSE;
 	devc->buflen = 0;
@@ -449,9 +445,6 @@ static int dev_acquisition_start_2x_bd232(const struct sr_dev_inst *sdi)
 	struct dev_context *devc;
 	struct sr_serial_dev_inst *serial;
 
-	if (sdi->status != SR_ST_ACTIVE)
-		return SR_ERR_DEV_CLOSED;
-
 	devc = sdi->priv;
 	devc->settings_ok = FALSE;
 	devc->buflen = 0;
@@ -468,11 +461,6 @@ static int dev_acquisition_start_2x_bd232(const struct sr_dev_inst *sdi)
 	return req_meas14(sdi);
 }
 
-static int dev_acquisition_stop(struct sr_dev_inst *sdi)
-{
-	return std_serial_dev_acquisition_stop(sdi);
-}
-
 static struct sr_dev_driver gmc_mh_1x_2x_rs232_driver_info = {
 	.name = "gmc-mh-1x-2x-rs232",
 	.longname = "Gossen Metrawatt Metrahit 1x/2x, RS232 interface",
@@ -488,7 +476,7 @@ static struct sr_dev_driver gmc_mh_1x_2x_rs232_driver_info = {
 	.dev_open = std_serial_dev_open,
 	.dev_close = dev_close,
 	.dev_acquisition_start = dev_acquisition_start_1x_2x_rs232,
-	.dev_acquisition_stop = dev_acquisition_stop,
+	.dev_acquisition_stop = std_serial_dev_acquisition_stop,
 	.context = NULL,
 };
 SR_REGISTER_DEV_DRIVER(gmc_mh_1x_2x_rs232_driver_info);
@@ -508,7 +496,7 @@ static struct sr_dev_driver gmc_mh_2x_bd232_driver_info = {
 	.dev_open = std_serial_dev_open,
 	.dev_close = dev_close,
 	.dev_acquisition_start = dev_acquisition_start_2x_bd232,
-	.dev_acquisition_stop = dev_acquisition_stop,
+	.dev_acquisition_stop = std_serial_dev_acquisition_stop,
 	.context = NULL,
 };
 SR_REGISTER_DEV_DRIVER(gmc_mh_2x_bd232_driver_info);