BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

hantek-dso: Support config_get(SR_CONF_CONN)

This commit is contained in:
Bert Vermeulen 2013-04-18 01:21:57 +02:00
parent 89befd46a8
commit 624f5b4c1e
1 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
hardware/hantek-dso/api.c
View File

@ -40,6 +40,10 @@
#define NUM_TIMEBASE 10 #define NUM_TIMEBASE 10
#define NUM_VDIV 8 #define NUM_VDIV 8
static const int32_t scanopts[] = {
SR_CONF_CONN,
};
static const int32_t devopts[] = { static const int32_t devopts[] = {
SR_CONF_OSCILLOSCOPE, SR_CONF_OSCILLOSCOPE,
SR_CONF_LIMIT_FRAMES, SR_CONF_LIMIT_FRAMES,
@ -402,10 +406,23 @@ static int hw_cleanup(void)
static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi) static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi)
{ {
struct sr_usb_dev_inst *usb;
char str[128];
(void)sdi; (void)sdi;
switch (id) { switch (id) {
case SR_CONF_CONN:
if (!sdi || !sdi->conn)
return SR_ERR;
usb = sdi->conn;
if (usb->address == 255)
/* Device still needs to re-enumerate after firmware
* upload, so we don't know its (future) address. */
return SR_ERR;
snprintf(str, 128, "%d.%d", usb->bus, usb->address);
*data = g_variant_new_string(str);
break;
case SR_CONF_NUM_TIMEBASE: case SR_CONF_NUM_TIMEBASE:
*data = g_variant_new_int32(NUM_TIMEBASE); *data = g_variant_new_int32(NUM_TIMEBASE);
break; break;
@ -560,6 +577,10 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi)
devc = sdi->priv; devc = sdi->priv;
switch (key) { switch (key) {
case SR_CONF_SCAN_OPTIONS:
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32,
scanopts, ARRAY_SIZE(scanopts), sizeof(int32_t));
break;
case SR_CONF_DEVICE_OPTIONS: case SR_CONF_DEVICE_OPTIONS:
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32, *data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32,
devopts, ARRAY_SIZE(devopts), sizeof(int32_t)); devopts, ARRAY_SIZE(devopts), sizeof(int32_t));