X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Flink-mso19%2Flink-mso19.c;h=efafb0a314a876ca8cf02ce7b2dcb39363c9722a;hb=da0918aae0d43ab25cb72ddf8773831f0364ebdb;hp=3c2be11dc717620493b289673097630465261337;hpb=59df0c77e2906323290544ea62801831818ec096;p=libsigrok.git

diff --git a/hardware/link-mso19/link-mso19.c b/hardware/link-mso19/link-mso19.c
index 3c2be11d..efafb0a3 100644
--- a/hardware/link-mso19/link-mso19.c
+++ b/hardware/link-mso19/link-mso19.c
@@ -47,9 +47,9 @@ static int capabilities[] = {
 };
 
 static uint64_t supported_samplerates[] = {
-	100,
-	200,
-	500,
+	SR_HZ(100),
+	SR_HZ(200),
+	SR_HZ(500),
 	SR_KHZ(1),
 	SR_KHZ(2),
 	SR_KHZ(5),
@@ -71,9 +71,9 @@ static uint64_t supported_samplerates[] = {
 };
 
 static struct sr_samplerates samplerates = {
-	100,
+	SR_HZ(100),
 	SR_MHZ(200),
-	0,
+	SR_HZ(0),
 	supported_samplerates,
 };
 
@@ -86,12 +86,16 @@ static int mso_send_control_message(struct sr_device_instance *sdi,
 	int i, w, ret, s = n * 2 + sizeof(mso_head) + sizeof(mso_foot);
 	char *p, *buf;
 
+	ret = SR_ERR;
+
 	if (fd < 0)
 		goto ret;
 
-	buf = malloc(s);
-	if (!buf)
+	if (!(buf = g_try_malloc(s))) {
+		sr_err("mso19: %s: buf malloc failed", __func__);
+		ret = SR_ERR_MALLOC;
 		goto ret;
+	}
 
 	p = buf;
 	memcpy(p, mso_head, sizeof(mso_head));
@@ -114,7 +118,7 @@ static int mso_send_control_message(struct sr_device_instance *sdi,
 	}
 	ret = SR_OK;
 free:
-	free(buf);
+	g_free(buf);
 ret:
 	return ret;
 }
@@ -386,7 +390,7 @@ static int hw_init(const char *deviceinfo)
 	 */
 	udev = udev_new();
 	if (!udev) {
-		g_warning("Failed to initialize udev.");
+		sr_warn("Failed to initialize udev.");
 		goto ret;
 	}
 	enumerate = udev_enumerate_new(udev);
@@ -406,8 +410,8 @@ static int hw_init(const char *deviceinfo)
 		parent = udev_device_get_parent_with_subsystem_devtype(
 				dev, "usb", "usb_device");
 		if (!parent) {
-			g_warning("Unable to find parent usb device for %s",
-					sysname);
+			sr_warn("Unable to find parent usb device for %s",
+				sysname);
 			continue;
 		}
 
@@ -425,7 +429,7 @@ static int hw_init(const char *deviceinfo)
 		s = strcspn(iProduct, " ");
 		if (s > sizeof(product) ||
 				strlen(iProduct) - s > sizeof(manufacturer)) {
-			g_warning("Could not parse iProduct: %s", iProduct);
+			sr_warn("Could not parse iProduct: %s", iProduct);
 			continue;
 		}
 		strncpy(product, iProduct, s);
@@ -433,13 +437,13 @@ static int hw_init(const char *deviceinfo)
 		strcpy(manufacturer, iProduct + s);
 		sprintf(hwrev, "r%d", mso->hwrev);
 
-		mso = malloc(sizeof(struct mso));
-		if (!mso)
-			continue;
-		memset(mso, 0, sizeof(struct mso));
+		if (!(mso = g_try_malloc0(sizeof(struct mso)))) {
+			sr_err("mso19: %s: mso malloc failed", __func__);
+			continue; /* TODO: Errors handled correctly? */
+		}
 
 		if (mso_parse_serial(iSerial, iProduct, mso) != SR_OK) {
-			g_warning("Invalid iSerial: %s", iSerial);
+			sr_warn("Invalid iSerial: %s", iSerial);
 			goto err_free_mso;
 		}
 		/* hardware initial state */
@@ -448,8 +452,8 @@ static int hw_init(const char *deviceinfo)
 		sdi = sr_device_instance_new(devcnt, SR_ST_INITIALIZING,
 			manufacturer, product, hwrev);
 		if (!sdi) {
-			g_warning("Unable to create device instance for %s",
-					sysname);
+			sr_warn("Unable to create device instance for %s",
+				sysname);
 			goto err_free_mso;
 		}
 
@@ -518,14 +522,14 @@ static int hw_opendev(int device_index)
 	/* FIXME: discard serial buffer */
 
 	mso_check_trigger(sdi, &mso->trigger_state);
-//	g_warning("trigger state: %c", mso->trigger_state);
+//	sr_warn("trigger state: %c", mso->trigger_state);
 
 	ret = mso_reset_adc(sdi);
 	if (ret != SR_OK)
 		return ret;
 
 	mso_check_trigger(sdi, &mso->trigger_state);
-//	g_warning("trigger state: %c", mso->trigger_state);
+//	sr_warn("trigger state: %c", mso->trigger_state);
 
 //	ret = mso_reset_fsm(sdi);
 //	if (ret != SR_OK)