X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fsysclk-lwla%2Fapi.c;h=959b566dcd451b568bb5e4f4d9c6d55a14cf3c72;hb=9e60a31fb954493754770fe2192db74b947c6867;hp=40308f507397f3ae9af73102b27b4ba99f254638;hpb=5827f61b641cfd326a9cf2ea534eb4f9481a8187;p=libsigrok.git

diff --git a/src/hardware/sysclk-lwla/api.c b/src/hardware/sysclk-lwla/api.c
index 40308f50..959b566d 100644
--- a/src/hardware/sysclk-lwla/api.c
+++ b/src/hardware/sysclk-lwla/api.c
@@ -79,53 +79,32 @@ static int init(struct sr_context *sr_ctx)
 	return std_init(sr_ctx, di, LOG_PREFIX);
 }
 
-static GSList *gen_channel_list(int num_channels)
-{
-	GSList *list;
-	struct sr_channel *ch;
-	int i;
-	char name[8];
-
-	list = NULL;
-
-	for (i = num_channels; i > 0; --i) {
-		/* The LWLA series simply number channels from CH1 to CHxx. */
-		g_snprintf(name, sizeof(name), "CH%d", i);
-
-		ch = sr_channel_new(i - 1, SR_CHANNEL_LOGIC, TRUE, name);
-		list = g_slist_prepend(list, ch);
-	}
-
-	return list;
-}
-
-static struct sr_dev_inst *dev_inst_new(int device_index)
+static struct sr_dev_inst *dev_inst_new(void)
 {
 	struct sr_dev_inst *sdi;
 	struct dev_context *devc;
+	int i;
+	char name[8];
 
 	/* Allocate memory for our private driver context. */
-	devc = g_try_new0(struct dev_context, 1);
-	if (!devc) {
-		sr_err("Device context malloc failed.");
-		return NULL;
-	}
+	devc = g_malloc0(sizeof(struct dev_context));
 
 	/* Register the device with libsigrok. */
-	sdi = sr_dev_inst_new(device_index, SR_ST_INACTIVE,
-			      VENDOR_NAME, MODEL_NAME, NULL);
-	if (!sdi) {
-		sr_err("Failed to instantiate device.");
-		g_free(devc);
-		return NULL;
-	}
+	sdi = g_malloc0(sizeof(struct sr_dev_inst));
+	sdi->status = SR_ST_INACTIVE;
+	sdi->vendor = g_strdup(VENDOR_NAME);
+	sdi->model = g_strdup(MODEL_NAME);
 
 	/* Enable all channels to match the default channel configuration. */
 	devc->channel_mask = ALL_CHANNELS_MASK;
 	devc->samplerate = DEFAULT_SAMPLERATE;
 
 	sdi->priv = devc;
-	sdi->channels = gen_channel_list(NUM_CHANNELS);
+	for (i = NUM_CHANNELS; i > 0; --i) {
+		/* The LWLA series simply number channels from CH1 to CHxx. */
+		g_snprintf(name, sizeof(name), "CH%d", i);
+		sr_channel_new(sdi, i - 1, SR_CHANNEL_LOGIC, TRUE, name);
+	}
 
 	return sdi;
 }
@@ -138,7 +117,6 @@ static GSList *scan(GSList *options)
 	struct sr_usb_dev_inst *usb;
 	struct sr_config *src;
 	const char *conn;
-	int device_index;
 
 	drvc = di->priv;
 	conn = USB_VID_PID;
@@ -152,13 +130,12 @@ static GSList *scan(GSList *options)
 	}
 	usb_devices = sr_usb_find(drvc->sr_ctx->libusb_ctx, conn);
 	devices = NULL;
-	device_index = g_slist_length(drvc->instances);
 
 	for (node = usb_devices; node != NULL; node = node->next) {
 		usb = node->data;
 
 		/* Create sigrok device instance. */
-		sdi = dev_inst_new(device_index);
+		sdi = dev_inst_new();
 		if (!sdi) {
 			sr_usb_dev_inst_free(usb);
 			continue;