/* TODO tune this properly */
#define TICK 1
-static const int hwcaps[] = {
+static const int32_t devopts[] = {
SR_CONF_OSCILLOSCOPE,
- SR_CONF_LIMIT_SAMPLES,
+ SR_CONF_LIMIT_FRAMES,
SR_CONF_CONTINUOUS,
SR_CONF_TIMEBASE,
SR_CONF_BUFFERSIZE,
SR_CONF_FILTER,
SR_CONF_VDIV,
SR_CONF_COUPLING,
- 0,
};
static const char *probe_names[] = {
NULL,
};
+static const uint64_t buffersizes_32k[] = {
+ 10240, 32768,
+};
+static const uint64_t buffersizes_512k[] = {
+ 10240, 524288,
+};
+static const uint64_t buffersizes_14k[] = {
+ 10240, 14336,
+};
+
static const struct dso_profile dev_profiles[] = {
{ 0x04b4, 0x2090, 0x04b5, 0x2090,
"Hantek", "DSO-2090",
- FIRMWARE_DIR "/hantek-dso-2xxx.fw" },
+ buffersizes_32k,
+ FIRMWARE_DIR "/hantek-dso-2090.fw" },
{ 0x04b4, 0x2150, 0x04b5, 0x2150,
"Hantek", "DSO-2150",
- FIRMWARE_DIR "/hantek-dso-2xxx.fw" },
+ buffersizes_32k,
+ FIRMWARE_DIR "/hantek-dso-2150.fw" },
{ 0x04b4, 0x2250, 0x04b5, 0x2250,
"Hantek", "DSO-2250",
- FIRMWARE_DIR "/hantek-dso-2xxx.fw" },
+ buffersizes_512k,
+ FIRMWARE_DIR "/hantek-dso-2250.fw" },
{ 0x04b4, 0x5200, 0x04b5, 0x5200,
"Hantek", "DSO-5200",
- FIRMWARE_DIR "/hantek-dso-5xxx.fw" },
+ buffersizes_14k,
+ FIRMWARE_DIR "/hantek-dso-5200.fw" },
{ 0x04b4, 0x520a, 0x04b5, 0x520a,
"Hantek", "DSO-5200A",
- FIRMWARE_DIR "/hantek-dso-5xxx.fw" },
- { 0, 0, 0, 0, 0, 0, 0 },
-};
-
-static const uint64_t buffersizes[] = {
- 10240,
- 32768,
- /* TODO: 65535 */
- 0,
+ buffersizes_512k,
+ FIRMWARE_DIR "/hantek-dso-5200A.fw" },
+ { 0, 0, 0, 0, 0, 0, 0, 0 },
};
-static const struct sr_rational timebases[] = {
+static const uint64_t timebases[][2] = {
/* microseconds */
{ 10, 1000000 },
{ 20, 1000000 },
{ 100, 1000 },
{ 200, 1000 },
{ 400, 1000 },
- { 0, 0},
};
-static const struct sr_rational vdivs[] = {
+static const uint64_t vdivs[][2] = {
/* millivolts */
{ 10, 1000 },
{ 20, 1000 },
{ 1, 1 },
{ 2, 1 },
{ 5, 1 },
- { 0, 0 },
};
static const char *trigger_sources[] = {
"CH2",
"EXT",
/* TODO: forced */
- NULL,
};
static const char *filter_targets[] = {
"CH1",
"CH2",
/* TODO: "TRIGGER", */
- NULL,
};
static const char *coupling[] = {
"AC",
"DC",
"GND",
- NULL,
};
SR_PRIV struct sr_dev_driver hantek_dso_driver_info;
static int hw_init(struct sr_context *sr_ctx)
{
- struct drv_context *drvc;
-
- if (!(drvc = g_try_malloc0(sizeof(struct drv_context)))) {
- sr_err("Driver context malloc failed.");
- return SR_ERR_MALLOC;
- }
-
- drvc->sr_ctx = sr_ctx;
- di->priv = drvc;
-
- return SR_OK;
+ return std_hw_init(sr_ctx, di, DRIVER_LOG_DOMAIN);
}
static GSList *hw_scan(GSList *options)
(void)options;
- devcnt = 0;
- devices = 0;
drvc = di->priv;
drvc->instances = NULL;
+ devcnt = 0;
+ devices = 0;
+
clear_instances();
/* Find all Hantek DSO devices and upload firmware to all of them. */
static GSList *hw_dev_list(void)
{
- struct drv_context *drvc;
-
- drvc = di->priv;
-
- return drvc->instances;
+ return ((struct drv_context *)(di->priv))->instances;
}
static int hw_dev_open(struct sr_dev_inst *sdi)
return SR_OK;
}
-static int config_get(int id, const void **data, const struct sr_dev_inst *sdi)
-{
- uint64_t tmp;
-
- (void)sdi;
-
- switch (id) {
- /* TODO remove this */
- case SR_CONF_SAMPLERATE:
- *data = &tmp;
- break;
- default:
- return SR_ERR_ARG;
- }
-
- return SR_OK;
-}
-
-static int config_set(int id, const void *value, const struct sr_dev_inst *sdi)
+static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi)
{
struct dev_context *devc;
- struct sr_rational tmp_rat;
- float tmp_float;
- uint64_t tmp_u64;
- int ret, i;
+ double tmp_double;
+ uint64_t tmp_u64, p, q;
+ int tmp_int, ret;
+ unsigned int i;
+ const char *tmp_str;
char **targets;
if (sdi->status != SR_ST_ACTIVE)
devc = sdi->priv;
switch (id) {
case SR_CONF_LIMIT_FRAMES:
- devc->limit_frames = *(const uint64_t *)value;
+ devc->limit_frames = g_variant_get_uint64(data);
break;
case SR_CONF_TRIGGER_SLOPE:
- tmp_u64 = *(const int *)value;
+ tmp_u64 = g_variant_get_uint64(data);
if (tmp_u64 != SLOPE_NEGATIVE && tmp_u64 != SLOPE_POSITIVE)
ret = SR_ERR_ARG;
devc->triggerslope = tmp_u64;
break;
case SR_CONF_HORIZ_TRIGGERPOS:
- tmp_float = *(const float *)value;
- if (tmp_float < 0.0 || tmp_float > 1.0) {
+ 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_float;
+ devc->triggerposition = tmp_double;
break;
case SR_CONF_BUFFERSIZE:
- tmp_u64 = *(const int *)value;
- for (i = 0; buffersizes[i]; i++) {
- if (buffersizes[i] == tmp_u64) {
+ 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 (buffersizes[i] == 0)
+ if (i == 2)
ret = SR_ERR_ARG;
break;
case SR_CONF_TIMEBASE:
- tmp_rat = *(const struct sr_rational *)value;
- for (i = 0; timebases[i].p && timebases[i].q; i++) {
- if (timebases[i].p == tmp_rat.p
- && timebases[i].q == tmp_rat.q) {
- devc->timebase = i;
+ 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 (timebases[i].p == 0 && timebases[i].q == 0)
+ 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(value, trigger_sources[i])) {
- devc->triggersource = g_strdup(value);
+ if (!strcmp(tmp_str, trigger_sources[i])) {
+ devc->triggersource = g_strdup(tmp_str);
break;
}
}
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(value, ",", 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. */
break;
case SR_CONF_VDIV:
/* TODO: Not supporting vdiv per channel yet. */
- tmp_rat = *(const struct sr_rational *)value;
- for (i = 0; vdivs[i].p && vdivs[i].q; i++) {
- if (vdivs[i].p == tmp_rat.p
- && vdivs[i].q == tmp_rat.q) {
- devc->voltage_ch1 = i;
- devc->voltage_ch2 = i;
+ 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 (vdivs[i].p == 0 && vdivs[i].q == 0)
+ 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(value, coupling[i])) {
+ if (!strcmp(tmp_str, coupling[i])) {
devc->coupling_ch1 = i;
devc->coupling_ch2 = i;
break;
return ret;
}
-static int config_list(int key, const void **data, const struct sr_dev_inst *sdi)
+static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi)
{
+ struct dev_context *devc;
(void)sdi;
+ if (!sdi)
+ return SR_ERR_ARG;
+
+ devc = sdi->priv;
switch (key) {
case SR_CONF_DEVICE_OPTIONS:
- *data = hwcaps;
+ *data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32,
+ devopts, ARRAY_SIZE(devopts), sizeof(int32_t));
break;
case SR_CONF_BUFFERSIZE:
- *data = buffersizes;
+ *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT64,
+ devc->profile->buffersizes, 2, sizeof(uint64_t));
break;
case SR_CONF_COUPLING:
- *data = coupling;
+ *data = g_variant_new_strv(coupling, ARRAY_SIZE(coupling));
break;
case SR_CONF_VDIV:
- *data = vdivs;
+ *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT64,
+ vdivs, ARRAY_SIZE(vdivs) * 2, sizeof(uint64_t));
break;
case SR_CONF_FILTER:
- *data = filter_targets;
+ *data = g_variant_new_strv(filter_targets,
+ ARRAY_SIZE(filter_targets));
break;
case SR_CONF_TIMEBASE:
- *data = timebases;
+ *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT64,
+ timebases, ARRAY_SIZE(timebases) * 2, sizeof(uint64_t));
break;
case SR_CONF_TRIGGER_SOURCE:
- *data = trigger_sources;
+ *data = g_variant_new_strv(trigger_sources,
+ ARRAY_SIZE(trigger_sources));
break;
default:
return SR_ERR_ARG;
*/
/* TODO: Support for DSO-5xxx series 9-bit samples. */
if (devc->ch1_enabled) {
- range = ((float)vdivs[devc->voltage_ch1].p / vdivs[devc->voltage_ch1].q) * 8;
+ range = ((float)vdivs[devc->voltage_ch1][0] / vdivs[devc->voltage_ch1][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].p / vdivs[devc->voltage_ch2].q) * 8;
+ range = ((float)vdivs[devc->voltage_ch2][0] / vdivs[devc->voltage_ch2][1]) * 8;
ch2 = range / 255 * *(buf + i * 2);
ch2 -= range / 2;
analog.data[data_offset++] = ch2;
sdi = transfer->user_data;
devc = sdi->priv;
- sr_dbg("receive_transfer(): status %d received %d bytes.",
+ sr_spew("receive_transfer(): status %d received %d bytes.",
transfer->status, transfer->actual_length);
if (transfer->actual_length == 0)
num_samples = transfer->actual_length / 2;
- sr_dbg("Got %d-%d/%d samples in frame.", devc->samp_received + 1,
+ sr_spew("Got %d-%d/%d samples in frame.", devc->samp_received + 1,
devc->samp_received + num_samples, devc->framesize);
/*
void *cb_data)
{
const struct libusb_pollfd **lupfd;
- struct sr_datafeed_packet packet;
- struct sr_datafeed_header header;
struct dev_context *devc;
struct drv_context *drvc = di->priv;
int i;
free(lupfd);
/* Send header packet to the session bus. */
- packet.type = SR_DF_HEADER;
- packet.payload = (unsigned char *)&header;
- header.feed_version = 1;
- gettimeofday(&header.starttime, NULL);
- sr_session_send(cb_data, &packet);
+ std_session_send_df_header(cb_data, DRIVER_LOG_DOMAIN);
return SR_OK;
}
.scan = hw_scan,
.dev_list = hw_dev_list,
.dev_clear = clear_instances,
- .config_get = config_get,
+ .config_get = NULL,
.config_set = config_set,
.config_list = config_list,
.dev_open = hw_dev_open,
projects / libsigrok.git / blobdiff