X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=blobdiff_plain;f=src%2Fhardware%2Fhantek-dso%2Fapi.c;h=275bbf99d5f7775bf72ecbf1b5990764e9e29208;hp=7bf0c5293b7927d0b042ba617316e0ba97c47c3d;hb=dd5c48a6d567a3cac62c4b0058588273bbeea171;hpb=5ecd9049e53112e75526c2887d3f57165b688c3f diff --git a/src/hardware/hantek-dso/api.c b/src/hardware/hantek-dso/api.c index 7bf0c529..275bbf99 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, }; @@ -49,7 +52,7 @@ static const uint32_t drvopts[] = { }; static const uint32_t devopts[] = { - SR_CONF_CONTINUOUS | SR_CONF_SET, + SR_CONF_CONTINUOUS, SR_CONF_LIMIT_FRAMES | SR_CONF_SET, SR_CONF_CONN | SR_CONF_GET, SR_CONF_TIMEBASE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, @@ -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,41 +72,40 @@ 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" }, - { 0, 0, 0, 0, 0, 0, 0, 0 }, + "hantek-dso-5200A.fw" }, + ALL_ZERO }; static const uint64_t timebases[][2] = { @@ -158,21 +160,19 @@ static const char *coupling[] = { "GND", }; -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); +static int dev_acquisition_stop(struct sr_dev_inst *sdi); -static struct sr_dev_inst *dso_dev_new(const struct dso_profile *prof) +static struct sr_dev_inst *dso_dev_new(struct sr_dev_driver *di, + const struct dso_profile *prof) { struct sr_dev_inst *sdi; struct sr_channel *ch; struct sr_channel_group *cg; struct drv_context *drvc; struct dev_context *devc; - int i; + unsigned int i; - sdi = sr_dev_inst_new(); + 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); @@ -182,9 +182,8 @@ 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++) { - 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 +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 = di->priv; + drvc = di->context; drvc->instances = g_slist_append(drvc->instances, sdi); return sdi; @@ -249,17 +248,12 @@ 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) -{ - 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 +264,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 +302,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)); @@ -323,12 +313,12 @@ static GSList *scan(GSList *options) /* Device matches the pre-firmware profile. */ prof = &dev_profiles[j]; sr_dbg("Found a %s %s.", prof->vendor, prof->model); - sdi = dso_dev_new(prof); + sdi = dso_dev_new(di, prof); 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 @@ -342,7 +332,7 @@ static GSList *scan(GSList *options) /* Device matches the post-firmware profile. */ prof = &dev_profiles[j]; sr_dbg("Found a %s %s.", prof->vendor, prof->model); - sdi = dso_dev_new(prof); + sdi = dso_dev_new(di, prof); sdi->connection_id = g_strdup(connection_id); sdi->status = SR_ST_INACTIVE; devices = g_slist_append(devices, sdi); @@ -362,11 +352,6 @@ static GSList *scan(GSList *options) return devices; } -static GSList *dev_list(void) -{ - return ((struct drv_context *)(di->priv))->instances; -} - static int dev_open(struct sr_dev_inst *sdi) { struct dev_context *devc; @@ -395,7 +380,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,24 +407,18 @@ static int dev_close(struct sr_dev_inst *sdi) return SR_OK; } -static int cleanup(void) -{ - return dev_clear(); -} - static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi, const struct sr_channel_group *cg) { 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 +454,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 +470,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 +524,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 +629,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 +639,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 +663,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 +693,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; @@ -763,7 +739,8 @@ static void send_chunk(struct sr_dev_inst *sdi, unsigned char *buf, analog.data[data_offset++] = ch2; } } - sr_session_send(devc->cb_data, &packet); + sr_session_send(sdi, &packet); + g_free(analog.data); } /* @@ -772,7 +749,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; @@ -781,8 +758,8 @@ static void receive_transfer(struct libusb_transfer *transfer) sdi = transfer->user_data; devc = sdi->priv; - sr_spew("receive_transfer(): status %d received %d bytes.", - transfer->status, transfer->actual_length); + sr_spew("receive_transfer(): status %s received %d bytes.", + libusb_error_name(transfer->status), transfer->actual_length); if (transfer->actual_length == 0) /* Nothing to send to the bus. */ @@ -832,8 +809,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; @@ -852,7 +828,7 @@ static void receive_transfer(struct libusb_transfer *transfer) /* Mark the end of this frame. */ packet.type = SR_DF_FRAME_END; - sr_session_send(devc->cb_data, &packet); + sr_session_send(sdi, &packet); if (devc->limit_frames && ++devc->num_frames == devc->limit_frames) { /* Terminate session */ @@ -868,8 +844,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 +855,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. */ @@ -888,8 +867,7 @@ static int handle_event(int fd, int revents, void *cb_data) */ usb_source_remove(sdi->session, drvc->sr_ctx); - packet.type = SR_DF_END; - sr_session_send(sdi, &packet); + std_session_send_df_end(sdi, LOG_PREFIX); devc->dev_state = IDLE; @@ -941,8 +919,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. */ @@ -974,16 +951,16 @@ static int handle_event(int fd, int revents, void *cb_data) 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 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; devc = sdi->priv; - devc->cb_data = cb_data; if (configure_channels(sdi) != SR_OK) { sr_err("Failed to configure channels."); @@ -999,18 +976,15 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data) devc->dev_state = CAPTURE; usb_source_add(sdi->session, drvc->sr_ctx, TICK, handle_event, (void *)sdi); - /* Send header packet to the session bus. */ - std_session_send_df_header(cb_data, LOG_PREFIX); + std_session_send_df_header(sdi, LOG_PREFIX); 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; @@ -1020,14 +994,14 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data) return SR_OK; } -SR_PRIV struct sr_dev_driver hantek_dso_driver_info = { +static struct sr_dev_driver hantek_dso_driver_info = { .name = "hantek-dso", .longname = "Hantek DSO", .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, @@ -1036,5 +1010,6 @@ 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, }; +SR_REGISTER_DEV_DRIVER(hantek_dso_driver_info);