X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fappa-55ii%2Fapi.c;h=ab3ad7906575142f6da3da2bc6cd8fcb7b71a392;hb=aed4ad0beaf64062752039a13f9a95326aa1df87;hp=5bc16310f5b3ef0940af7fe4df34762e2b65cbd2;hpb=a0e0bb4149081eda06714f1158639f2dadcfa9d8;p=libsigrok.git diff --git a/src/hardware/appa-55ii/api.c b/src/hardware/appa-55ii/api.c index 5bc16310..ab3ad790 100644 --- a/src/hardware/appa-55ii/api.c +++ b/src/hardware/appa-55ii/api.c @@ -27,10 +27,10 @@ static const uint32_t scanopts[] = { static const uint32_t devopts[] = { SR_CONF_THERMOMETER, - SR_CONF_LIMIT_SAMPLES, - SR_CONF_LIMIT_MSEC, SR_CONF_CONTINUOUS, - SR_CONF_DATA_SOURCE, + SR_CONF_LIMIT_SAMPLES | SR_CONF_GET | SR_CONF_SET, + SR_CONF_LIMIT_MSEC | SR_CONF_GET | SR_CONF_SET, + SR_CONF_DATA_SOURCE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, }; static const char *data_sources[] = { @@ -80,7 +80,7 @@ static GSList *scan(GSList *options) if (!(serial = sr_serial_dev_inst_new(conn, serialcomm))) return NULL; - if (serial_open(serial, SERIAL_RDONLY | SERIAL_NONBLOCK) != SR_OK) + if (serial_open(serial, SERIAL_RDONLY) != SR_OK) return NULL; sr_info("Probing serial port %s.", conn); @@ -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", NULL))) + if (!(sdi = sr_dev_inst_new(SR_ST_INACTIVE, "APPA", "55II", NULL))) goto scan_cleanup; if (!(devc = g_try_malloc0(sizeof(struct dev_context)))) {