X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fappa-55ii%2Fapi.c;h=de71e338d8f84fd22b7fd3b618ed25a633b2ebcc;hb=43cd4637285833706f8a404ca027bcf0ee75b9ae;hp=8bbe45a0872c64e670ecefbf454fb1b28fb23759;hpb=56d0d24535700fb53e47a25ad5c73d34697695fa;p=libsigrok.git

diff --git a/hardware/appa-55ii/api.c b/hardware/appa-55ii/api.c
index 8bbe45a0..de71e338 100644
--- a/hardware/appa-55ii/api.c
+++ b/hardware/appa-55ii/api.c
@@ -96,7 +96,7 @@ static GSList *scan(GSList *options)
 
 	sr_info("Found device on port %s.", conn);
 
-	if (!(sdi = sr_dev_inst_new(0, SR_ST_INACTIVE, "APPA", "55II", "")))
+	if (!(sdi = sr_dev_inst_new(0, SR_ST_INACTIVE, "APPA", "55II", NULL)))
 		goto scan_cleanup;
 
 	if (!(devc = g_try_malloc0(sizeof(struct dev_context)))) {
@@ -111,10 +111,10 @@ static GSList *scan(GSList *options)
 	sdi->priv = devc;
 	sdi->driver = di;
 
-	if (!(ch = sr_channel_new(0, SR_PROBE_ANALOG, TRUE, "T1")))
+	if (!(ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "T1")))
 		goto scan_cleanup;
 	sdi->channels = g_slist_append(sdi->channels, ch);
-	if (!(ch = sr_channel_new(0, SR_PROBE_ANALOG, TRUE, "T2")))
+	if (!(ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "T2")))
 		goto scan_cleanup;
 	sdi->channels = g_slist_append(sdi->channels, ch);
 
@@ -259,7 +259,8 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi,
 	std_session_send_df_header(cb_data, LOG_PREFIX);
 
 	/* Poll every 50ms, or whenever some data comes in. */
-	serial_source_add(serial, G_IO_IN, 50, appa_55ii_receive_data, (void *)sdi);
+	serial_source_add(sdi->session, serial, G_IO_IN, 50,
+			appa_55ii_receive_data, (void *)sdi);
 
 	return SR_OK;
 }