X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fappa-55ii%2Fapi.c;h=b9f767d2035be8a98ae9163ec342ea4efbe1a671;hb=16aca7661b7ab34a399c323bb9214721e2b1be0c;hp=c36e72c8217896fa8fc94da3f7f5e31a8787b07c;hpb=c368e6f3d248a73d69cd0c2c4a7c88a92def55e3;p=libsigrok.git diff --git a/src/hardware/appa-55ii/api.c b/src/hardware/appa-55ii/api.c index c36e72c8..b9f767d2 100644 --- a/src/hardware/appa-55ii/api.c +++ b/src/hardware/appa-55ii/api.c @@ -55,7 +55,6 @@ static GSList *scan(GSList *options) struct dev_context *devc; struct sr_serial_dev_inst *serial; struct sr_dev_inst *sdi; - struct sr_channel *ch; struct sr_config *src; GSList *devices, *l; const char *conn, *serialcomm; @@ -81,8 +80,8 @@ static GSList *scan(GSList *options) if (!serialcomm) serialcomm = "9600/8n1"; - if (!(serial = sr_serial_dev_inst_new(conn, serialcomm))) - return NULL; + serial = sr_serial_dev_inst_new(conn, serialcomm); + if (serial_open(serial, SERIAL_RDONLY) != SR_OK) return NULL; @@ -110,10 +109,8 @@ static GSList *scan(GSList *options) sdi->priv = devc; sdi->driver = di; - ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "T1"); - sdi->channels = g_slist_append(sdi->channels, ch); - ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "T2"); - sdi->channels = g_slist_append(sdi->channels, ch); + sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "T1"); + sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "T2"); drvc->instances = g_slist_append(drvc->instances, sdi); devices = g_slist_append(devices, sdi);