X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fhantek-dso%2Fapi.c;h=ba4918d5d5b8b94e195bdf0e3b1c2fb59963c464;hb=c1aae90038456a61d0f9313d34e6107c3440d3e7;hp=4e3c6886ad9e8216d998f4d8c7e1b10e8e99739f;hpb=93b118da4fec6976df924eb77121f07b361b8330;p=libsigrok.git diff --git a/src/hardware/hantek-dso/api.c b/src/hardware/hantek-dso/api.c index 4e3c6886..ba4918d5 100644 --- a/src/hardware/hantek-dso/api.c +++ b/src/hardware/hantek-dso/api.c @@ -29,7 +29,7 @@ #include #include #include -#include "libsigrok.h" +#include #include "libsigrok-internal.h" #include "dso.h" @@ -40,6 +40,8 @@ #define NUM_TIMEBASE 10 #define NUM_VDIV 8 +#define NUM_BUFFER_SIZES 2 + static const uint32_t scanopts[] = { SR_CONF_CONN, }; @@ -69,17 +71,16 @@ 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[] = { @@ -181,7 +182,7 @@ static struct sr_dev_inst *dso_dev_new(const struct dso_profile *prof) * 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++) { + 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]); @@ -207,7 +208,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 = hantek_dso_driver_info.priv; + drvc = hantek_dso_driver_info.context; drvc->instances = g_slist_append(drvc->instances, sdi); return sdi; @@ -272,7 +273,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) const char *conn; char connection_id[64]; - drvc = di->priv; + drvc = di->context; devices = 0; @@ -362,7 +363,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) 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) @@ -471,10 +472,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: @@ -544,13 +542,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: @@ -659,7 +657,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); @@ -768,7 +766,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; @@ -828,8 +826,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; @@ -876,7 +873,7 @@ static int handle_event(int fd, int revents, void *cb_data) sdi = cb_data; di = sdi->driver; - drvc = di->priv; + drvc = di->context; devc = sdi->priv; if (devc->dev_state == STOPPING) { /* We've been told to wind up the acquisition. */ @@ -940,8 +937,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 +973,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data) { struct dev_context *devc; struct sr_dev_driver *di = sdi->driver; - struct drv_context *drvc = di->priv; + struct drv_context *drvc = di->context; if (sdi->status != SR_ST_ACTIVE) return SR_ERR_DEV_CLOSED; @@ -1036,5 +1032,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, };