X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=blobdiff_plain;f=src%2Fhardware%2Fgmc-mh-1x-2x%2Fapi.c;h=efb9e009c71b4d25f0b3a2fa66a12ca38f443e8e;hp=4574dfea72d7d8f79d3db665713b82e2ebd4aa2f;hb=a93086528e5b476812e42b423f7a8a53812af6f4;hpb=5827f61b641cfd326a9cf2ea534eb4f9481a8187

diff --git a/src/hardware/gmc-mh-1x-2x/api.c b/src/hardware/gmc-mh-1x-2x/api.c
index 4574dfea..efb9e009 100644
--- a/src/hardware/gmc-mh-1x-2x/api.c
+++ b/src/hardware/gmc-mh-1x-2x/api.c
@@ -58,7 +58,6 @@ static const uint32_t devopts_bd[] = {
 	SR_CONF_POWER_OFF | SR_CONF_GET | SR_CONF_SET,
 };
 
-
 /* TODO:
  * - For the 29S SR_CONF_ENERGYMETER, too.
  * - SR_CONF_PATTERN_MODE for some 2x devices
@@ -66,16 +65,9 @@ static const uint32_t devopts_bd[] = {
  * Need to implement device-specific lists.
  */
 
-/** Init driver gmc_mh_1x_2x_rs232. */
-static int init_1x_2x_rs232(struct sr_context *sr_ctx)
-{
-	return std_init(sr_ctx, &gmc_mh_1x_2x_rs232_driver_info, LOG_PREFIX);
-}
-
-/** Init driver gmc_mh_2x_bd232. */
-static int init_2x_bd232(struct sr_context *sr_ctx)
+static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
-	return std_init(sr_ctx, &gmc_mh_2x_bd232_driver_info, LOG_PREFIX);
+	return std_init(sr_ctx, di, LOG_PREFIX);
 }
 
 /**
@@ -90,7 +82,7 @@ static int read_byte(struct sr_serial_dev_inst *serial, gint64 timeout)
 	int rc = 0;
 
 	for (;;) {
-		rc = serial_read(serial, &result, 1);
+		rc = serial_read_nonblocking(serial, &result, 1);
 		if (rc == 1) {
 			sr_spew("read: 0x%02x/%d", result, result);
 			return result;
@@ -116,7 +108,7 @@ static enum model scan_model_sm(struct sr_serial_dev_inst *serial)
 	gint64 timeout_us;
 
 	model = METRAHIT_NONE;
-	timeout_us = g_get_monotonic_time() + 1 * 1000 * 1000;
+	timeout_us = g_get_monotonic_time() + (1 * 1000 * 1000);
 
 	/*
 	 * Try to find message consisting of device code and several
@@ -156,13 +148,12 @@ static enum model scan_model_sm(struct sr_serial_dev_inst *serial)
  * on configuration and measurement mode the intervals can be much larger and
  * then the detection might not work.
  */
-static GSList *scan_1x_2x_rs232(GSList *options)
+static GSList *scan_1x_2x_rs232(struct sr_dev_driver *di, GSList *options)
 {
 	struct sr_dev_inst *sdi;
 	struct drv_context *drvc;
 	struct dev_context *devc;
 	struct sr_config *src;
-	struct sr_channel *ch;
 	struct sr_serial_dev_inst *serial;
 	GSList *l, *devices;
 	const char *conn, *serialcomm;
@@ -170,7 +161,7 @@ static GSList *scan_1x_2x_rs232(GSList *options)
 	gboolean serialcomm_given;
 
 	devices = NULL;
-	drvc = (&gmc_mh_1x_2x_rs232_driver_info)->priv;
+	drvc = di->priv;
 	drvc->instances = NULL;
 	conn = serialcomm = NULL;
 	model = METRAHIT_NONE;
@@ -195,10 +186,9 @@ static GSList *scan_1x_2x_rs232(GSList *options)
 	if (!serialcomm)
 		serialcomm = SERIALCOMM_2X_RS232;
 
-	if (!(serial = sr_serial_dev_inst_new(conn, serialcomm)))
-		return NULL;
+	serial = sr_serial_dev_inst_new(conn, serialcomm);
 
-	if (serial_open(serial, SERIAL_RDWR | SERIAL_NONBLOCK) != SR_OK) {
+	if (serial_open(serial, SERIAL_RDWR) != SR_OK) {
 		sr_serial_dev_inst_free(serial);
 		return NULL;
 	}
@@ -223,26 +213,21 @@ static GSList *scan_1x_2x_rs232(GSList *options)
 
 	if (model != METRAHIT_NONE) {
 		sr_spew("%s %s detected!", VENDOR_GMC, gmc_model_str(model));
-		if (!(sdi = sr_dev_inst_new(0, SR_ST_INACTIVE, VENDOR_GMC,
-				gmc_model_str(model), NULL)))
-			return NULL;
-		if (!(devc = g_try_malloc0(sizeof(struct dev_context)))) {
-			sr_err("Device context malloc failed.");
-			return NULL;
-		}
+		sdi = g_malloc0(sizeof(struct sr_dev_inst));
+		sdi->status = SR_ST_INACTIVE;
+		sdi->vendor = g_strdup(VENDOR_GMC);
+		sdi->model = g_strdup(gmc_model_str(model));
+		devc = g_malloc0(sizeof(struct dev_context));
 		devc->model = model;
 		devc->limit_samples = 0;
 		devc->limit_msec = 0;
 		devc->num_samples = 0;
 		devc->elapsed_msec = g_timer_new();
 		devc->settings_ok = FALSE;
-
 		sdi->conn = serial;
 		sdi->priv = devc;
-		sdi->driver = &gmc_mh_1x_2x_rs232_driver_info;
-		if (!(ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "P1")))
-			return NULL;
-		sdi->channels = g_slist_append(sdi->channels, ch);
+		sdi->driver = di;
+		sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "P1");
 		drvc->instances = g_slist_append(drvc->instances, sdi);
 		devices = g_slist_append(devices, sdi);
 	}
@@ -250,16 +235,16 @@ static GSList *scan_1x_2x_rs232(GSList *options)
 	return devices;
 }
 
-/** Scan for Metrahit 2x in a bidirectional mode using Gossen Metrawatt 'BD 232' interface.
- *
+/**
+ * Scan for Metrahit 2x in a bidirectional mode using Gossen Metrawatt
+ * 'BD 232' interface.
  */
-static GSList *scan_2x_bd232(GSList *options)
+static GSList *scan_2x_bd232(struct sr_dev_driver *di, GSList *options)
 {
 	struct sr_dev_inst *sdi;
 	struct drv_context *drvc;
 	struct dev_context *devc;
 	struct sr_config *src;
-	struct sr_channel *ch;
 	struct sr_serial_dev_inst *serial;
 	GSList *l, *devices;
 	const char *conn, *serialcomm;
@@ -271,7 +256,7 @@ static GSList *scan_2x_bd232(GSList *options)
 	conn = serialcomm = NULL;
 	devices = NULL;
 
-	drvc = (&gmc_mh_2x_bd232_driver_info)->priv;
+	drvc = di->priv;
 	drvc->instances = NULL;
 
 	sr_spew("scan_2x_bd232() called!");
@@ -292,20 +277,16 @@ static GSList *scan_2x_bd232(GSList *options)
 	if (!serialcomm)
 		serialcomm = SERIALCOMM_2X;
 
-	if (!(serial = sr_serial_dev_inst_new(conn, serialcomm)))
-		return NULL;
+	serial = sr_serial_dev_inst_new(conn, serialcomm);
 
-	if (serial_open(serial, SERIAL_RDWR | SERIAL_NONBLOCK) != SR_OK)
+	if (serial_open(serial, SERIAL_RDWR) != SR_OK)
 		goto exit_err;
 
-	if (!(devc = g_try_malloc0(sizeof(struct dev_context)))) {
-		sr_err("Device context malloc failed.");
-		goto exit_err;
-	}
-
-	if (!(sdi = sr_dev_inst_new(0, SR_ST_INACTIVE, VENDOR_GMC, NULL, NULL)))
-		goto exit_err;
+	devc = g_malloc0(sizeof(struct dev_context));
 
+	sdi = g_malloc0(sizeof(struct sr_dev_inst));
+	sdi->status = SR_ST_INACTIVE;
+	sdi->vendor = g_strdup(VENDOR_GMC);
 	sdi->priv = devc;
 
 	/* Send message 03 "Query multimeter version and status" */
@@ -315,18 +296,18 @@ static GSList *scan_2x_bd232(GSList *options)
 		goto exit_err;
 
 	/* Wait for reply from device(s) for up to 2s. */
-	timeout_us = g_get_monotonic_time() + 2*1000*1000;
+	timeout_us = g_get_monotonic_time() + (2 * 1000 * 1000);
 
 	while (timeout_us > g_get_monotonic_time()) {
 		/* Receive reply (14 bytes) */
 		devc->buflen = 0;
-		for (cnt = 0; cnt < 14; cnt++) {
+		for (cnt = 0; cnt < GMC_REPLY_SIZE; cnt++) {
 			byte = read_byte(serial, timeout_us);
 			if (byte != -1)
 				devc->buf[devc->buflen++] = (byte & MASK_6BITS);
 		}
 
-		if (devc->buflen != 14)
+		if (devc->buflen != GMC_REPLY_SIZE)
 			continue;
 
 		devc->addr = devc->buf[0];
@@ -335,27 +316,19 @@ static GSList *scan_2x_bd232(GSList *options)
 
 		if (devc->model != METRAHIT_NONE) {
 			sr_spew("%s %s detected!", VENDOR_GMC, gmc_model_str(devc->model));
-
 			devc->elapsed_msec = g_timer_new();
-
 			sdi->model = g_strdup(gmc_model_str(devc->model));
 			sdi->version = g_strdup_printf("Firmware %d.%d", devc->fw_ver_maj, devc->fw_ver_min);
 			sdi->conn = serial;
 			sdi->priv = devc;
-			sdi->driver = &gmc_mh_2x_bd232_driver_info;
-			if (!(ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "P1")))
-				goto exit_err;
-			sdi->channels = g_slist_append(sdi->channels, ch);
+			sdi->driver = di;
+			sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "P1");
 			drvc->instances = g_slist_append(drvc->instances, sdi);
 			devices = g_slist_append(devices, sdi);
-
-			if (!(devc = g_try_malloc0(sizeof(struct dev_context)))) {
-				sr_err("Device context malloc failed.");
-				goto exit_err;
-			}
-
-			if (!(sdi = sr_dev_inst_new(0, SR_ST_INACTIVE, VENDOR_GMC, NULL, NULL)))
-				goto exit_err;
+			devc = g_malloc0(sizeof(struct dev_context));
+			sdi = g_malloc0(sizeof(struct sr_dev_inst));
+			sdi->status = SR_ST_INACTIVE;
+			sdi->vendor = g_strdup(VENDOR_GMC);
 		}
 	};
 
@@ -372,25 +345,16 @@ exit_err:
 
 	if (serial)
 		sr_serial_dev_inst_free(serial);
-	if (devc)
-		g_free(devc);
+	g_free(devc);
 	if (sdi)
 		sr_dev_inst_free(sdi);
 
 	return NULL;
 }
 
-/** Driver device list function */
-static GSList *dev_list_1x_2x_rs232(void)
-{
-	return ((struct drv_context *)(gmc_mh_1x_2x_rs232_driver_info.priv))->instances;
-}
-
-/** Driver device list function */
-static GSList *dev_list_2x_bd232(void)
+static GSList *dev_list(const struct sr_dev_driver *di)
 {
-	return ((struct drv_context *)(gmc_mh_2x_bd232_driver_info.priv))
-			->instances;
+	return ((struct drv_context *)(di->priv))->instances;
 }
 
 static int dev_close(struct sr_dev_inst *sdi)
@@ -411,17 +375,11 @@ static int dev_close(struct sr_dev_inst *sdi)
 	return SR_OK;
 }
 
-static int cleanup_sm_rs232(void)
+static int cleanup(const struct sr_dev_driver *di)
 {
-	return std_dev_clear(&gmc_mh_1x_2x_rs232_driver_info, NULL);
+	return std_dev_clear(di, NULL);
 }
 
-static int cleanup_2x_bd232(void)
-{
-	return std_dev_clear(&gmc_mh_2x_bd232_driver_info, NULL);
-}
-
-/** Get value of configuration item */
 static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,
 		const struct sr_channel_group *cg)
 {
@@ -430,8 +388,6 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s
 
 	(void)cg;
 
-	ret = SR_OK;
-
 	if (!sdi || !(devc = sdi->priv))
 		return SR_ERR_ARG;
 
@@ -453,7 +409,7 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s
 	return ret;
 }
 
-/** Implementation of config_list, auxiliary function for common parts, */
+/** Implementation of config_list, auxiliary function for common parts. */
 static int config_list_common(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,
 		const struct sr_channel_group *cg)
 {
@@ -583,10 +539,10 @@ SR_PRIV 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",
 	.api_version = 1,
-	.init = init_1x_2x_rs232,
-	.cleanup = cleanup_sm_rs232,
+	.init = init,
+	.cleanup = cleanup,
 	.scan = scan_1x_2x_rs232,
-	.dev_list = dev_list_1x_2x_rs232,
+	.dev_list = dev_list,
 	.dev_clear = NULL,
 	.config_get = config_get,
 	.config_set = config_set,
@@ -602,10 +558,10 @@ SR_PRIV struct sr_dev_driver gmc_mh_2x_bd232_driver_info = {
 	.name = "gmc-mh-2x-bd232",
 	.longname = "Gossen Metrawatt Metrahit 2x, BD232/SI232-II interface",
 	.api_version = 1,
-	.init = init_2x_bd232,
-	.cleanup = cleanup_2x_bd232,
+	.init = init,
+	.cleanup = cleanup,
 	.scan = scan_2x_bd232,
-	.dev_list = dev_list_2x_bd232,
+	.dev_list = dev_list,
 	.dev_clear = NULL,
 	.config_get = config_get,
 	.config_set = config_set,