* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#include <config.h>
#include <stdio.h>
#include <stdint.h>
#include <stdlib.h>
#include <inttypes.h>
#include <glib.h>
#include <libusb.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
#include "libsigrok-internal.h"
#include "dso.h"
#define NUM_TIMEBASE 10
#define NUM_VDIV 8
-static const int32_t scanopts[] = {
+#define NUM_BUFFER_SIZES 2
+
+static const uint32_t scanopts[] = {
SR_CONF_CONN,
};
-static const int32_t devopts[] = {
+static const uint32_t drvopts[] = {
SR_CONF_OSCILLOSCOPE,
- SR_CONF_LIMIT_FRAMES,
+};
+
+static const uint32_t devopts[] = {
SR_CONF_CONTINUOUS,
- SR_CONF_TIMEBASE,
- SR_CONF_BUFFERSIZE,
- SR_CONF_TRIGGER_SOURCE,
- SR_CONF_TRIGGER_SLOPE,
- SR_CONF_HORIZ_TRIGGERPOS,
- SR_CONF_FILTER,
- SR_CONF_VDIV,
- SR_CONF_COUPLING,
- SR_CONF_NUM_TIMEBASE,
- SR_CONF_NUM_VDIV,
+ SR_CONF_LIMIT_FRAMES | SR_CONF_SET,
+ SR_CONF_CONN | SR_CONF_GET,
+ SR_CONF_TIMEBASE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
+ SR_CONF_BUFFERSIZE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
+ SR_CONF_TRIGGER_SOURCE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
+ SR_CONF_TRIGGER_SLOPE | SR_CONF_GET | SR_CONF_SET,
+ SR_CONF_HORIZ_TRIGGERPOS | SR_CONF_GET | SR_CONF_SET,
+ SR_CONF_NUM_HDIV | SR_CONF_GET,
+ SR_CONF_NUM_VDIV | SR_CONF_GET,
+};
+
+static const uint32_t devopts_cg[] = {
+ SR_CONF_FILTER | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
+ SR_CONF_VDIV | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
+ SR_CONF_COUPLING | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
};
static const char *channel_names[] = {
"CH1", "CH2",
- NULL,
};
static const uint64_t buffersizes_32k[] = {
- 10240, 32768,
+ (10 * 1024), (32 * 1024),
};
static const uint64_t buffersizes_512k[] = {
- 10240, 524288,
+ (10 * 1024), (512 * 1024),
};
static const uint64_t buffersizes_14k[] = {
- 10240, 14336,
+ (10 * 1024), (14 * 1024),
};
static const struct dso_profile dev_profiles[] = {
{ 0x04b4, 0x2090, 0x04b5, 0x2090,
"Hantek", "DSO-2090",
buffersizes_32k,
- FIRMWARE_DIR "/hantek-dso-2090.fw" },
+ "hantek-dso-2090.fw" },
{ 0x04b4, 0x2150, 0x04b5, 0x2150,
"Hantek", "DSO-2150",
buffersizes_32k,
- FIRMWARE_DIR "/hantek-dso-2150.fw" },
+ "hantek-dso-2150.fw" },
{ 0x04b4, 0x2250, 0x04b5, 0x2250,
"Hantek", "DSO-2250",
buffersizes_512k,
- FIRMWARE_DIR "/hantek-dso-2250.fw" },
+ "hantek-dso-2250.fw" },
{ 0x04b4, 0x5200, 0x04b5, 0x5200,
"Hantek", "DSO-5200",
buffersizes_14k,
- FIRMWARE_DIR "/hantek-dso-5200.fw" },
+ "hantek-dso-5200.fw" },
{ 0x04b4, 0x520a, 0x04b5, 0x520a,
"Hantek", "DSO-5200A",
buffersizes_512k,
- FIRMWARE_DIR "/hantek-dso-5200A.fw" },
- { 0, 0, 0, 0, 0, 0, 0, 0 },
+ "hantek-dso-5200A.fw" },
+ ALL_ZERO
};
static const uint64_t timebases[][2] = {
/* TODO: forced */
};
-static const char *filter_targets[] = {
- "CH1",
- "CH2",
- /* TODO: "TRIGGER", */
+static const char *trigger_slopes[] = {
+ "r",
+ "f",
};
static const char *coupling[] = {
"GND",
};
-SR_PRIV struct sr_dev_driver hantek_dso_driver_info;
-static struct sr_dev_driver *di = &hantek_dso_driver_info;
-
-static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data);
+static int dev_acquisition_stop(struct sr_dev_inst *sdi);
-static struct sr_dev_inst *dso_dev_new(int index, const struct dso_profile *prof)
+static struct sr_dev_inst *dso_dev_new(struct sr_dev_driver *di,
+ const struct dso_profile *prof)
{
struct sr_dev_inst *sdi;
struct sr_channel *ch;
+ struct sr_channel_group *cg;
struct drv_context *drvc;
struct dev_context *devc;
- int i;
+ unsigned int i;
- sdi = sr_dev_inst_new(index, SR_ST_INITIALIZING,
- prof->vendor, prof->model, NULL);
- if (!sdi)
- return NULL;
+ sdi = g_malloc0(sizeof(struct sr_dev_inst));
+ sdi->status = SR_ST_INITIALIZING;
+ sdi->vendor = g_strdup(prof->vendor);
+ sdi->model = g_strdup(prof->model);
sdi->driver = di;
/*
* Add only the real channels -- EXT isn't a source of data, only
* a trigger source internal to the device.
*/
- for (i = 0; channel_names[i]; i++) {
- if (!(ch = sr_channel_new(i, SR_CHANNEL_ANALOG, TRUE,
- channel_names[i])))
- return NULL;
- sdi->channels = g_slist_append(sdi->channels, ch);
- }
-
- if (!(devc = g_try_malloc0(sizeof(struct dev_context)))) {
- sr_err("Device context malloc failed.");
- return NULL;
+ for (i = 0; i < ARRAY_SIZE(channel_names); i++) {
+ ch = sr_channel_new(sdi, i, SR_CHANNEL_ANALOG, TRUE, channel_names[i]);
+ cg = g_malloc0(sizeof(struct sr_channel_group));
+ cg->name = g_strdup(channel_names[i]);
+ cg->channels = g_slist_append(cg->channels, ch);
+ sdi->channel_groups = g_slist_append(sdi->channel_groups, cg);
}
+ devc = g_malloc0(sizeof(struct dev_context));
devc->profile = prof;
devc->dev_state = IDLE;
devc->timebase = DEFAULT_TIMEBASE;
devc->ch1_enabled = TRUE;
devc->ch2_enabled = TRUE;
- devc->voltage_ch1 = DEFAULT_VOLTAGE;
- devc->voltage_ch2 = DEFAULT_VOLTAGE;
- devc->coupling_ch1 = DEFAULT_COUPLING;
- devc->coupling_ch2 = DEFAULT_COUPLING;
+ devc->voltage[0] = DEFAULT_VOLTAGE;
+ devc->voltage[1] = DEFAULT_VOLTAGE;
+ devc->coupling[0] = DEFAULT_COUPLING;
+ devc->coupling[1] = DEFAULT_COUPLING;
devc->voffset_ch1 = DEFAULT_VERT_OFFSET;
devc->voffset_ch2 = DEFAULT_VERT_OFFSET;
devc->voffset_trigger = DEFAULT_VERT_TRIGGERPOS;
devc->triggersource = g_strdup(DEFAULT_TRIGGER_SOURCE);
devc->triggerposition = DEFAULT_HORIZ_TRIGGERPOS;
sdi->priv = devc;
- drvc = di->priv;
+ drvc = di->context;
drvc->instances = g_slist_append(drvc->instances, sdi);
return sdi;
}
-static int dev_clear(void)
+static int dev_clear(const struct sr_dev_driver *di)
{
return std_dev_clear(di, clear_dev_context);
}
-static int init(struct sr_context *sr_ctx)
-{
- return std_init(sr_ctx, di, LOG_PREFIX);
-}
-
-static GSList *scan(GSList *options)
+static GSList *scan(struct sr_dev_driver *di, GSList *options)
{
struct drv_context *drvc;
struct dev_context *devc;
GSList *l, *devices, *conn_devices;
struct libusb_device_descriptor des;
libusb_device **devlist;
- int devcnt, ret, i, j;
+ int i, j;
const char *conn;
+ char connection_id[64];
- drvc = di->priv;
+ drvc = di->context;
- devcnt = 0;
devices = 0;
conn = NULL;
continue;
}
- if ((ret = libusb_get_device_descriptor(devlist[i], &des))) {
- sr_err("Failed to get device descriptor: %s.",
- libusb_error_name(ret));
- continue;
- }
+ libusb_get_device_descriptor(devlist[i], &des);
+
+ usb_get_port_path(devlist[i], connection_id, sizeof(connection_id));
prof = NULL;
for (j = 0; dev_profiles[j].orig_vid; j++) {
/* Device matches the pre-firmware profile. */
prof = &dev_profiles[j];
sr_dbg("Found a %s %s.", prof->vendor, prof->model);
- sdi = dso_dev_new(devcnt, prof);
+ sdi = dso_dev_new(di, prof);
+ sdi->connection_id = g_strdup(connection_id);
devices = g_slist_append(devices, sdi);
devc = sdi->priv;
- if (ezusb_upload_firmware(devlist[i], USB_CONFIGURATION,
- prof->firmware) == SR_OK)
+ if (ezusb_upload_firmware(drvc->sr_ctx, devlist[i],
+ USB_CONFIGURATION, prof->firmware) == SR_OK)
/* Remember when the firmware on this device was updated */
devc->fw_updated = g_get_monotonic_time();
else
- sr_err("Firmware upload failed for "
- "device %d.", devcnt);
+ sr_err("Firmware upload failed");
/* Dummy USB address of 0xff will get overwritten later. */
sdi->conn = sr_usb_dev_inst_new(
libusb_get_bus_number(devlist[i]), 0xff, NULL);
- devcnt++;
break;
} else if (des.idVendor == dev_profiles[j].fw_vid
&& des.idProduct == dev_profiles[j].fw_pid) {
/* Device matches the post-firmware profile. */
prof = &dev_profiles[j];
sr_dbg("Found a %s %s.", prof->vendor, prof->model);
- sdi = dso_dev_new(devcnt, prof);
+ sdi = dso_dev_new(di, prof);
+ sdi->connection_id = g_strdup(connection_id);
sdi->status = SR_ST_INACTIVE;
devices = g_slist_append(devices, sdi);
- devc = sdi->priv;
sdi->inst_type = SR_INST_USB;
sdi->conn = sr_usb_dev_inst_new(
libusb_get_bus_number(devlist[i]),
libusb_get_device_address(devlist[i]), NULL);
- devcnt++;
break;
}
}
return devices;
}
-static GSList *dev_list(void)
-{
- return ((struct drv_context *)(di->priv))->instances;
-}
-
static int dev_open(struct sr_dev_inst *sdi)
{
struct dev_context *devc;
timediff_ms = timediff_us / 1000;
sr_spew("Waited %" PRIi64 " ms.", timediff_ms);
}
- sr_info("Device came back after %d ms.", timediff_ms);
+ sr_info("Device came back after %" PRIi64 " ms.", timediff_ms);
} else {
err = dso_open(sdi);
}
return SR_OK;
}
-static int cleanup(void)
-{
- return dev_clear();
-}
-
-static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi,
+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_usb_dev_inst *usb;
char str[128];
+ const char *s;
+ const uint64_t *vdiv;
+ int ch_idx;
- (void)cg;
-
- switch (id) {
- case SR_CONF_CONN:
- if (!sdi || !sdi->conn)
- return SR_ERR_ARG;
- 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:
+ switch (key) {
+ case SR_CONF_NUM_HDIV:
*data = g_variant_new_int32(NUM_TIMEBASE);
break;
case SR_CONF_NUM_VDIV:
*data = g_variant_new_int32(NUM_VDIV);
break;
- default:
- return SR_ERR_NA;
+ }
+
+ if (!sdi)
+ return SR_ERR_ARG;
+
+ devc = sdi->priv;
+ if (!cg) {
+ switch (key) {
+ case SR_CONF_CONN:
+ if (!sdi->conn)
+ return SR_ERR_ARG;
+ 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_TIMEBASE:
+ *data = g_variant_new("(tt)", timebases[devc->timebase][0],
+ timebases[devc->timebase][1]);
+ break;
+ case SR_CONF_BUFFERSIZE:
+ *data = g_variant_new_uint64(devc->framesize);
+ break;
+ case SR_CONF_TRIGGER_SOURCE:
+ *data = g_variant_new_string(devc->triggersource);
+ break;
+ case SR_CONF_TRIGGER_SLOPE:
+ s = (devc->triggerslope == SLOPE_POSITIVE) ? "r" : "f";
+ *data = g_variant_new_string(s);
+ break;
+ case SR_CONF_HORIZ_TRIGGERPOS:
+ *data = g_variant_new_double(devc->triggerposition);
+ break;
+ default:
+ return SR_ERR_NA;
+ }
+ } else {
+ if (sdi->channel_groups->data == cg)
+ ch_idx = 0;
+ else if (sdi->channel_groups->next->data == cg)
+ ch_idx = 1;
+ else
+ return SR_ERR_ARG;
+ switch (key) {
+ case SR_CONF_FILTER:
+ *data = g_variant_new_boolean(devc->filter[ch_idx]);
+ break;
+ case SR_CONF_VDIV:
+ vdiv = vdivs[devc->voltage[ch_idx]];
+ *data = g_variant_new("(tt)", vdiv[0], vdiv[1]);
+ break;
+ case SR_CONF_COUPLING:
+ *data = g_variant_new_string(coupling[devc->coupling[ch_idx]]);
+ break;
+ }
}
return SR_OK;
}
-static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi,
+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;
double tmp_double;
uint64_t tmp_u64, p, q;
- int tmp_int, ret;
+ int tmp_int, ch_idx, ret;
unsigned int i;
const char *tmp_str;
- char **targets;
-
- (void)cg;
if (sdi->status != SR_ST_ACTIVE)
return SR_ERR_DEV_CLOSED;
ret = SR_OK;
devc = sdi->priv;
- switch (id) {
- case SR_CONF_LIMIT_FRAMES:
- devc->limit_frames = g_variant_get_uint64(data);
- break;
- case SR_CONF_TRIGGER_SLOPE:
- tmp_str = g_variant_get_string(data, NULL);
- if (!tmp_str || !(tmp_str[0] == 'f' || tmp_str[0] == 'r'))
- return SR_ERR_ARG;
- devc->triggerslope = (tmp_str[0] == 'r')
- ? SLOPE_POSITIVE : SLOPE_NEGATIVE;
- break;
- case SR_CONF_HORIZ_TRIGGERPOS:
- tmp_double = g_variant_get_double(data);
- if (tmp_double < 0.0 || tmp_double > 1.0) {
- sr_err("Trigger position should be between 0.0 and 1.0.");
- ret = SR_ERR_ARG;
- } else
- devc->triggerposition = tmp_double;
- break;
- case SR_CONF_BUFFERSIZE:
- tmp_u64 = g_variant_get_uint64(data);
- for (i = 0; i < 2; i++) {
- if (devc->profile->buffersizes[i] == tmp_u64) {
- devc->framesize = tmp_u64;
- break;
- }
- }
- if (i == 2)
- ret = SR_ERR_ARG;
- break;
- case SR_CONF_TIMEBASE:
- g_variant_get(data, "(tt)", &p, &q);
- tmp_int = -1;
- for (i = 0; i < ARRAY_SIZE(timebases); i++) {
- if (timebases[i][0] == p && timebases[i][1] == q) {
- tmp_int = i;
- break;
+ if (!cg) {
+ switch (key) {
+ case SR_CONF_LIMIT_FRAMES:
+ devc->limit_frames = g_variant_get_uint64(data);
+ break;
+ case SR_CONF_TRIGGER_SLOPE:
+ tmp_str = g_variant_get_string(data, NULL);
+ if (!tmp_str || !(tmp_str[0] == 'f' || tmp_str[0] == 'r'))
+ return SR_ERR_ARG;
+ devc->triggerslope = (tmp_str[0] == 'r')
+ ? SLOPE_POSITIVE : SLOPE_NEGATIVE;
+ break;
+ case SR_CONF_HORIZ_TRIGGERPOS:
+ tmp_double = g_variant_get_double(data);
+ if (tmp_double < 0.0 || tmp_double > 1.0) {
+ sr_err("Trigger position should be between 0.0 and 1.0.");
+ ret = SR_ERR_ARG;
+ } else
+ devc->triggerposition = tmp_double;
+ break;
+ case SR_CONF_BUFFERSIZE:
+ tmp_u64 = g_variant_get_uint64(data);
+ for (i = 0; i < NUM_BUFFER_SIZES; i++) {
+ if (devc->profile->buffersizes[i] == tmp_u64) {
+ devc->framesize = tmp_u64;
+ break;
+ }
}
- }
- if (tmp_int >= 0)
- devc->timebase = tmp_int;
- else
- ret = SR_ERR_ARG;
- break;
- case SR_CONF_TRIGGER_SOURCE:
- tmp_str = g_variant_get_string(data, NULL);
- for (i = 0; trigger_sources[i]; i++) {
- if (!strcmp(tmp_str, trigger_sources[i])) {
- devc->triggersource = g_strdup(tmp_str);
- break;
+ if (i == NUM_BUFFER_SIZES)
+ ret = SR_ERR_ARG;
+ break;
+ case SR_CONF_TIMEBASE:
+ g_variant_get(data, "(tt)", &p, &q);
+ tmp_int = -1;
+ for (i = 0; i < ARRAY_SIZE(timebases); i++) {
+ if (timebases[i][0] == p && timebases[i][1] == q) {
+ tmp_int = i;
+ break;
+ }
}
- }
- if (trigger_sources[i] == 0)
- ret = SR_ERR_ARG;
- break;
- case SR_CONF_FILTER:
- tmp_str = g_variant_get_string(data, NULL);
- devc->filter_ch1 = devc->filter_ch2 = devc->filter_trigger = 0;
- targets = g_strsplit(tmp_str, ",", 0);
- for (i = 0; targets[i]; i++) {
- if (targets[i] == '\0')
- /* Empty filter string can be used to clear them all. */
- ;
- else if (!strcmp(targets[i], "CH1"))
- devc->filter_ch1 = TRUE;
- else if (!strcmp(targets[i], "CH2"))
- devc->filter_ch2 = TRUE;
- else if (!strcmp(targets[i], "TRIGGER"))
- devc->filter_trigger = TRUE;
- else {
- sr_err("Invalid filter target %s.", targets[i]);
+ if (tmp_int >= 0)
+ devc->timebase = tmp_int;
+ else
ret = SR_ERR_ARG;
+ break;
+ case SR_CONF_TRIGGER_SOURCE:
+ tmp_str = g_variant_get_string(data, NULL);
+ for (i = 0; trigger_sources[i]; i++) {
+ if (!strcmp(tmp_str, trigger_sources[i])) {
+ devc->triggersource = g_strdup(tmp_str);
+ break;
+ }
}
+ if (trigger_sources[i] == 0)
+ ret = SR_ERR_ARG;
+ break;
+ default:
+ ret = SR_ERR_NA;
+ break;
}
- g_strfreev(targets);
- break;
- case SR_CONF_VDIV:
- /* TODO: Not supporting vdiv per channel yet. */
- g_variant_get(data, "(tt)", &p, &q);
- tmp_int = -1;
- for (i = 0; i < ARRAY_SIZE(vdivs); i++) {
- if (vdivs[i][0] == p && vdivs[i][1] == q) {
- tmp_int = i;
- break;
+ } else {
+ if (sdi->channel_groups->data == cg)
+ ch_idx = 0;
+ else if (sdi->channel_groups->next->data == cg)
+ ch_idx = 1;
+ else
+ return SR_ERR_ARG;
+ switch (key) {
+ case SR_CONF_FILTER:
+ devc->filter[ch_idx] = g_variant_get_boolean(data);
+ break;
+ case SR_CONF_VDIV:
+ g_variant_get(data, "(tt)", &p, &q);
+ tmp_int = -1;
+ for (i = 0; i < ARRAY_SIZE(vdivs); i++) {
+ if (vdivs[i][0] == p && vdivs[i][1] == q) {
+ tmp_int = i;
+ break;
+ }
}
- }
- if (tmp_int >= 0) {
- devc->voltage_ch1 = tmp_int;
- devc->voltage_ch2 = tmp_int;
- } else
- ret = SR_ERR_ARG;
- break;
- case SR_CONF_COUPLING:
- tmp_str = g_variant_get_string(data, NULL);
- /* TODO: Not supporting coupling per channel yet. */
- for (i = 0; coupling[i]; i++) {
- if (!strcmp(tmp_str, coupling[i])) {
- devc->coupling_ch1 = i;
- devc->coupling_ch2 = i;
- break;
+ if (tmp_int >= 0) {
+ devc->voltage[ch_idx] = tmp_int;
+ } else
+ ret = SR_ERR_ARG;
+ break;
+ case SR_CONF_COUPLING:
+ tmp_str = g_variant_get_string(data, NULL);
+ for (i = 0; coupling[i]; i++) {
+ if (!strcmp(tmp_str, coupling[i])) {
+ devc->coupling[ch_idx] = i;
+ break;
+ }
}
+ if (coupling[i] == 0)
+ ret = SR_ERR_ARG;
+ break;
+ default:
+ ret = SR_ERR_NA;
+ break;
}
- if (coupling[i] == 0)
- ret = SR_ERR_ARG;
- break;
- default:
- ret = SR_ERR_NA;
- break;
}
return ret;
}
-static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi,
+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;
GVariantBuilder gvb;
unsigned int i;
- (void)cg;
+ 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;
+ } else 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;
+ }
- 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:
- *data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32,
- devopts, ARRAY_SIZE(devopts), sizeof(int32_t));
- break;
- case SR_CONF_BUFFERSIZE:
- if (!sdi)
- return SR_ERR_ARG;
- devc = sdi->priv;
- *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT64,
- devc->profile->buffersizes, 2, sizeof(uint64_t));
- break;
- case SR_CONF_COUPLING:
- *data = g_variant_new_strv(coupling, ARRAY_SIZE(coupling));
- break;
- case SR_CONF_VDIV:
- g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY);
- for (i = 0; i < ARRAY_SIZE(vdivs); i++) {
- rational[0] = g_variant_new_uint64(vdivs[i][0]);
- rational[1] = g_variant_new_uint64(vdivs[i][1]);
- tuple = g_variant_new_tuple(rational, 2);
- g_variant_builder_add_value(&gvb, tuple);
+ if (!sdi)
+ return SR_ERR_ARG;
+
+ if (!cg) {
+ switch (key) {
+ 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_BUFFERSIZE:
+ if (!sdi)
+ return SR_ERR_ARG;
+ devc = sdi->priv;
+ *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT64,
+ devc->profile->buffersizes, NUM_BUFFER_SIZES, sizeof(uint64_t));
+ break;
+ case SR_CONF_TIMEBASE:
+ g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY);
+ for (i = 0; i < ARRAY_SIZE(timebases); i++) {
+ rational[0] = g_variant_new_uint64(timebases[i][0]);
+ rational[1] = g_variant_new_uint64(timebases[i][1]);
+ tuple = g_variant_new_tuple(rational, 2);
+ g_variant_builder_add_value(&gvb, tuple);
+ }
+ *data = g_variant_builder_end(&gvb);
+ break;
+ case SR_CONF_TRIGGER_SOURCE:
+ *data = g_variant_new_strv(trigger_sources,
+ ARRAY_SIZE(trigger_sources));
+ break;
+ case SR_CONF_TRIGGER_SLOPE:
+ *data = g_variant_new_strv(trigger_slopes,
+ ARRAY_SIZE(trigger_slopes));
+ break;
+ default:
+ return SR_ERR_NA;
}
- *data = g_variant_builder_end(&gvb);
- break;
- case SR_CONF_FILTER:
- *data = g_variant_new_strv(filter_targets,
- ARRAY_SIZE(filter_targets));
- break;
- case SR_CONF_TIMEBASE:
- g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY);
- for (i = 0; i < ARRAY_SIZE(timebases); i++) {
- rational[0] = g_variant_new_uint64(timebases[i][0]);
- rational[1] = g_variant_new_uint64(timebases[i][1]);
- tuple = g_variant_new_tuple(rational, 2);
- g_variant_builder_add_value(&gvb, tuple);
+ } else {
+ 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));
+ break;
+ case SR_CONF_COUPLING:
+ *data = g_variant_new_strv(coupling, ARRAY_SIZE(coupling));
+ break;
+ case SR_CONF_VDIV:
+ g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY);
+ for (i = 0; i < ARRAY_SIZE(vdivs); i++) {
+ rational[0] = g_variant_new_uint64(vdivs[i][0]);
+ rational[1] = g_variant_new_uint64(vdivs[i][1]);
+ tuple = g_variant_new_tuple(rational, 2);
+ g_variant_builder_add_value(&gvb, tuple);
+ }
+ *data = g_variant_builder_end(&gvb);
+ break;
+ default:
+ return SR_ERR_NA;
}
- *data = g_variant_builder_end(&gvb);
- break;
- case SR_CONF_TRIGGER_SOURCE:
- *data = g_variant_new_strv(trigger_sources,
- ARRAY_SIZE(trigger_sources));
- break;
- default:
- return SR_ERR_NA;
}
return SR_OK;
int num_samples)
{
struct sr_datafeed_packet packet;
- struct sr_datafeed_analog analog;
+ struct sr_datafeed_analog_old analog;
struct dev_context *devc;
float ch1, ch2, range;
int num_channels, data_offset, i;
devc = sdi->priv;
num_channels = (devc->ch1_enabled && devc->ch2_enabled) ? 2 : 1;
- packet.type = SR_DF_ANALOG;
+ packet.type = SR_DF_ANALOG_OLD;
packet.payload = &analog;
/* TODO: support for 5xxx series 9-bit samples */
analog.channels = devc->enabled_channels;
analog.num_samples = num_samples;
analog.mq = SR_MQ_VOLTAGE;
analog.unit = SR_UNIT_VOLT;
+ analog.mqflags = 0;
/* TODO: Check malloc return value. */
analog.data = g_try_malloc(analog.num_samples * sizeof(float) * num_channels);
data_offset = 0;
*/
/* TODO: Support for DSO-5xxx series 9-bit samples. */
if (devc->ch1_enabled) {
- range = ((float)vdivs[devc->voltage_ch1][0] / vdivs[devc->voltage_ch1][1]) * 8;
+ range = ((float)vdivs[devc->voltage[0]][0] / vdivs[devc->voltage[0]][1]) * 8;
ch1 = range / 255 * *(buf + i * 2 + 1);
/* Value is centered around 0V. */
ch1 -= range / 2;
analog.data[data_offset++] = ch1;
}
if (devc->ch2_enabled) {
- range = ((float)vdivs[devc->voltage_ch2][0] / vdivs[devc->voltage_ch2][1]) * 8;
+ range = ((float)vdivs[devc->voltage[1]][0] / vdivs[devc->voltage[1]][1]) * 8;
ch2 = range / 255 * *(buf + i * 2);
ch2 -= range / 2;
analog.data[data_offset++] = ch2;
}
}
- sr_session_send(devc->cb_data, &packet);
+ sr_session_send(sdi, &packet);
+ g_free(analog.data);
}
/*
* queued up beforehand, so this just needs to chuck the incoming data onto
* the libsigrok session bus.
*/
-static void receive_transfer(struct libusb_transfer *transfer)
+static void LIBUSB_CALL receive_transfer(struct libusb_transfer *transfer)
{
struct sr_datafeed_packet packet;
struct sr_dev_inst *sdi;
sdi = transfer->user_data;
devc = sdi->priv;
- sr_spew("receive_transfer(): status %d received %d bytes.",
- transfer->status, transfer->actual_length);
+ sr_spew("receive_transfer(): status %s received %d bytes.",
+ libusb_error_name(transfer->status), transfer->actual_length);
if (transfer->actual_length == 0)
/* Nothing to send to the bus. */
}
} else {
/* Already past the trigger point, just send it all out. */
- send_chunk(sdi, transfer->buffer,
- num_samples);
+ send_chunk(sdi, transfer->buffer, num_samples);
}
devc->samp_received += num_samples;
/* Mark the end of this frame. */
packet.type = SR_DF_FRAME_END;
- sr_session_send(devc->cb_data, &packet);
+ sr_session_send(sdi, &packet);
if (devc->limit_frames && ++devc->num_frames == devc->limit_frames) {
/* Terminate session */
const struct sr_dev_inst *sdi;
struct sr_datafeed_packet packet;
struct timeval tv;
+ struct sr_dev_driver *di;
struct dev_context *devc;
- struct drv_context *drvc = di->priv;
+ struct drv_context *drvc;
int num_channels;
uint32_t trigger_offset;
uint8_t capturestate;
(void)revents;
sdi = cb_data;
+ di = sdi->driver;
+ drvc = di->context;
devc = sdi->priv;
if (devc->dev_state == STOPPING) {
/* We've been told to wind up the acquisition. */
*/
usb_source_remove(sdi->session, drvc->sr_ctx);
- packet.type = SR_DF_END;
- sr_session_send(sdi, &packet);
+ std_session_send_df_end(sdi, LOG_PREFIX);
devc->dev_state = IDLE;
devc->trigger_offset = trigger_offset;
num_channels = (devc->ch1_enabled && devc->ch2_enabled) ? 2 : 1;
- /* TODO: Check malloc return value. */
- devc->framebuf = g_try_malloc(devc->framesize * num_channels * 2);
+ devc->framebuf = g_malloc(devc->framesize * num_channels * 2);
devc->samp_buffered = devc->samp_received = 0;
/* Tell the scope to send us the first frame. */
return TRUE;
}
-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 drv_context *drvc = di->priv;
+ struct sr_dev_driver *di = sdi->driver;
+ struct drv_context *drvc = di->context;
if (sdi->status != SR_ST_ACTIVE)
return SR_ERR_DEV_CLOSED;
devc = sdi->priv;
- devc->cb_data = cb_data;
if (configure_channels(sdi) != SR_OK) {
sr_err("Failed to configure channels.");
devc->dev_state = CAPTURE;
usb_source_add(sdi->session, drvc->sr_ctx, TICK, handle_event, (void *)sdi);
- /* Send header packet to the session bus. */
- std_session_send_df_header(cb_data, LOG_PREFIX);
+ std_session_send_df_header(sdi, LOG_PREFIX);
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;
return SR_OK;
}
-SR_PRIV struct sr_dev_driver hantek_dso_driver_info = {
+static struct sr_dev_driver hantek_dso_driver_info = {
.name = "hantek-dso",
.longname = "Hantek DSO",
.api_version = 1,
- .init = init,
- .cleanup = cleanup,
+ .init = std_init,
+ .cleanup = std_cleanup,
.scan = scan,
- .dev_list = dev_list,
+ .dev_list = std_dev_list,
.dev_clear = dev_clear,
.config_get = config_get,
.config_set = config_set,
.dev_close = dev_close,
.dev_acquisition_start = dev_acquisition_start,
.dev_acquisition_stop = dev_acquisition_stop,
- .priv = NULL,
+ .context = NULL,
};
+SR_REGISTER_DEV_DRIVER(hantek_dso_driver_info);
projects / libsigrok.git / blobdiff