X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fcenter-3xx%2Fapi.c;h=0d671fbfff8b1d703893f473657ac63a031dc2bd;hb=0af636bed97c174bea46e61e961eaa1b0b162e0f;hp=1594724aa78f32872cc8ff4bc256dc1822137f7b;hpb=a0e0bb4149081eda06714f1158639f2dadcfa9d8;p=libsigrok.git diff --git a/src/hardware/center-3xx/api.c b/src/hardware/center-3xx/api.c index 1594724a..0d671fbf 100644 --- a/src/hardware/center-3xx/api.c +++ b/src/hardware/center-3xx/api.c @@ -27,9 +27,9 @@ 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_LIMIT_SAMPLES | SR_CONF_SET, + SR_CONF_LIMIT_MSEC | SR_CONF_SET, }; static const char *channel_names[] = { @@ -76,7 +76,7 @@ static GSList *center_scan(const char *conn, const char *serialcomm, int idx) if (!(serial = sr_serial_dev_inst_new(conn, serialcomm))) return NULL; - if (serial_open(serial, SERIAL_RDWR | SERIAL_NONBLOCK) != SR_OK) + if (serial_open(serial, SERIAL_RDWR) != SR_OK) return NULL; drvc = center_devs[idx].di->priv; @@ -85,9 +85,10 @@ static GSList *center_scan(const char *conn, const char *serialcomm, int idx) sr_info("Found device on port %s.", conn); - if (!(sdi = sr_dev_inst_new(0, SR_ST_INACTIVE, center_devs[idx].vendor, - center_devs[idx].device, NULL))) - goto scan_cleanup; + sdi = sr_dev_inst_new(); + sdi->status = SR_ST_INACTIVE; + sdi->vendor = g_strdup(center_devs[idx].vendor); + sdi->model = g_strdup(center_devs[idx].device); if (!(devc = g_try_malloc0(sizeof(struct dev_context)))) { sr_err("Device context malloc failed.");