X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fhardware%2Fhameg-hmo%2Fprotocol.c;h=ffd682bf5a7f3158a2ea0c640bcc875a778cec68;hb=a53acd7d46e4d5ea5bf760e9e5c64ff0c3cee878;hp=a073d0de60bea7f71f421cc070b7c2263cbdd802;hpb=f07298663f2f69ab5c4e83d327470a90f92ec079;p=libsigrok.git

diff --git a/src/hardware/hameg-hmo/protocol.c b/src/hardware/hameg-hmo/protocol.c
index a073d0de..ffd682bf 100644
--- a/src/hardware/hameg-hmo/protocol.c
+++ b/src/hardware/hameg-hmo/protocol.c
@@ -87,6 +87,9 @@ static const char *hmo_compact2_trigger_sources[] = {
 	"CH2",
 	"LINE",
 	"EXT",
+	"PATT",
+	"BUS1",
+	"BUS2",
 	"D0",
 	"D1",
 	"D2",
@@ -105,6 +108,9 @@ static const char *hmo_compact4_trigger_sources[] = {
 	"CH4",
 	"LINE",
 	"EXT",
+	"PATT",
+	"BUS1",
+	"BUS2",
 	"D0",
 	"D1",
 	"D2",
@@ -337,14 +343,8 @@ static int scope_state_get_array_option(struct sr_scpi_dev_inst *scpi,
 }
 
 /**
- * This function takes a value of the form "2.000E-03", converts it to a
- * significand / factor pair and returns the index of an array where
- * a matching pair was found.
- *
- * It's a bit convoluted because of floating-point issues. The value "10.00E-09"
- * is parsed by g_ascii_strtod() as 0.000000009999999939, for example.
- * Therefore it's easier to break the number up into two strings and handle
- * them separately.
+ * This function takes a value of the form "2.000E-03" and returns the index
+ * of an array where a matching pair was found.
  *
  * @param value The string to be parsed.
  * @param array The array of s/f pairs.
@@ -356,48 +356,15 @@ static int scope_state_get_array_option(struct sr_scpi_dev_inst *scpi,
 static int array_float_get(gchar *value, const uint64_t array[][2],
 		int array_len, unsigned int *result)
 {
-	int i, e;
-	size_t pos;
-	uint64_t f;
-	float s;
-	unsigned int s_int;
-	gchar ss[10], es[10];
-
-	memset(ss, 0, sizeof(ss));
-	memset(es, 0, sizeof(es));
-
-	/* Get index of the separating 'E' character and break up the string. */
-	pos = strcspn(value, "E");
+	struct sr_rational rval;
+	struct sr_rational aval;
 
-	strncpy(ss, value, pos);
-	strncpy(es, &(value[pos+1]), 3);
-
-	if (sr_atof_ascii(ss, &s) != SR_OK)
-		return SR_ERR;
-	if (sr_atoi(es, &e) != SR_OK)
+	if (sr_parse_rational(value, &rval) != SR_OK)
 		return SR_ERR;
 
-	/* Transform e.g. 10^-03 to 1000 as the array stores the inverse. */
-	f = pow(10, abs(e));
-
-	/*
-	 * Adjust the significand/factor pair to make sure
-	 * that f is a multiple of 1000.
-	 */
-	while ((int)fmod(log10(f), 3) > 0) {
-		s *= 10;
-
-		if (e < 0)
-			f *= 10;
-		else
-			f /= 10;
-	}
-
-	/* Truncate s to circumvent rounding errors. */
-	s_int = (unsigned int)s;
-
-	for (i = 0; i < array_len; i++) {
-		if ((s_int == array[i][0]) && (f == array[i][1])) {
+	for (int i = 0; i < array_len; i++) {
+		sr_rational_set(&aval, array[i][0], array[i][1]);
+		if (sr_rational_eq(&rval, &aval)) {
 			*result = i;
 			return SR_OK;
 		}
@@ -773,7 +740,7 @@ SR_PRIV int hmo_receive_data(int fd, int revents, void *cb_data)
 		analog.mqflags = 0;
 		packet.type = SR_DF_ANALOG_OLD;
 		packet.payload = &analog;
-		sr_session_send(cb_data, &packet);
+		sr_session_send(sdi, &packet);
 		g_slist_free(analog.channels);
 		g_array_free(data, TRUE);
 		data = NULL;
@@ -792,7 +759,7 @@ SR_PRIV int hmo_receive_data(int fd, int revents, void *cb_data)
 		logic.data = data->data;
 		packet.type = SR_DF_LOGIC;
 		packet.payload = &logic;
-		sr_session_send(cb_data, &packet);
+		sr_session_send(sdi, &packet);
 		g_array_free(data, TRUE);
 		data = NULL;
 		break;
@@ -808,7 +775,7 @@ SR_PRIV int hmo_receive_data(int fd, int revents, void *cb_data)
 		devc->current_channel = devc->current_channel->next;
 		hmo_request_data(sdi);
 	} else if (++devc->num_frames == devc->frame_limit) {
-		sdi->driver->dev_acquisition_stop(sdi, cb_data);
+		sdi->driver->dev_acquisition_stop(sdi);
 	} else {
 		devc->current_channel = devc->enabled_channels;
 		hmo_request_data(sdi);