X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fmotech-lps-30x%2Fapi.c;h=40bb2d9578873a0baa4f5708f714d07309d3eda6;hb=0af636bed97c174bea46e61e961eaa1b0b162e0f;hp=164a9cc02321d88656018a93e0879cf765f6dc17;hpb=155b680da482cea2381becb73c51cfb838bff31e;p=libsigrok.git diff --git a/src/hardware/motech-lps-30x/api.c b/src/hardware/motech-lps-30x/api.c index 164a9cc0..40bb2d95 100644 --- a/src/hardware/motech-lps-30x/api.c +++ b/src/hardware/motech-lps-30x/api.c @@ -44,36 +44,36 @@ SR_PRIV int lps_query_status(struct sr_dev_inst* sdi); #define VENDOR_MOTECH "Motech" /** Driver scanning options. */ -static const int32_t hwopts[] = { +static const uint32_t scanopts[] = { SR_CONF_CONN, SR_CONF_SERIALCOMM, }; /** Hardware capabilities generic. */ -static const int32_t hwcaps[] = { +static const uint32_t devopts[] = { /* Device class */ SR_CONF_POWER_SUPPLY, /* Aquisition modes. */ - SR_CONF_LIMIT_SAMPLES, - SR_CONF_LIMIT_MSEC, SR_CONF_CONTINUOUS, + SR_CONF_LIMIT_SAMPLES | SR_CONF_GET | SR_CONF_SET, + SR_CONF_LIMIT_MSEC | SR_CONF_GET | SR_CONF_SET, /* Device configuration */ - SR_CONF_OUTPUT_CHANNEL, + SR_CONF_OUTPUT_CHANNEL_CONFIG | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, }; /** Hardware capabilities channel 1, 2. */ -static const int32_t hwcaps_ch12[] = { - SR_CONF_OUTPUT_VOLTAGE, - SR_CONF_OUTPUT_VOLTAGE_MAX, - SR_CONF_OUTPUT_CURRENT, - SR_CONF_OUTPUT_CURRENT_MAX, - SR_CONF_OUTPUT_ENABLED, +static const uint32_t devopts_ch12[] = { + SR_CONF_OUTPUT_VOLTAGE | SR_CONF_GET, + SR_CONF_OUTPUT_VOLTAGE_TARGET | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, + SR_CONF_OUTPUT_CURRENT | SR_CONF_GET, + SR_CONF_OUTPUT_CURRENT_LIMIT | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, + SR_CONF_OUTPUT_ENABLED | SR_CONF_GET | SR_CONF_SET, }; /** Hardware capabilities channel 3. (LPS-304/305 only). */ -static const int32_t hwcaps_ch3[] = { - SR_CONF_OUTPUT_VOLTAGE, - SR_CONF_OUTPUT_ENABLED, +static const uint32_t devopts_ch3[] = { + SR_CONF_OUTPUT_VOLTAGE | SR_CONF_GET, + SR_CONF_OUTPUT_ENABLED | SR_CONF_GET | SR_CONF_SET, }; static const char *channel_modes[] = { @@ -146,7 +146,7 @@ SR_PRIV int lps_send_va(struct sr_serial_dev_inst *serial, const char* fmt, va_l sr_spew("lps_send_va: \"%s\"", buf); - retc = serial_write_nonblocking(serial, buf, strlen(buf)); + retc = serial_write_blocking(serial, buf, strlen(buf), 0); if (retc < 0) return SR_ERR; @@ -375,9 +375,9 @@ static GSList *do_scan(lps_modelid modelid, struct sr_dev_driver *drv, GSList *o GSList *devices; const char *conn, *serialcomm; int cnt; - gchar buf[LINELEN_MAX]; + gchar buf[LINELEN_MAX]; gchar channel[10]; - char* verstr; + char *verstr; sdi = NULL; devc = NULL; @@ -399,7 +399,7 @@ static GSList *do_scan(lps_modelid modelid, struct sr_dev_driver *drv, GSList *o 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) goto exit_err; /* Query and verify model string. */ @@ -444,7 +444,11 @@ static GSList *do_scan(lps_modelid modelid, struct sr_dev_driver *drv, GSList *o Therefore just print an error message, but do not exit with error. */ sr_err("Failed to query for hardware version: %d %s", errno, strerror(errno)); - sdi = sr_dev_inst_new(0, SR_ST_INACTIVE, VENDOR_MOTECH, models[modelid].modelstr, verstr); + sdi = sr_dev_inst_new(); + sdi->status = SR_ST_INACTIVE; + sdi->vendor = g_strdup(VENDOR_MOTECH); + sdi->model = g_strdup(models[modelid].modelstr); + sdi->version = g_strdup(verstr); sdi->driver = drv; sdi->inst_type = SR_INST_SERIAL; sdi->conn = serial; @@ -540,7 +544,7 @@ static int cleanup(void) return dev_clear_lps301(); } -static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi, +static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi, const struct sr_channel_group *cg) { struct dev_context *devc; @@ -561,7 +565,7 @@ static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi, case SR_CONF_LIMIT_MSEC: *data = g_variant_new_uint64(devc->limit_msec); break; - case SR_CONF_OUTPUT_CHANNEL: + case SR_CONF_OUTPUT_CHANNEL_CONFIG: *data = g_variant_new_string(channel_modes[devc->tracking_mode]); break; default: @@ -575,13 +579,13 @@ static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi, case SR_CONF_OUTPUT_VOLTAGE: *data = g_variant_new_double(devc->channel_status[ch_idx].output_voltage_last); break; - case SR_CONF_OUTPUT_VOLTAGE_MAX: + case SR_CONF_OUTPUT_VOLTAGE_TARGET: *data = g_variant_new_double(devc->channel_status[ch_idx].output_voltage_max); break; case SR_CONF_OUTPUT_CURRENT: *data = g_variant_new_double(devc->channel_status[ch_idx].output_current_last); break; - case SR_CONF_OUTPUT_CURRENT_MAX: + case SR_CONF_OUTPUT_CURRENT_LIMIT: *data = g_variant_new_double(devc->channel_status[ch_idx].output_current_max); break; case SR_CONF_OUTPUT_ENABLED: @@ -595,7 +599,7 @@ static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi, return SR_OK; } -static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi, +static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sdi, const struct sr_channel_group *cg) { struct dev_context *devc; @@ -634,7 +638,7 @@ static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi, sr_dbg("Setting sample limit to %" PRIu64 ".", devc->limit_samples); break; - case SR_CONF_OUTPUT_CHANNEL: + case SR_CONF_OUTPUT_CHANNEL_CONFIG: sval = g_variant_get_string(data, NULL); found = FALSE; for (idx = 0; idx < (int)ARRAY_SIZE(channel_modes); idx++) @@ -664,7 +668,7 @@ static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi, ch_idx = ch->index; switch (key) { - case SR_CONF_OUTPUT_VOLTAGE_MAX: + case SR_CONF_OUTPUT_VOLTAGE_TARGET: dval = g_variant_get_double(data); if (dval < 0 || dval > devc->model->channels[ch_idx].voltage[1]) return SR_ERR_ARG; @@ -685,7 +689,7 @@ static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi, else return lps_cmd_ok(sdi->conn, "VSET%d %05.3f", ch_idx+1, dval); break; - case SR_CONF_OUTPUT_CURRENT_MAX: + case SR_CONF_OUTPUT_CURRENT_LIMIT: dval = g_variant_get_double(data); if (dval < 0 || dval > devc->model->channels[ch_idx].current[1]) return SR_ERR_ARG; @@ -717,7 +721,7 @@ static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi, return SR_OK; } -static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi, +static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi, const struct sr_channel_group *cg) { struct dev_context *devc; @@ -731,8 +735,8 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi, /* Driver options, no device instance necessary. */ switch (key) { case SR_CONF_SCAN_OPTIONS: - *data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32, - hwopts, ARRAY_SIZE(hwopts), sizeof(int32_t)); + *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, + scanopts, ARRAY_SIZE(scanopts), sizeof(uint32_t)); return SR_OK; default: if (sdi == NULL) @@ -741,14 +745,14 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi, devc = sdi->priv; } - /* Device options, independant from channel groups. */ + /* Device options, independent from channel groups. */ if (cg == NULL) { switch (key) { case SR_CONF_DEVICE_OPTIONS: - *data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32, - hwcaps, ARRAY_SIZE(hwcaps), sizeof(int32_t)); + *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, + devopts, ARRAY_SIZE(devopts), sizeof(uint32_t)); return SR_OK; - case SR_CONF_OUTPUT_CHANNEL: + case SR_CONF_OUTPUT_CHANNEL_CONFIG: if (devc->model->modelid <= LPS_303) { /* The 1-channel models. */ *data = g_variant_new_strv(channel_modes, 1); @@ -769,13 +773,13 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi, switch (key) { case SR_CONF_DEVICE_OPTIONS: if ((ch_idx == 0) || (ch_idx == 1)) /* CH1, CH2 */ - *data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32, - hwcaps_ch12, ARRAY_SIZE(hwcaps_ch12), sizeof(int32_t)); + *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, + devopts_ch12, ARRAY_SIZE(devopts_ch12), sizeof(uint32_t)); else /* Must be CH3 */ - *data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32, - hwcaps_ch3, ARRAY_SIZE(hwcaps_ch3), sizeof(int32_t)); + *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, + devopts_ch3, ARRAY_SIZE(devopts_ch3), sizeof(uint32_t)); break; - case SR_CONF_OUTPUT_VOLTAGE_MAX: + case SR_CONF_OUTPUT_VOLTAGE_TARGET: g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY); /* Min, max, step. */ for (i = 0; i < 3; i++) { @@ -784,7 +788,7 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi, } *data = g_variant_builder_end(&gvb); break; - case SR_CONF_OUTPUT_CURRENT_MAX: + case SR_CONF_OUTPUT_CURRENT_LIMIT: g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY); /* Min, max, step. */ for (i = 0; i < 3; i++) {