X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fatten-pps3xxx%2Fapi.c;h=10dfa2adea6fcf059d0e3f34e8e15e5104b948d6;hb=41812aca436805b0614f2a8f31cf2f8ce494aea0;hp=5bbafca8c3a6b88ca102804b50a5e5c15c3dc0ba;hpb=2eb1612d463e9232af437d9a6c1b3897da2367e9;p=libsigrok.git diff --git a/src/hardware/atten-pps3xxx/api.c b/src/hardware/atten-pps3xxx/api.c index 5bbafca8..10dfa2ad 100644 --- a/src/hardware/atten-pps3xxx/api.c +++ b/src/hardware/atten-pps3xxx/api.c @@ -36,19 +36,22 @@ static const uint32_t scanopts[] = { SR_CONF_SERIALCOMM, }; -static const uint32_t devopts[] = { +static const uint32_t drvopts[] = { SR_CONF_POWER_SUPPLY, - SR_CONF_CONTINUOUS, - SR_CONF_OUTPUT_CHANNEL_CONFIG | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, +}; + +static const uint32_t devopts[] = { + SR_CONF_CONTINUOUS | SR_CONF_SET, + SR_CONF_CHANNEL_CONFIG | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, SR_CONF_OVER_CURRENT_PROTECTION_ENABLED | SR_CONF_GET | SR_CONF_SET, }; static const uint32_t devopts_cg[] = { - SR_CONF_OUTPUT_VOLTAGE | SR_CONF_GET, - SR_CONF_OUTPUT_VOLTAGE_MAX | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, - SR_CONF_OUTPUT_CURRENT | SR_CONF_GET, - SR_CONF_OUTPUT_CURRENT_MAX | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, - SR_CONF_OUTPUT_ENABLED | SR_CONF_GET | SR_CONF_SET, + SR_CONF_VOLTAGE | SR_CONF_GET, + SR_CONF_VOLTAGE_TARGET | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, + SR_CONF_CURRENT | SR_CONF_GET, + SR_CONF_CURRENT_LIMIT | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, + SR_CONF_ENABLED | SR_CONF_GET | SR_CONF_SET, }; static const char *channel_modes[] = { @@ -57,7 +60,7 @@ static const char *channel_modes[] = { "Parallel", }; -static struct pps_model models[] = { +static const struct pps_model models[] = { { PPS_3203T_3S, "PPS3203T-3S", CHANMODE_INDEPENDENT | CHANMODE_SERIES | CHANMODE_PARALLEL, 3, @@ -72,16 +75,14 @@ static struct pps_model models[] = { }, }; - SR_PRIV struct sr_dev_driver atten_pps3203_driver_info; -static struct sr_dev_driver *di = &atten_pps3203_driver_info; -static int init(struct sr_context *sr_ctx) +static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx) { return std_init(sr_ctx, di, LOG_PREFIX); } -static GSList *scan(GSList *options, int modelid) +static GSList *scan(struct sr_dev_driver *di, GSList *options, int modelid) { struct sr_dev_inst *sdi; struct drv_context *drvc; @@ -91,7 +92,7 @@ static GSList *scan(GSList *options, int modelid) struct sr_channel_group *cg; struct sr_serial_dev_inst *serial; GSList *l, *devices; - struct pps_model *model; + const struct pps_model *model; uint8_t packet[PACKET_SIZE]; unsigned int i; int delay_ms, ret; @@ -99,7 +100,7 @@ static GSList *scan(GSList *options, int modelid) char channel[10]; devices = NULL; - drvc = di->priv; + drvc = di->context; drvc->instances = NULL; conn = serialcomm = NULL; @@ -119,11 +120,11 @@ static GSList *scan(GSList *options, int modelid) if (!serialcomm) serialcomm = SERIALCOMM; - if (!(serial = sr_serial_dev_inst_new(conn, serialcomm))) - return NULL; + serial = sr_serial_dev_inst_new(conn, serialcomm); if (serial_open(serial, SERIAL_RDWR) != SR_OK) return NULL; + serial_flush(serial); /* This is how the vendor software scans for hardware. */ @@ -161,14 +162,16 @@ static GSList *scan(GSList *options, int modelid) return NULL; } - sdi = sr_dev_inst_new(SR_ST_INACTIVE, "Atten", model->name, NULL); + sdi = g_malloc0(sizeof(struct sr_dev_inst)); + sdi->status = SR_ST_INACTIVE; + sdi->vendor = g_strdup("Atten"); + sdi->model = g_strdup(model->name); sdi->driver = di; sdi->inst_type = SR_INST_SERIAL; sdi->conn = serial; for (i = 0; i < MAX_CHANNELS; i++) { snprintf(channel, 10, "CH%d", i + 1); - ch = sr_channel_new(i, SR_CHANNEL_ANALOG, TRUE, channel); - sdi->channels = g_slist_append(sdi->channels, ch); + ch = sr_channel_new(sdi, i, SR_CHANNEL_ANALOG, TRUE, channel); cg = g_malloc(sizeof(struct sr_channel_group)); cg->name = g_strdup(channel); cg->channels = g_slist_append(NULL, ch); @@ -191,17 +194,17 @@ static GSList *scan(GSList *options, int modelid) return devices; } -static GSList *scan_3203(GSList *options) +static GSList *scan_3203(struct sr_dev_driver *di, GSList *options) { - return scan(options, PPS_3203T_3S); + return scan(di, options, PPS_3203T_3S); } -static GSList *dev_list(void) +static GSList *dev_list(const struct sr_dev_driver *di) { - return ((struct drv_context *)(di->priv))->instances; + return ((struct drv_context *)(di->context))->instances; } -static int cleanup(void) +static int cleanup(const struct sr_dev_driver *di) { return std_dev_clear(di, NULL); } @@ -222,7 +225,7 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s if (!cg) { /* No channel group: global options. */ switch (key) { - case SR_CONF_OUTPUT_CHANNEL_CONFIG: + case SR_CONF_CHANNEL_CONFIG: *data = g_variant_new_string(channel_modes[devc->channel_mode]); break; case SR_CONF_OVER_CURRENT_PROTECTION_ENABLED: @@ -237,19 +240,19 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s channel = ch->index; switch (key) { - case SR_CONF_OUTPUT_VOLTAGE: + case SR_CONF_VOLTAGE: *data = g_variant_new_double(devc->config[channel].output_voltage_last); break; - case SR_CONF_OUTPUT_VOLTAGE_MAX: + case SR_CONF_VOLTAGE_TARGET: *data = g_variant_new_double(devc->config[channel].output_voltage_max); break; - case SR_CONF_OUTPUT_CURRENT: + case SR_CONF_CURRENT: *data = g_variant_new_double(devc->config[channel].output_current_last); break; - case SR_CONF_OUTPUT_CURRENT_MAX: + case SR_CONF_CURRENT_LIMIT: *data = g_variant_new_double(devc->config[channel].output_current_max); break; - case SR_CONF_OUTPUT_ENABLED: + case SR_CONF_ENABLED: *data = g_variant_new_boolean(devc->config[channel].output_enabled); break; default: @@ -293,7 +296,7 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd if (!cg) { /* No channel group: global options. */ switch (key) { - case SR_CONF_OUTPUT_CHANNEL_CONFIG: + case SR_CONF_CHANNEL_CONFIG: sval = g_variant_get_string(data, NULL); if ((ival = find_str(sval, channel_modes, ARRAY_SIZE(channel_modes))) == -1) { @@ -328,21 +331,21 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd channel = ch->index; switch (key) { - case SR_CONF_OUTPUT_VOLTAGE_MAX: + case SR_CONF_VOLTAGE_TARGET: dval = g_variant_get_double(data); if (dval < 0 || dval > devc->model->channels[channel].voltage[1]) ret = SR_ERR_ARG; devc->config[channel].output_voltage_max = dval; devc->config_dirty = TRUE; break; - case SR_CONF_OUTPUT_CURRENT_MAX: + case SR_CONF_CURRENT_LIMIT: dval = g_variant_get_double(data); if (dval < 0 || dval > devc->model->channels[channel].current[1]) ret = SR_ERR_ARG; devc->config[channel].output_current_max = dval; devc->config_dirty = TRUE; break; - case SR_CONF_OUTPUT_ENABLED: + case SR_CONF_ENABLED: bval = g_variant_get_boolean(data); if (bval == devc->config[channel].output_enabled_set) /* Nothing to do. */ @@ -355,7 +358,6 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd } } - return ret; } @@ -368,17 +370,23 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst * GVariantBuilder gvb; int channel, ret, i; - /* Always available, even without sdi. */ + /* Always available. */ if (key == SR_CONF_SCAN_OPTIONS) { *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, scanopts, ARRAY_SIZE(scanopts), sizeof(uint32_t)); return SR_OK; } + if (key == SR_CONF_DEVICE_OPTIONS && !sdi) { + *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, + drvopts, ARRAY_SIZE(drvopts), sizeof(uint32_t)); + return SR_OK; + } + if (!sdi) return SR_ERR_ARG; - devc = sdi->priv; + devc = sdi->priv; ret = SR_OK; if (!cg) { /* No channel group: global options. */ @@ -387,7 +395,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst * *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, devopts, ARRAY_SIZE(devopts), sizeof(uint32_t)); break; - case SR_CONF_OUTPUT_CHANNEL_CONFIG: + case SR_CONF_CHANNEL_CONFIG: if (devc->model->channel_modes == CHANMODE_INDEPENDENT) { /* The 1-channel models. */ *data = g_variant_new_strv(channel_modes, 1); @@ -412,7 +420,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst * *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, devopts_cg, ARRAY_SIZE(devopts_cg), sizeof(uint32_t)); break; - case SR_CONF_OUTPUT_VOLTAGE_MAX: + case SR_CONF_VOLTAGE_TARGET: g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY); /* Min, max, step. */ for (i = 0; i < 3; i++) { @@ -421,7 +429,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst * } *data = g_variant_builder_end(&gvb); break; - case SR_CONF_OUTPUT_CURRENT_MAX: + case SR_CONF_CURRENT_LIMIT: g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY); /* Min, max, step. */ for (i = 0; i < 3; i++) { @@ -515,5 +523,5 @@ SR_PRIV struct sr_dev_driver atten_pps3203_driver_info = { .dev_close = dev_close, .dev_acquisition_start = dev_acquisition_start, .dev_acquisition_stop = dev_acquisition_stop, - .priv = NULL, + .context = NULL, };