X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fhardware%2Flascar-el-usb%2Fprotocol.c;h=484ab0fc622f22288d582d6b28e21d7beec8d5ee;hb=7637cc60ba0201202eec98f66d8494e6ba3d53bd;hp=801f83b024ad714f5e7a358d9ffcf929812e6199;hpb=c368e6f3d248a73d69cd0c2c4a7c88a92def55e3;p=libsigrok.git

diff --git a/src/hardware/lascar-el-usb/protocol.c b/src/hardware/lascar-el-usb/protocol.c
index 801f83b0..484ab0fc 100644
--- a/src/hardware/lascar-el-usb/protocol.c
+++ b/src/hardware/lascar-el-usb/protocol.c
@@ -27,7 +27,7 @@
 #include "protocol.h"
 
 extern struct sr_dev_driver lascar_el_usb_driver_info;
-static struct sr_dev_driver *di = &lascar_el_usb_driver_info;
+struct sr_dev_driver *di = &lascar_el_usb_driver_info;
 
 static const struct elusb_profile profiles[] = {
 	{ 1, "EL-USB-1", LOG_UNSUPPORTED },
@@ -54,7 +54,6 @@ static const struct elusb_profile profiles[] = {
 	{ 0, NULL, 0 }
 };
 
-
 static libusb_device_handle *lascar_open(struct libusb_device *dev)
 {
 	libusb_device_handle *dev_hdl;
@@ -293,7 +292,6 @@ static struct sr_dev_inst *lascar_identify(unsigned char *config)
 	struct dev_context *devc;
 	const struct elusb_profile *profile;
 	struct sr_dev_inst *sdi;
-	struct sr_channel *ch;
 	int modelid, i;
 	char firmware[5];
 
@@ -332,16 +330,12 @@ static struct sr_dev_inst *lascar_identify(unsigned char *config)
 
 		if (profile->logformat == LOG_TEMP_RH) {
 			/* Model this as two channels: temperature and humidity. */
-			ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "Temp");
-			sdi->channels = g_slist_append(NULL, ch);
-			ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "Hum");
-			sdi->channels = g_slist_append(sdi->channels, ch);
+			sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "Temp");
+			sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "Hum");
 		} else if (profile->logformat == LOG_CO) {
-			ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "CO");
-			sdi->channels = g_slist_append(NULL, ch);
+			sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "CO");
 		} else {
-			ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "P1");
-			sdi->channels = g_slist_append(NULL, ch);
+			sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "P1");
 		}
 
 		devc = g_malloc0(sizeof(struct dev_context));