X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Frigol-ds%2Fapi.c;h=3febe605f8230d1e60d951ab23038a1015ecc397;hb=41812aca436805b0614f2a8f31cf2f8ce494aea0;hp=60d63d5913956f50c20277faba9a2254fa6ba395;hpb=702f42e8eb33d8d1ffb5b748097428c0f4434c6d;p=libsigrok.git diff --git a/src/hardware/rigol-ds/api.c b/src/hardware/rigol-ds/api.c index 60d63d59..3febe605 100644 --- a/src/hardware/rigol-ds/api.c +++ b/src/hardware/rigol-ds/api.c @@ -23,6 +23,7 @@ #include #include #include +#include #include #include #include "libsigrok.h" @@ -247,7 +248,6 @@ static const struct rigol_ds_model supported_models[] = { }; SR_PRIV struct sr_dev_driver rigol_ds_driver_info; -static struct sr_dev_driver *di = &rigol_ds_driver_info; static void clear_helper(void *priv) { @@ -265,12 +265,12 @@ static void clear_helper(void *priv) g_free(devc); } -static int dev_clear(void) +static int dev_clear(const struct sr_dev_driver *di) { return std_dev_clear(di, clear_helper); } -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); } @@ -316,7 +316,7 @@ static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi) sdi->model = g_strdup(model->name); sdi->version = g_strdup(hw_info->firmware_version); sdi->conn = scpi; - sdi->driver = di; + sdi->driver = &rigol_ds_driver_info; sdi->inst_type = SR_INST_SCPI; sdi->serial_num = g_strdup(hw_info->serial_number); devc = g_malloc0(sizeof(struct dev_context)); @@ -344,7 +344,7 @@ static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi) break; sr_dbg("Found DS1000 firmware < 0.2.4, using raw data format."); devc->format = FORMAT_RAW; - } while(0); + } while (0); g_strfreev(version); } @@ -354,8 +354,7 @@ static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi) model->analog_channels); for (i = 0; i < model->analog_channels; i++) { - if (!(channel_name = g_strdup_printf("CH%d", i + 1))) - return NULL; + channel_name = g_strdup_printf("CH%d", i + 1); ch = sr_channel_new(sdi, i, SR_CHANNEL_ANALOG, TRUE, channel_name); devc->analog_groups[i] = g_malloc0(sizeof(struct sr_channel_group)); @@ -370,8 +369,7 @@ static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi) devc->digital_group = g_malloc0(sizeof(struct sr_channel_group)); for (i = 0; i < ARRAY_SIZE(devc->digital_channels); i++) { - if (!(channel_name = g_strdup_printf("D%d", i))) - return NULL; + channel_name = g_strdup_printf("D%d", i); ch = sr_channel_new(sdi, i, SR_CHANNEL_LOGIC, TRUE, channel_name); g_free(channel_name); devc->digital_group->channels = g_slist_append( @@ -389,16 +387,16 @@ static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi) devc->num_timebases = &timebases[i] - devc->timebases + 1; } - for (i = 0; i < NUM_VDIV; i++) - if (!memcmp(&devc->model->series->min_vdiv, &vdivs[i], sizeof(uint64_t[2]))) { + for (i = 0; i < NUM_VDIV; i++) { + if (!memcmp(&devc->model->series->min_vdiv, + &vdivs[i], sizeof(uint64_t[2]))) { devc->vdivs = &vdivs[i]; devc->num_vdivs = NUM_VDIV - i; } + } - if (!(devc->buffer = g_try_malloc(ACQ_BUFFER_SIZE))) - return NULL; - if (!(devc->data = g_try_malloc(ACQ_BUFFER_SIZE * sizeof(float)))) - return NULL; + devc->buffer = g_malloc(ACQ_BUFFER_SIZE); + devc->data = g_malloc(ACQ_BUFFER_SIZE * sizeof(float)); devc->data_source = DATA_SOURCE_LIVE; @@ -407,14 +405,14 @@ static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi) return sdi; } -static GSList *scan(GSList *options) +static GSList *scan(struct sr_dev_driver *di, GSList *options) { - return sr_scpi_scan(di->priv, options, probe_device); + return sr_scpi_scan(di->context, options, probe_device); } -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 dev_open(struct sr_dev_inst *sdi) @@ -460,9 +458,9 @@ static int dev_close(struct sr_dev_inst *sdi) return SR_OK; } -static int cleanup(void) +static int cleanup(const struct sr_dev_driver *di) { - return dev_clear(); + return dev_clear(di); } static int analog_frame_size(const struct sr_dev_inst *sdi) @@ -631,7 +629,6 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s *data = g_variant_new_string(devc->coupling[analog_channel]); break; default: - sr_dbg("Tried to get unknown config key: %d.", key); return SR_ERR_NA; } @@ -796,9 +793,7 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd } break; default: - sr_dbg("Tried to set unknown config key: %d.", key); - ret = SR_ERR_NA; - break; + return SR_ERR_NA; } return ret; @@ -819,7 +814,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, scanopts, ARRAY_SIZE(scanopts), sizeof(uint32_t)); return SR_OK; - } else if (key == SR_CONF_DEVICE_OPTIONS && cg == NULL) { + } else if (key == SR_CONF_DEVICE_OPTIONS && !cg) { *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, devopts, ARRAY_SIZE(devopts), sizeof(uint32_t)); return SR_OK; @@ -922,7 +917,6 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst * } break; default: - sr_dbg("Tried to list unknown config key: %d.", key); return SR_ERR_NA; } @@ -1097,5 +1091,5 @@ SR_PRIV struct sr_dev_driver rigol_ds_driver_info = { .dev_close = dev_close, .dev_acquisition_start = dev_acquisition_start, .dev_acquisition_stop = dev_acquisition_stop, - .priv = NULL, + .context = NULL, };