X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fatten-pps3xxx%2Fapi.c;h=580bc51d4632edb4e947a9033530d4e3729a290c;hb=aac29cc192ccf82b64e77b5e6b11b411da32deed;hp=f29377e34617da5cfb22cdce0fc190e4ea959aa6;hpb=d6fa8ace94ac0c17855c3433cca038a150689495;p=libsigrok.git diff --git a/src/hardware/atten-pps3xxx/api.c b/src/hardware/atten-pps3xxx/api.c index f29377e3..580bc51d 100644 --- a/src/hardware/atten-pps3xxx/api.c +++ b/src/hardware/atten-pps3xxx/api.c @@ -36,12 +36,12 @@ static const uint32_t scanopts[] = { SR_CONF_SERIALCOMM, }; -static const uint32_t devopts_drv[] = { +static const uint32_t drvopts[] = { SR_CONF_POWER_SUPPLY, - SR_CONF_CONTINUOUS, }; -static const uint32_t devopts_global[] = { +static const uint32_t devopts[] = { + SR_CONF_CONTINUOUS | SR_CONF_SET, SR_CONF_OUTPUT_CHANNEL_CONFIG | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, SR_CONF_OVER_CURRENT_PROTECTION_ENABLED | SR_CONF_GET | SR_CONF_SET, }; @@ -164,7 +164,10 @@ 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; @@ -380,7 +383,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst * if (key == SR_CONF_DEVICE_OPTIONS && !sdi) { *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, - devopts_drv, ARRAY_SIZE(devopts_drv), sizeof(uint32_t)); + drvopts, ARRAY_SIZE(drvopts), sizeof(uint32_t)); return SR_OK; } @@ -394,7 +397,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst * switch (key) { case SR_CONF_DEVICE_OPTIONS: *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, - devopts_global, ARRAY_SIZE(devopts_global), sizeof(uint32_t)); + devopts, ARRAY_SIZE(devopts), sizeof(uint32_t)); break; case SR_CONF_OUTPUT_CHANNEL_CONFIG: if (devc->model->channel_modes == CHANMODE_INDEPENDENT) {