X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fhantek-dso%2Fapi.c;h=c989d80146ebd4b68e7bed3e6ce1a1ac0fb5a57a;hb=e48a54629242584b7b2508d657815730ad80cbfe;hp=01a080017e2eae8339a828e0c295e97adf3467d1;hpb=d4928d7102c6b2f9f7aa51a1b98669bf148fff80;p=libsigrok.git diff --git a/hardware/hantek-dso/api.c b/hardware/hantek-dso/api.c index 01a08001..c989d801 100644 --- a/hardware/hantek-dso/api.c +++ b/hardware/hantek-dso/api.c @@ -37,43 +37,41 @@ /* TODO tune this properly */ #define TICK 1 -static const int hwcaps[] = { - SR_HWCAP_OSCILLOSCOPE, - SR_HWCAP_LIMIT_SAMPLES, - SR_HWCAP_CONTINUOUS, - SR_HWCAP_TIMEBASE, - SR_HWCAP_BUFFERSIZE, - SR_HWCAP_TRIGGER_SOURCE, - SR_HWCAP_TRIGGER_SLOPE, - SR_HWCAP_HORIZ_TRIGGERPOS, - SR_HWCAP_FILTER, - SR_HWCAP_VDIV, - SR_HWCAP_COUPLING, - 0, +static const int32_t devopts[] = { + SR_CONF_OSCILLOSCOPE, + SR_CONF_LIMIT_FRAMES, + 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, }; static const char *probe_names[] = { - "CH1", - "CH2", + "CH1", "CH2", NULL, }; static const struct dso_profile dev_profiles[] = { { 0x04b4, 0x2090, 0x04b5, 0x2090, "Hantek", "DSO-2090", - FIRMWARE_DIR "/hantek-dso-2xxx.fw" }, + FIRMWARE_DIR "/hantek-dso-2090.fw" }, { 0x04b4, 0x2150, 0x04b5, 0x2150, "Hantek", "DSO-2150", - FIRMWARE_DIR "/hantek-dso-2xxx.fw" }, + FIRMWARE_DIR "/hantek-dso-2150.fw" }, { 0x04b4, 0x2250, 0x04b5, 0x2250, "Hantek", "DSO-2250", - FIRMWARE_DIR "/hantek-dso-2xxx.fw" }, + FIRMWARE_DIR "/hantek-dso-2250.fw" }, { 0x04b4, 0x5200, 0x04b5, 0x5200, "Hantek", "DSO-5200", - FIRMWARE_DIR "/hantek-dso-5xxx.fw" }, + FIRMWARE_DIR "/hantek-dso-5200.fw" }, { 0x04b4, 0x520a, 0x04b5, 0x520a, "Hantek", "DSO-5200A", - FIRMWARE_DIR "/hantek-dso-5xxx.fw" }, + FIRMWARE_DIR "/hantek-dso-5200A.fw" }, { 0, 0, 0, 0, 0, 0, 0 }, }; @@ -81,10 +79,9 @@ static const uint64_t buffersizes[] = { 10240, 32768, /* TODO: 65535 */ - 0, }; -static const struct sr_rational timebases[] = { +static const int32_t timebases[][2] = { /* microseconds */ { 10, 1000000 }, { 20, 1000000 }, @@ -102,10 +99,9 @@ static const struct sr_rational timebases[] = { { 100, 1000 }, { 200, 1000 }, { 400, 1000 }, - { 0, 0}, }; -static const struct sr_rational vdivs[] = { +static const int32_t vdivs[][2] = { /* millivolts */ { 10, 1000 }, { 20, 1000 }, @@ -117,7 +113,6 @@ static const struct sr_rational vdivs[] = { { 1, 1 }, { 2, 1 }, { 5, 1 }, - { 0, 0 }, }; static const char *trigger_sources[] = { @@ -125,25 +120,22 @@ 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 struct sr_dev_driver *hdi = &hantek_dso_driver_info; +static struct sr_dev_driver *di = &hantek_dso_driver_info; static int hw_dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data); @@ -159,7 +151,7 @@ static struct sr_dev_inst *dso_dev_new(int index, const struct dso_profile *prof prof->vendor, prof->model, NULL); if (!sdi) return NULL; - sdi->driver = hdi; + sdi->driver = di; /* * Add only the real probes -- EXT isn't a source of data, only @@ -194,7 +186,7 @@ static struct sr_dev_inst *dso_dev_new(int index, const struct dso_profile *prof devc->triggersource = g_strdup(DEFAULT_TRIGGER_SOURCE); devc->triggerposition = DEFAULT_HORIZ_TRIGGERPOS; sdi->priv = devc; - drvc = hdi->priv; + drvc = di->priv; drvc->instances = g_slist_append(drvc->instances, sdi); return sdi; @@ -203,18 +195,22 @@ static struct sr_dev_inst *dso_dev_new(int index, const struct dso_profile *prof static int configure_probes(const struct sr_dev_inst *sdi) { struct dev_context *devc; - const struct sr_probe *probe; + struct sr_probe *probe; const GSList *l; + int p; devc = sdi->priv; + g_slist_free(devc->enabled_probes); devc->ch1_enabled = devc->ch2_enabled = FALSE; - for (l = sdi->probes; l; l = l->next) { - probe = (struct sr_probe *)l->data; - if (probe->index == 0) + for (l = sdi->probes, p = 0; l; l = l->next, p++) { + probe = l->data; + if (p == 0) devc->ch1_enabled = probe->enabled; - else if (probe->index == 1) + else devc->ch2_enabled = probe->enabled; + if (probe->enabled) + devc->enabled_probes = g_slist_append(devc->enabled_probes, probe); } return SR_OK; @@ -228,7 +224,7 @@ static int clear_instances(void) struct dev_context *devc; GSList *l; - drvc = hdi->priv; + drvc = di->priv; for (l = drvc->instances; l; l = l->next) { if (!(sdi = l->data)) { /* Log error, but continue cleaning up the rest. */ @@ -243,6 +239,7 @@ static int clear_instances(void) dso_close(sdi); sr_usb_dev_inst_free(devc->usb); g_free(devc->triggersource); + g_slist_free(devc->enabled_probes); sr_dev_inst_free(sdi); } @@ -255,17 +252,7 @@ static int clear_instances(void) 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; - hdi->priv = drvc; - - return SR_OK; + return std_hw_init(sr_ctx, di, DRIVER_LOG_DOMAIN); } static GSList *hw_scan(GSList *options) @@ -281,10 +268,11 @@ static GSList *hw_scan(GSList *options) (void)options; + drvc = di->priv; + drvc->instances = NULL; + devcnt = 0; devices = 0; - drvc = hdi->priv; - drvc->instances = NULL; clear_instances(); @@ -346,11 +334,7 @@ static GSList *hw_scan(GSList *options) static GSList *hw_dev_list(void) { - struct drv_context *drvc; - - drvc = hdi->priv; - - return drvc->instances; + return ((struct drv_context *)(di->priv))->instances; } static int hw_dev_open(struct sr_dev_inst *sdi) @@ -410,7 +394,7 @@ static int hw_cleanup(void) { struct drv_context *drvc; - if (!(drvc = hdi->priv)) + if (!(drvc = di->priv)) return SR_OK; clear_instances(); @@ -418,60 +402,15 @@ static int hw_cleanup(void) return SR_OK; } -static int hw_info_get(int info_id, const void **data, - const struct sr_dev_inst *sdi) -{ - uint64_t tmp; - - (void)sdi; - - switch (info_id) { - case SR_DI_HWCAPS: - *data = hwcaps; - break; - case SR_DI_NUM_PROBES: - *data = GINT_TO_POINTER(NUM_PROBES); - break; - case SR_DI_PROBE_NAMES: - *data = probe_names; - break; - case SR_DI_BUFFERSIZES: - *data = buffersizes; - break; - case SR_DI_TIMEBASES: - *data = timebases; - break; - case SR_DI_TRIGGER_SOURCES: - *data = trigger_sources; - break; - case SR_DI_FILTERS: - *data = filter_targets; - break; - case SR_DI_VDIVS: - *data = vdivs; - break; - case SR_DI_COUPLING: - *data = coupling; - break; - /* TODO remove this */ - case SR_DI_CUR_SAMPLERATE: - *data = &tmp; - break; - default: - return SR_ERR_ARG; - } - - return SR_OK; -} - -static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap, - const void *value) +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; + double tmp_double; uint64_t tmp_u64; - int ret, i; + int32_t p, q; + int tmp_int, ret; + unsigned int i; + const char *tmp_str; char **targets; if (sdi->status != SR_ST_ACTIVE) @@ -479,26 +418,26 @@ static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap, ret = SR_OK; devc = sdi->priv; - switch (hwcap) { - case SR_HWCAP_LIMIT_FRAMES: - devc->limit_frames = *(const uint64_t *)value; + switch (id) { + case SR_CONF_LIMIT_FRAMES: + devc->limit_frames = g_variant_get_uint64(data); break; - case SR_HWCAP_TRIGGER_SLOPE: - tmp_u64 = *(const int *)value; + case SR_CONF_TRIGGER_SLOPE: + 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_HWCAP_HORIZ_TRIGGERPOS: - tmp_float = *(const float *)value; - if (tmp_float < 0.0 || tmp_float > 1.0) { + 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_float; + devc->triggerposition = tmp_double; break; - case SR_HWCAP_BUFFERSIZE: - tmp_u64 = *(const int *)value; + case SR_CONF_BUFFERSIZE: + tmp_u64 = g_variant_get_uint64(data); for (i = 0; buffersizes[i]; i++) { if (buffersizes[i] == tmp_u64) { devc->framesize = tmp_u64; @@ -508,31 +447,35 @@ static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap, if (buffersizes[i] == 0) ret = SR_ERR_ARG; break; - case SR_HWCAP_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; + case SR_CONF_TIMEBASE: + g_variant_get(data, "(ii)", &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_HWCAP_TRIGGER_SOURCE: + 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; } } if (trigger_sources[i] == 0) ret = SR_ERR_ARG; break; - case SR_HWCAP_FILTER: + 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. */ @@ -550,24 +493,27 @@ static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap, } g_strfreev(targets); break; - case SR_HWCAP_VDIV: + 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, "(ii)", &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_HWCAP_COUPLING: + 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; @@ -584,18 +530,61 @@ static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap, return ret; } -static void send_chunk(struct dev_context *devc, unsigned char *buf, +static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi) +{ + + (void)sdi; + + switch (key) { + 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: + *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT64, + buffersizes, ARRAY_SIZE(buffersizes), sizeof(uint64_t)); + break; + case SR_CONF_COUPLING: + *data = g_variant_new_strv(coupling, ARRAY_SIZE(coupling)); + break; + case SR_CONF_VDIV: + *data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32, + vdivs, ARRAY_SIZE(vdivs) * 2, sizeof(int32_t)); + break; + case SR_CONF_FILTER: + *data = g_variant_new_strv(filter_targets, + ARRAY_SIZE(filter_targets)); + break; + case SR_CONF_TIMEBASE: + *data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32, + timebases, ARRAY_SIZE(timebases) * 2, sizeof(int32_t)); + break; + case SR_CONF_TRIGGER_SOURCE: + *data = g_variant_new_strv(trigger_sources, + ARRAY_SIZE(trigger_sources)); + break; + default: + return SR_ERR_ARG; + } + + return SR_OK; +} + +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 dev_context *devc; float ch1, ch2, range; int num_probes, data_offset, i; + devc = sdi->priv; num_probes = (devc->ch1_enabled && devc->ch2_enabled) ? 2 : 1; packet.type = SR_DF_ANALOG; packet.payload = &analog; /* TODO: support for 5xxx series 9-bit samples */ + analog.probes = devc->enabled_probes; analog.num_samples = num_samples; analog.mq = SR_MQ_VOLTAGE; analog.unit = SR_UNIT_VOLT; @@ -617,14 +606,14 @@ static void send_chunk(struct dev_context *devc, unsigned char *buf, */ /* 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; @@ -642,10 +631,12 @@ static void send_chunk(struct dev_context *devc, unsigned char *buf, static void receive_transfer(struct libusb_transfer *transfer) { struct sr_datafeed_packet packet; + struct sr_dev_inst *sdi; struct dev_context *devc; int num_samples, pre; - devc = transfer->user_data; + sdi = transfer->user_data; + devc = sdi->priv; sr_dbg("receive_transfer(): status %d received %d bytes.", transfer->status, transfer->actual_length); @@ -692,12 +683,12 @@ static void receive_transfer(struct libusb_transfer *transfer) /* Avoid the corner case where the chunk ended at * exactly the trigger point. */ if (num_samples > pre) - send_chunk(devc, transfer->buffer + pre * 2, + send_chunk(sdi, transfer->buffer + pre * 2, num_samples - pre); } } else { /* Already past the trigger point, just send it all out. */ - send_chunk(devc, transfer->buffer, + send_chunk(sdi, transfer->buffer, num_samples); } @@ -713,7 +704,7 @@ static void receive_transfer(struct libusb_transfer *transfer) * pre-trigger samples out now, in one big chunk. */ sr_dbg("End of frame, sending %d pre-trigger buffered samples.", devc->samp_buffered); - send_chunk(devc, devc->framebuf, devc->samp_buffered); + send_chunk(sdi, devc->framebuf, devc->samp_buffered); /* Mark the end of this frame. */ packet.type = SR_DF_FRAME_END; @@ -734,7 +725,7 @@ static int handle_event(int fd, int revents, void *cb_data) struct sr_datafeed_packet packet; struct timeval tv; struct dev_context *devc; - struct drv_context *drvc = hdi->priv; + struct drv_context *drvc = di->priv; const struct libusb_pollfd **lupfd; int num_probes, i; uint32_t trigger_offset; @@ -815,7 +806,7 @@ static int handle_event(int fd, int revents, void *cb_data) devc->samp_buffered = devc->samp_received = 0; /* Tell the scope to send us the first frame. */ - if (dso_get_channeldata(devc, receive_transfer) != SR_OK) + if (dso_get_channeldata(sdi, receive_transfer) != SR_OK) break; /* @@ -847,11 +838,8 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data) { const struct libusb_pollfd **lupfd; - struct sr_datafeed_packet packet; - struct sr_datafeed_header header; - struct sr_datafeed_meta_analog meta; struct dev_context *devc; - struct drv_context *drvc = hdi->priv; + struct drv_context *drvc = di->priv; int i; if (sdi->status != SR_ST_ACTIVE) @@ -879,17 +867,7 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi, 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); - - /* Send metadata about the SR_DF_ANALOG packets to come. */ - packet.type = SR_DF_META_ANALOG; - packet.payload = &meta; - meta.num_probes = NUM_PROBES; - sr_session_send(cb_data, &packet); + std_session_send_df_header(cb_data, DRIVER_LOG_DOMAIN); return SR_OK; } @@ -918,10 +896,11 @@ SR_PRIV struct sr_dev_driver hantek_dso_driver_info = { .scan = hw_scan, .dev_list = hw_dev_list, .dev_clear = clear_instances, + .config_get = NULL, + .config_set = config_set, + .config_list = config_list, .dev_open = hw_dev_open, .dev_close = hw_dev_close, - .info_get = hw_info_get, - .dev_config_set = hw_dev_config_set, .dev_acquisition_start = hw_dev_acquisition_start, .dev_acquisition_stop = hw_dev_acquisition_stop, .priv = NULL,