X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fhantek-dso%2Fapi.c;h=1c9289e5712efbf40a7aaf5127fb0443a4f65d71;hb=32ba0d80054df01767ec323c621ab1c6bc5f310c;hp=efd36853dfc36ea7a1058e9aad31cba810018ff1;hpb=aac29cc192ccf82b64e77b5e6b11b411da32deed;p=libsigrok.git
diff --git a/src/hardware/hantek-dso/api.c b/src/hardware/hantek-dso/api.c
index efd36853..1c9289e5 100644
--- a/src/hardware/hantek-dso/api.c
+++ b/src/hardware/hantek-dso/api.c
@@ -17,6 +17,7 @@
* along with this program. If not, see .
*/
+#include
#include
#include
#include
@@ -29,7 +30,7 @@
#include
#include
#include
-#include "libsigrok.h"
+#include
#include "libsigrok-internal.h"
#include "dso.h"
@@ -40,6 +41,8 @@
#define NUM_TIMEBASE 10
#define NUM_VDIV 8
+#define NUM_BUFFER_SIZES 2
+
static const uint32_t scanopts[] = {
SR_CONF_CONN,
};
@@ -57,7 +60,7 @@ static const uint32_t devopts[] = {
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_TIMEBASE | SR_CONF_GET,
+ SR_CONF_NUM_HDIV | SR_CONF_GET,
SR_CONF_NUM_VDIV | SR_CONF_GET,
};
@@ -69,40 +72,39 @@ static const uint32_t devopts_cg[] = {
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" },
+ "hantek-dso-5200A.fw" },
{ 0, 0, 0, 0, 0, 0, 0, 0 },
};
@@ -159,7 +161,6 @@ static const char *coupling[] = {
};
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);
@@ -170,21 +171,20 @@ static struct sr_dev_inst *dso_dev_new(const struct dso_profile *prof)
struct sr_channel_group *cg;
struct drv_context *drvc;
struct dev_context *devc;
- int i;
+ unsigned int i;
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;
+ sdi->driver = &hantek_dso_driver_info;
/*
* 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++) {
- ch = sr_channel_new(i, SR_CHANNEL_ANALOG, TRUE, channel_names[i]);
- sdi->channels = g_slist_append(sdi->channels, ch);
+ 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);
@@ -209,7 +209,7 @@ static struct sr_dev_inst *dso_dev_new(const struct dso_profile *prof)
devc->triggersource = g_strdup(DEFAULT_TRIGGER_SOURCE);
devc->triggerposition = DEFAULT_HORIZ_TRIGGERPOS;
sdi->priv = devc;
- drvc = di->priv;
+ drvc = hantek_dso_driver_info.context;
drvc->instances = g_slist_append(drvc->instances, sdi);
return sdi;
@@ -249,17 +249,17 @@ static void clear_dev_context(void *priv)
}
-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)
+static int init(struct sr_dev_driver *di, 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;
@@ -270,11 +270,11 @@ static GSList *scan(GSList *options)
GSList *l, *devices, *conn_devices;
struct libusb_device_descriptor des;
libusb_device **devlist;
- int ret, i, j;
+ int i, j;
const char *conn;
char connection_id[64];
- drvc = di->priv;
+ drvc = di->context;
devices = 0;
@@ -308,11 +308,7 @@ static GSList *scan(GSList *options)
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));
@@ -327,8 +323,8 @@ static GSList *scan(GSList *options)
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
@@ -362,9 +358,9 @@ static GSList *scan(GSList *options)
return devices;
}
-static GSList *dev_list(void)
+static GSList *dev_list(const struct sr_dev_driver *di)
{
- return ((struct drv_context *)(di->priv))->instances;
+ return ((struct drv_context *)(di->context))->instances;
}
static int dev_open(struct sr_dev_inst *sdi)
@@ -395,7 +391,7 @@ static int dev_open(struct sr_dev_inst *sdi)
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);
}
@@ -422,9 +418,9 @@ static int dev_close(struct sr_dev_inst *sdi)
return SR_OK;
}
-static int cleanup(void)
+static int cleanup(const struct sr_dev_driver *di)
{
- return dev_clear();
+ return dev_clear(di);
}
static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,
@@ -432,14 +428,13 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s
{
struct dev_context *devc;
struct sr_usb_dev_inst *usb;
- char str[128], *s;
+ char str[128];
+ const char *s;
const uint64_t *vdiv;
int ch_idx;
- (void)cg;
-
switch (key) {
- case SR_CONF_NUM_TIMEBASE:
+ case SR_CONF_NUM_HDIV:
*data = g_variant_new_int32(NUM_TIMEBASE);
break;
case SR_CONF_NUM_VDIV:
@@ -475,10 +470,7 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s
*data = g_variant_new_string(devc->triggersource);
break;
case SR_CONF_TRIGGER_SLOPE:
- if (devc->triggerslope == SLOPE_POSITIVE)
- s = "r";
- else
- s = "f";
+ s = (devc->triggerslope == SLOPE_POSITIVE) ? "r" : "f";
*data = g_variant_new_string(s);
break;
case SR_CONF_HORIZ_TRIGGERPOS:
@@ -494,7 +486,7 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s
ch_idx = 1;
else
return SR_ERR_ARG;
- switch(key) {
+ switch (key) {
case SR_CONF_FILTER:
*data = g_variant_new_boolean(devc->filter[ch_idx]);
break;
@@ -548,13 +540,13 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
break;
case SR_CONF_BUFFERSIZE:
tmp_u64 = g_variant_get_uint64(data);
- for (i = 0; i < 2; i++) {
+ for (i = 0; i < NUM_BUFFER_SIZES; i++) {
if (devc->profile->buffersizes[i] == tmp_u64) {
devc->framesize = tmp_u64;
break;
}
}
- if (i == 2)
+ if (i == NUM_BUFFER_SIZES)
ret = SR_ERR_ARG;
break;
case SR_CONF_TIMEBASE:
@@ -653,7 +645,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
return SR_ERR_ARG;
if (!cg) {
- switch (key) {
+ switch (key) {
case SR_CONF_DEVICE_OPTIONS:
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
devopts, ARRAY_SIZE(devopts), sizeof(uint32_t));
@@ -663,7 +655,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
return SR_ERR_ARG;
devc = sdi->priv;
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT64,
- devc->profile->buffersizes, 2, sizeof(uint64_t));
+ devc->profile->buffersizes, NUM_BUFFER_SIZES, sizeof(uint64_t));
break;
case SR_CONF_TIMEBASE:
g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY);
@@ -687,7 +679,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
return SR_ERR_NA;
}
} else {
- switch (key) {
+ 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));
@@ -717,14 +709,14 @@ static void send_chunk(struct sr_dev_inst *sdi, unsigned char *buf,
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;
@@ -764,6 +756,7 @@ static void send_chunk(struct sr_dev_inst *sdi, unsigned char *buf,
}
}
sr_session_send(devc->cb_data, &packet);
+ g_free(analog.data);
}
/*
@@ -772,7 +765,7 @@ static void send_chunk(struct sr_dev_inst *sdi, unsigned char *buf,
* 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;
@@ -832,8 +825,7 @@ static void receive_transfer(struct libusb_transfer *transfer)
}
} 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;
@@ -868,8 +860,9 @@ static int handle_event(int fd, int revents, void *cb_data)
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;
@@ -878,6 +871,8 @@ static int handle_event(int fd, int revents, void *cb_data)
(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. */
@@ -941,8 +936,7 @@ static int handle_event(int fd, int revents, void *cb_data)
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. */
@@ -977,7 +971,8 @@ static int handle_event(int fd, int revents, void *cb_data)
static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
{
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;
@@ -1036,5 +1031,5 @@ SR_PRIV struct sr_dev_driver hantek_dso_driver_info = {
.dev_close = dev_close,
.dev_acquisition_start = dev_acquisition_start,
.dev_acquisition_stop = dev_acquisition_stop,
- .priv = NULL,
+ .context = NULL,
};