X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=blobdiff_plain;f=src%2Fhardware%2Fatten-pps3xxx%2Fapi.c;h=28b22015d3fd13f449c0379cf7f84d92b5e8363b;hp=0d7c33e55a0377180f716b1ee178a2cea0c0bb06;hb=HEAD;hpb=e7b4103697627bc985b77feb4c05dc67da8aebc0 diff --git a/src/hardware/atten-pps3xxx/api.c b/src/hardware/atten-pps3xxx/api.c index 0d7c33e5..28b22015 100644 --- a/src/hardware/atten-pps3xxx/api.c +++ b/src/hardware/atten-pps3xxx/api.c @@ -17,8 +17,8 @@ * along with this program. If not, see . */ +#include #include -#include #include "protocol.h" /* @@ -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, +}; + +static const uint32_t devopts[] = { SR_CONF_CONTINUOUS, - SR_CONF_OUTPUT_CHANNEL_CONFIG | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, + 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,36 +75,22 @@ 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) -{ - 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; struct dev_context *devc; struct sr_config *src; struct sr_channel *ch; struct sr_channel_group *cg; struct sr_serial_dev_inst *serial; - GSList *l, *devices; - struct pps_model *model; + GSList *l; + const struct pps_model *model; uint8_t packet[PACKET_SIZE]; unsigned int i; - int ret; + int delay_ms, ret; const char *conn, *serialcomm; char channel[10]; - devices = NULL; - drvc = di->priv; - drvc->instances = NULL; - conn = serialcomm = NULL; for (l = options; l; l = l->next) { src = l->data; @@ -119,20 +108,18 @@ 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 | SERIAL_NONBLOCK) != SR_OK) + if (serial_open(serial, SERIAL_RDWR) != SR_OK) return NULL; - serial_flush(serial); - /* This is how the vendor software channels for hardware. */ + /* This is how the vendor software scans for hardware. */ memset(packet, 0, PACKET_SIZE); packet[0] = 0xaa; packet[1] = 0xaa; - if (serial_write_blocking(serial, packet, PACKET_SIZE) == -1) { - sr_err("Unable to write while probing for hardware: %s", - strerror(errno)); + delay_ms = serial_timeout(serial, PACKET_SIZE); + if (serial_write_blocking(serial, packet, PACKET_SIZE, delay_ms) < PACKET_SIZE) { + sr_err("Unable to write while probing for hardware."); return NULL; } /* The device responds with a 24-byte packet when it receives a packet. @@ -141,7 +128,7 @@ static GSList *scan(GSList *options, int modelid) memset(packet, 0, PACKET_SIZE); if ((ret = serial_read_nonblocking(serial, packet, PACKET_SIZE)) < 0) { sr_err("Unable to read while probing for hardware: %s", - strerror(errno)); + sr_strerror(ret)); return NULL; } if (ret != PACKET_SIZE || packet[0] != 0xaa || packet[1] != 0xaa) { @@ -161,67 +148,50 @@ static GSList *scan(GSList *options, int modelid) return NULL; } - sdi = sr_dev_inst_new(0, SR_ST_INACTIVE, "Atten", model->name, NULL); - sdi->driver = di; + 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->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); - cg = g_malloc(sizeof(struct sr_channel_group)); - cg->name = g_strdup(channel); + ch = sr_channel_new(sdi, i, SR_CHANNEL_ANALOG, TRUE, channel); + cg = sr_channel_group_new(sdi, channel, NULL); cg->channels = g_slist_append(NULL, ch); - cg->priv = NULL; - sdi->channel_groups = g_slist_append(sdi->channel_groups, cg); } devc = g_malloc0(sizeof(struct dev_context)); devc->model = model; devc->config = g_malloc0(sizeof(struct per_channel_config) * model->num_channels); + devc->delay_ms = delay_ms; sdi->priv = devc; - drvc->instances = g_slist_append(drvc->instances, sdi); - devices = g_slist_append(devices, sdi); serial_close(serial); - if (!devices) - sr_serial_dev_inst_free(serial); - return devices; + return std_scan_complete(di, g_slist_append(NULL, sdi)); } -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) -{ - return ((struct drv_context *)(di->priv))->instances; -} - -static int cleanup(void) -{ - return std_dev_clear(di, NULL); -} - -static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi, - const struct sr_channel_group *cg) +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; struct sr_channel *ch; - int channel, ret; + int channel; if (!sdi) return SR_ERR_ARG; devc = sdi->priv; - ret = SR_OK; 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: @@ -236,19 +206,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: @@ -256,64 +226,36 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s } } - return ret; -} - -static int find_str(const char *str, const char **strings, int array_size) -{ - int idx, i; - - idx = -1; - for (i = 0; i < array_size; i++) { - if (!strcmp(str, strings[i])) { - idx = i; - break; - } - } - - return idx; + return SR_OK; } -static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sdi, - const struct sr_channel_group *cg) +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; struct sr_channel *ch; gdouble dval; - int channel, ret, ival; - const char *sval; + int channel, ival; gboolean bval; - if (sdi->status != SR_ST_ACTIVE) - return SR_ERR_DEV_CLOSED; - - ret = SR_OK; devc = sdi->priv; + if (!cg) { - /* No channel group: global options. */ switch (key) { - case SR_CONF_OUTPUT_CHANNEL_CONFIG: - sval = g_variant_get_string(data, NULL); - if ((ival = find_str(sval, channel_modes, - ARRAY_SIZE(channel_modes))) == -1) { - ret = SR_ERR_ARG; - break; - } - if (devc->model->channel_modes && (1 << ival) == 0) { - /* Not supported on this model. */ - ret = SR_ERR_ARG; - } + case SR_CONF_CHANNEL_CONFIG: + if ((ival = std_str_idx(data, ARRAY_AND_SIZE(channel_modes))) < 0) + return SR_ERR_ARG; + if (devc->model->channel_modes && (1 << ival) == 0) + return SR_ERR_ARG; /* Not supported on this model. */ if (ival == devc->channel_mode_set) - /* Nothing to do. */ - break; + break; /* Nothing to do. */ devc->channel_mode_set = ival; devc->config_dirty = TRUE; break; case SR_CONF_OVER_CURRENT_PROTECTION_ENABLED: bval = g_variant_get_boolean(data); if (bval == devc->over_current_protection_set) - /* Nothing to do. */ - break; + break; /* Nothing to do. */ devc->over_current_protection_set = bval; devc->config_dirty = TRUE; break; @@ -321,120 +263,93 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd return SR_ERR_NA; } } else { - /* Channel group specified: per-channel options. */ /* We only ever have one channel per channel group in this driver. */ ch = cg->channels->data; 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; + return 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; + return 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. */ - break; + break; /* Nothing to do. */ devc->config[channel].output_enabled_set = bval; devc->config_dirty = TRUE; break; default: - ret = SR_ERR_NA; + return SR_ERR_NA; } } - - return ret; + return SR_OK; } -static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi, - const struct sr_channel_group *cg) +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; struct sr_channel *ch; - GVariant *gvar; - GVariantBuilder gvb; - int channel, ret, i; - - /* Always available, even without sdi. */ - 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; - } + int channel; - if (!sdi) - return SR_ERR_ARG; - devc = sdi->priv; + devc = (sdi) ? sdi->priv : NULL; - ret = SR_OK; if (!cg) { - /* No channel group: global options. */ switch (key) { + case SR_CONF_SCAN_OPTIONS: case SR_CONF_DEVICE_OPTIONS: - *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, - devopts, ARRAY_SIZE(devopts), sizeof(uint32_t)); - break; - case SR_CONF_OUTPUT_CHANNEL_CONFIG: + return STD_CONFIG_LIST(key, data, sdi, cg, scanopts, drvopts, devopts); + case SR_CONF_CHANNEL_CONFIG: + if (!devc || !devc->model) + return SR_ERR_ARG; if (devc->model->channel_modes == CHANMODE_INDEPENDENT) { /* The 1-channel models. */ *data = g_variant_new_strv(channel_modes, 1); } else { /* The other models support all modes. */ - *data = g_variant_new_strv(channel_modes, ARRAY_SIZE(channel_modes)); + *data = g_variant_new_strv(ARRAY_AND_SIZE(channel_modes)); } break; default: return SR_ERR_NA; } } else { - /* Channel group specified: per-channel options. */ - if (!sdi) - return SR_ERR_ARG; /* We only ever have one channel per channel group in this driver. */ ch = cg->channels->data; channel = ch->index; switch (key) { case SR_CONF_DEVICE_OPTIONS: - *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, - devopts_cg, ARRAY_SIZE(devopts_cg), sizeof(uint32_t)); + *data = std_gvar_array_u32(ARRAY_AND_SIZE(devopts_cg)); break; - case SR_CONF_OUTPUT_VOLTAGE_MAX: - g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY); - /* Min, max, step. */ - for (i = 0; i < 3; i++) { - gvar = g_variant_new_double(devc->model->channels[channel].voltage[i]); - g_variant_builder_add_value(&gvb, gvar); - } - *data = g_variant_builder_end(&gvb); + case SR_CONF_VOLTAGE_TARGET: + if (!devc || !devc->model) + return SR_ERR_ARG; + *data = std_gvar_min_max_step_array(devc->model->channels[channel].voltage); break; - case SR_CONF_OUTPUT_CURRENT_MAX: - g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY); - /* Min, max, step. */ - for (i = 0; i < 3; i++) { - gvar = g_variant_new_double(devc->model->channels[channel].current[i]); - g_variant_builder_add_value(&gvb, gvar); - } - *data = g_variant_builder_end(&gvb); + case SR_CONF_CURRENT_LIMIT: + if (!devc || !devc->model) + return SR_ERR_ARG; + *data = std_gvar_min_max_step_array(devc->model->channels[channel].current); break; default: return SR_ERR_NA; } } - return ret; + return SR_OK; } static int dev_close(struct sr_dev_inst *sdi) @@ -442,6 +357,7 @@ static int dev_close(struct sr_dev_inst *sdi) struct dev_context *devc; devc = sdi->priv; + if (devc->config_dirty) /* Some configuration changes were queued up but didn't * get sent to the device, likely because we were never @@ -451,18 +367,12 @@ static int dev_close(struct sr_dev_inst *sdi) return std_serial_dev_close(sdi); } -static int dev_acquisition_start(const struct sr_dev_inst *sdi, - void *cb_data) +static int dev_acquisition_start(const struct sr_dev_inst *sdi) { struct dev_context *devc; struct sr_serial_dev_inst *serial; uint8_t packet[PACKET_SIZE]; - (void)cb_data; - - if (sdi->status != SR_ST_ACTIVE) - return SR_ERR_DEV_CLOSED; - devc = sdi->priv; memset(devc->packet, 0x44, PACKET_SIZE); devc->packet_size = 0; @@ -472,7 +382,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, serial = sdi->conn; serial_source_add(sdi->session, serial, G_IO_IN, 50, atten_pps3xxx_receive_data, (void *)sdi); - std_session_send_df_header(cb_data, LOG_PREFIX); + std_session_send_df_header(sdi); /* Send a "channel" configuration packet now. */ memset(packet, 0, PACKET_SIZE); @@ -483,30 +393,25 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, return SR_OK; } -static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data) +static int dev_acquisition_stop(struct sr_dev_inst *sdi) { struct dev_context *devc; - (void)cb_data; - - if (sdi->status != SR_ST_ACTIVE) - return SR_ERR_DEV_CLOSED; - devc = sdi->priv; devc->acquisition_running = FALSE; return SR_OK; } -SR_PRIV struct sr_dev_driver atten_pps3203_driver_info = { +static struct sr_dev_driver atten_pps3203_driver_info = { .name = "atten-pps3203", .longname = "Atten PPS3203T-3S", .api_version = 1, - .init = init, - .cleanup = cleanup, + .init = std_init, + .cleanup = std_cleanup, .scan = scan_3203, - .dev_list = dev_list, - .dev_clear = NULL, + .dev_list = std_dev_list, + .dev_clear = std_dev_clear, .config_get = config_get, .config_set = config_set, .config_list = config_list, @@ -514,5 +419,6 @@ 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, }; +SR_REGISTER_DEV_DRIVER(atten_pps3203_driver_info);