"CH1", "CH2",
};
-static const char *coupling[] = {
+static const char *dc_coupling[] = {
+ "DC", "DC",
+};
+
+static const char *acdc_coupling[] = {
"AC", "DC",
};
{
0x04b4, 0x6022, 0x04b5, 0x6022,
"Hantek", "6022BE", "hantek-6022be.fw",
+ dc_coupling, ARRAY_SIZE(dc_coupling),
},
{
0x8102, 0x8102, 0x1D50, 0x608E,
"Sainsmart", "DDS120", "sainsmart-dds120.fw",
+ acdc_coupling, ARRAY_SIZE(acdc_coupling),
},
ALL_ZERO
};
VDIV_VALUES
};
-SR_PRIV struct sr_dev_driver hantek_6xxx_driver_info;
-
static int read_channel(const struct sr_dev_inst *sdi, uint32_t amount);
-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 *hantek_6xxx_dev_new(const struct hantek_6xxx_profile *prof)
{
struct sr_dev_inst *sdi;
struct sr_channel *ch;
struct sr_channel_group *cg;
- struct drv_context *drvc;
struct dev_context *devc;
unsigned int i;
sdi->status = SR_ST_INITIALIZING;
sdi->vendor = g_strdup(prof->vendor);
sdi->model = g_strdup(prof->model);
- sdi->driver = &hantek_6xxx_driver_info;
for (i = 0; i < ARRAY_SIZE(channel_names); i++) {
ch = sr_channel_new(sdi, i, SR_CHANNEL_ANALOG, TRUE, channel_names[i]);
devc->voltage[i] = DEFAULT_VOLTAGE;
devc->coupling[i] = DEFAULT_COUPLING;
}
+ devc->coupling_vals = prof->coupling_vals;
+ devc->coupling_tab_size = prof->coupling_tab_size;
devc->sample_buf = NULL;
devc->sample_buf_write = 0;
devc->samplerate = DEFAULT_SAMPLERATE;
sdi->priv = devc;
- drvc = sdi->driver->context;
- drvc->instances = g_slist_append(drvc->instances, sdi);
return sdi;
}
return std_dev_clear(di, clear_dev_context);
}
-static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
-{
- return std_init(sr_ctx, di, LOG_PREFIX);
-}
-
static GSList *scan(struct sr_dev_driver *di, GSList *options)
{
struct drv_context *drvc;
}
libusb_free_device_list(devlist, 1);
- return devices;
-}
-
-static GSList *dev_list(const struct sr_dev_driver *di)
-{
- return ((struct drv_context *)(di->context))->instances;
+ return std_scan_complete(di, devices);
}
static int dev_open(struct sr_dev_inst *sdi)
return SR_OK;
}
-static int cleanup(const struct sr_dev_driver *di)
-{
- return dev_clear(di);
-}
-
static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,
const struct sr_channel_group *cg)
{
*data = g_variant_new("(tt)", vdiv[0], vdiv[1]);
break;
case SR_CONF_COUPLING:
- *data = g_variant_new_string(coupling[devc->coupling[ch_idx]]);
+ *data = g_variant_new_string(devc->coupling_vals[devc->coupling[ch_idx]]);
break;
}
}
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])) {
+ for (i = 0; devc->coupling_vals[i]; i++) {
+ if (!strcmp(tmp_str, devc->coupling_vals[i])) {
devc->coupling[ch_idx] = i;
break;
}
}
- if (coupling[i] == 0)
+ if (devc->coupling_vals[i] == 0)
ret = SR_ERR_ARG;
break;
default:
GVariantBuilder gvb;
unsigned int i;
GVariant *gvar;
+ struct dev_context *devc;
+
+ devc = sdi->priv;
if (key == SR_CONF_SCAN_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));
+ *data = g_variant_new_strv(devc->coupling_vals, devc->coupling_tab_size);
break;
case SR_CONF_VDIV:
g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY);
static uint32_t data_amount(const struct sr_dev_inst *sdi)
{
struct dev_context *devc = sdi->priv;
- uint32_t data_left;
+ uint32_t data_left, data_left_2, i;
int32_t time_left;
if (devc->limit_msec) {
data_left = devc->samplerate * NUM_CHANNELS;
}
- data_left += MIN_PACKET_SIZE; /* Driver does not handle small buffers. */
+ /* Round up to nearest power of two. */
+ for (i = MIN_PACKET_SIZE; i < data_left; i *= 2)
+ ;
+ data_left_2 = i;
- sr_spew("data_amount %u", data_left);
+ sr_spew("data_amount: %u (rounded to power of 2: %u)", data_left, data_left_2);
- return data_left;
+ return data_left_2;
}
static void send_chunk(struct sr_dev_inst *sdi, unsigned char *buf,
int num_samples)
{
struct sr_datafeed_packet packet;
- struct sr_datafeed_analog_old analog;
+ struct sr_datafeed_analog analog;
+ struct sr_analog_encoding encoding;
+ struct sr_analog_meaning meaning;
+ struct sr_analog_spec spec;
struct dev_context *devc = sdi->priv;
int num_channels, data_offset, i;
const gboolean ch1_ena = !!devc->ch_enabled[0];
const gboolean ch2_ena = !!devc->ch_enabled[1];
+ sr_analog_init(&analog, &encoding, &meaning, &spec, 0);
+
num_channels = (ch1_ena && ch2_ena) ? 2 : 1;
- packet.type = SR_DF_ANALOG_OLD;
+ packet.type = SR_DF_ANALOG;
packet.payload = &analog;
- analog.channels = devc->enabled_channels;
+ analog.meaning->channels = devc->enabled_channels;
analog.num_samples = num_samples;
- analog.mq = SR_MQ_VOLTAGE;
- analog.unit = SR_UNIT_VOLT;
- analog.mqflags = 0;
+ analog.meaning->mq = SR_MQ_VOLTAGE;
+ analog.meaning->unit = SR_UNIT_VOLT;
+ analog.meaning->mqflags = 0;
analog.data = g_try_malloc(analog.num_samples * sizeof(float) * num_channels);
if (!analog.data) {
* represents 5V peak-to-peak where 0 = -2.5V and 255 = +2.5V.
*/
if (ch1_ena)
- analog.data[data_offset++] = (ch1_bit * *(buf + i * 2) - ch1_center);
+ ((float *)analog.data)[data_offset++] = (ch1_bit * *(buf + i * 2) - ch1_center);
if (ch2_ena)
- analog.data[data_offset++] = (ch2_bit * *(buf + i * 2 + 1) - ch2_center);
+ ((float *)analog.data)[data_offset++] = (ch2_bit * *(buf + i * 2 + 1) - ch2_center);
}
- sr_session_send(devc->cb_data, &packet);
+ sr_session_send(sdi, &packet);
g_free(analog.data);
}
PRIu64 " <= %" PRIu64, devc->limit_samples,
devc->samp_received);
send_data(sdi, devc->sample_buf, devc->limit_samples);
- sdi->driver->dev_acquisition_stop(sdi, NULL);
+ sdi->driver->dev_acquisition_stop(sdi);
} else if (devc->limit_msec && (g_get_monotonic_time() -
devc->aq_started) / 1000 >= devc->limit_msec) {
sr_info("Requested time limit reached, stopping. %d <= %d",
send_data(sdi, devc->sample_buf, devc->samp_received);
g_free(devc->sample_buf);
devc->sample_buf = NULL;
- sdi->driver->dev_acquisition_stop(sdi, NULL);
+ sdi->driver->dev_acquisition_stop(sdi);
} else {
read_channel(sdi, data_amount(sdi));
}
*/
usb_source_remove(sdi->session, drvc->sr_ctx);
- std_session_send_df_end(sdi, LOG_PREFIX);
+ std_session_send_df_end(sdi);
devc->dev_state = IDLE;
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 sr_dev_driver *di = sdi->driver;
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.");
if (hantek_6xxx_init(sdi) != SR_OK)
return SR_ERR;
- std_session_send_df_header(cb_data, LOG_PREFIX);
+ std_session_send_df_header(sdi);
devc->samp_received = 0;
devc->dev_state = FLUSH;
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_6xxx_driver_info = {
+static struct sr_dev_driver hantek_6xxx_driver_info = {
.name = "hantek-6xxx",
.longname = "Hantek 6xxx",
.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_acquisition_stop = dev_acquisition_stop,
.context = NULL,
};
+SR_REGISTER_DEV_DRIVER(hantek_6xxx_driver_info);
projects / libsigrok.git / blobdiff