/*
- * This file is part of the sigrok project.
+ * This file is part of the libsigrok project.
*
* Copyright (C) 2012 Bert Vermeulen <bert@biot.com>
* With protocol information from the hantekdso project,
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "sigrok.h"
-#include "sigrok-internal.h"
-#include "config.h"
+#include "libsigrok.h"
+#include "libsigrok-internal.h"
#include "dso.h"
#include <string.h>
#include <glib.h>
#include <libusb.h>
-#include <arpa/inet.h>
-extern libusb_context *usb_context;
-extern GSList *dev_insts;
+extern struct sr_dev_driver hantek_dso_driver_info;
-
-static int send_begin(struct context *ctx)
+static int send_begin(const struct sr_dev_inst *sdi)
{
+ struct sr_usb_dev_inst *usb;
int ret;
unsigned char buffer[] = {0x0f, 0x03, 0x03, 0x03, 0x68, 0xac, 0xfe,
0x00, 0x01, 0x00};
- sr_dbg("hantek-dso: sending CTRL_BEGINCOMMAND");
+ sr_dbg("Sending CTRL_BEGINCOMMAND.");
- if ((ret = libusb_control_transfer(ctx->usb->devhdl,
+ usb = sdi->conn;
+ if ((ret = libusb_control_transfer(usb->devhdl,
LIBUSB_REQUEST_TYPE_VENDOR, CTRL_BEGINCOMMAND,
0, 0, buffer, sizeof(buffer), 200)) != sizeof(buffer)) {
- sr_err("failed to send begincommand: %d", ret);
+ sr_err("Failed to send begincommand: %s.",
+ libusb_error_name(ret));
return SR_ERR;
}
return SR_OK;
}
-static int send_bulkcmd(struct context *ctx, uint8_t *cmdstring, int cmdlen)
+static int send_bulkcmd(const struct sr_dev_inst *sdi, uint8_t *cmdstring, int cmdlen)
{
+ struct sr_usb_dev_inst *usb;
int ret, tmp;
- if (send_begin(ctx) != SR_OK)
+ usb = sdi->conn;
+
+ if (send_begin(sdi) != SR_OK)
return SR_ERR;
- if ((ret = libusb_bulk_transfer(ctx->usb->devhdl,
- DSO_EP_OUT | LIBUSB_ENDPOINT_OUT,
- cmdstring, cmdlen, &tmp, 200)) != 0)
+ if ((ret = libusb_bulk_transfer(usb->devhdl, DSO_EP_OUT, cmdstring,
+ cmdlen, &tmp, 200)) != 0)
return SR_ERR;
return SR_OK;
}
-SR_PRIV int dso_getmps(libusb_device *dev)
+static int dso_getmps(libusb_device *dev)
{
struct libusb_device_descriptor des;
struct libusb_config_descriptor *conf_dsc;
return mps;
}
-SR_PRIV int dso_open(int dev_index)
+SR_PRIV int dso_open(struct sr_dev_inst *sdi)
{
- libusb_device **devlist;
+ struct dev_context *devc;
+ struct drv_context *drvc = hantek_dso_driver_info.priv;
+ struct sr_usb_dev_inst *usb;
struct libusb_device_descriptor des;
- struct sr_dev_inst *sdi;
- struct context *ctx;
+ libusb_device **devlist;
int err, skip, i;
- if (!(sdi = sr_dev_inst_get(dev_insts, dev_index)))
- return SR_ERR_ARG;
- ctx = sdi->priv;
+ devc = sdi->priv;
+ usb = sdi->conn;
if (sdi->status == SR_ST_ACTIVE)
/* already in use */
return SR_ERR;
skip = 0;
- libusb_get_device_list(usb_context, &devlist);
+ libusb_get_device_list(drvc->sr_ctx->libusb_ctx, &devlist);
for (i = 0; devlist[i]; i++) {
if ((err = libusb_get_device_descriptor(devlist[i], &des))) {
- sr_err("hantek-dso: failed to get device descriptor: %d", err);
+ sr_err("Failed to get device descriptor: %s.",
+ libusb_error_name(err));
continue;
}
- if (des.idVendor != ctx->profile->fw_vid
- || des.idProduct != ctx->profile->fw_pid)
+ if (des.idVendor != devc->profile->fw_vid
+ || des.idProduct != devc->profile->fw_pid)
continue;
if (sdi->status == SR_ST_INITIALIZING) {
- if (skip != dev_index) {
+ if (skip != sdi->index) {
/* Skip devices of this type that aren't the one we want. */
skip += 1;
continue;
* This device is fully enumerated, so we need to find
* this device by vendor, product, bus and address.
*/
- if (libusb_get_bus_number(devlist[i]) != ctx->usb->bus
- || libusb_get_device_address(devlist[i]) != ctx->usb->address)
+ if (libusb_get_bus_number(devlist[i]) != usb->bus
+ || libusb_get_device_address(devlist[i]) != usb->address)
/* this is not the one */
continue;
}
- if (!(err = libusb_open(devlist[i], &ctx->usb->devhdl))) {
- if (ctx->usb->address == 0xff)
+ if (!(err = libusb_open(devlist[i], &usb->devhdl))) {
+ if (usb->address == 0xff)
/*
* first time we touch this device after firmware upload,
* so we don't know the address yet.
*/
- ctx->usb->address = libusb_get_device_address(devlist[i]);
+ usb->address = libusb_get_device_address(devlist[i]);
- if(!(ctx->epin_maxpacketsize = dso_getmps(devlist[i])))
- sr_err("hantek-dso: wrong endpoint profile");
+ if (!(devc->epin_maxpacketsize = dso_getmps(devlist[i])))
+ sr_err("Wrong endpoint profile.");
else {
sdi->status = SR_ST_ACTIVE;
- sr_info("hantek-dso: opened device %d on %d.%d interface %d",
- sdi->index, ctx->usb->bus,
- ctx->usb->address, USB_INTERFACE);
+ sr_info("Opened device %d on %d.%d interface %d.",
+ sdi->index, usb->bus,
+ usb->address, USB_INTERFACE);
}
} else {
- sr_err("hantek-dso: failed to open device: %d", err);
+ sr_err("Failed to open device: %s.",
+ libusb_error_name(err));
}
- /* if we made it here, we handled the device one way or another */
+ /* If we made it here, we handled the device (somehow). */
break;
}
libusb_free_device_list(devlist, 1);
SR_PRIV void dso_close(struct sr_dev_inst *sdi)
{
- struct context *ctx;
+ struct sr_usb_dev_inst *usb;
- ctx = sdi->priv;
+ usb = sdi->conn;
- if (ctx->usb->devhdl == NULL)
+ if (usb->devhdl == NULL)
return;
- sr_info("hantek-dso: closing device %d on %d.%d interface %d", sdi->index,
- ctx->usb->bus, ctx->usb->address, USB_INTERFACE);
- libusb_release_interface(ctx->usb->devhdl, USB_INTERFACE);
- libusb_close(ctx->usb->devhdl);
- ctx->usb->devhdl = NULL;
+ sr_info("Closing device %d on %d.%d interface %d.", sdi->index,
+ usb->bus, usb->address, USB_INTERFACE);
+ libusb_release_interface(usb->devhdl, USB_INTERFACE);
+ libusb_close(usb->devhdl);
+ usb->devhdl = NULL;
sdi->status = SR_ST_INACTIVE;
}
-static int get_channel_offsets(struct context *ctx)
+static int get_channel_offsets(const struct sr_dev_inst *sdi)
{
+ struct dev_context *devc;
+ struct sr_usb_dev_inst *usb;
GString *gs;
int chan, v, ret;
- sr_dbg("hantek-dso: getting channel offsets");
+ sr_dbg("Getting channel offsets.");
- ret = libusb_control_transfer(ctx->usb->devhdl,
+ devc = sdi->priv;
+ usb = sdi->conn;
+
+ ret = libusb_control_transfer(usb->devhdl,
LIBUSB_ENDPOINT_IN | LIBUSB_REQUEST_TYPE_VENDOR,
CTRL_READ_EEPROM, EEPROM_CHANNEL_OFFSETS, 0,
- (unsigned char *)&ctx->channel_levels,
- sizeof(ctx->channel_levels), 200);
- if (ret != sizeof(ctx->channel_levels)) {
- sr_err("failed to get channel offsets: %d", ret);
+ (unsigned char *)&devc->channel_levels,
+ sizeof(devc->channel_levels), 200);
+ if (ret != sizeof(devc->channel_levels)) {
+ sr_err("Failed to get channel offsets: %s.",
+ libusb_error_name(ret));
return SR_ERR;
}
*/
for (chan = 0; chan < 2; chan++) {
for (v = 0; v < 9; v++) {
- ctx->channel_levels[chan][v][0] = ntohs(ctx->channel_levels[chan][v][0]);
- ctx->channel_levels[chan][v][1] = ntohs(ctx->channel_levels[chan][v][1]);
+ devc->channel_levels[chan][v][0] =
+ g_ntohs(devc->channel_levels[chan][v][0]);
+ devc->channel_levels[chan][v][1] =
+ g_ntohs(devc->channel_levels[chan][v][1]);
}
}
if (sr_log_loglevel_get() >= SR_LOG_DBG) {
gs = g_string_sized_new(128);
for (chan = 0; chan < 2; chan++) {
- g_string_printf(gs, "hantek-dso: CH%d:", chan + 1);
+ g_string_printf(gs, "CH%d:", chan + 1);
for (v = 0; v < 9; v++) {
g_string_append_printf(gs, " %.4x-%.4x",
- ctx->channel_levels[chan][v][0],
- ctx->channel_levels[chan][v][1]);
+ devc->channel_levels[chan][v][0],
+ devc->channel_levels[chan][v][1]);
}
- sr_dbg(gs->str);
+ sr_dbg("%s", gs->str);
}
g_string_free(gs, TRUE);
}
return SR_OK;
}
-SR_PRIV int dso_set_trigger_samplerate(struct context *ctx)
+static int dso_set_trigger_samplerate(const struct sr_dev_inst *sdi)
{
+ struct dev_context *devc;
+ struct sr_usb_dev_inst *usb;
int ret, tmp;
uint8_t cmdstring[12];
uint16_t timebase_small[] = { 0xffff, 0xfffc, 0xfff7, 0xffe8, 0xffce,
- 0xff9c, 0xff07, 0xfe0d, 0xfc19, 0xf63d, 0xec79, 0xd8f1 };
+ 0xff9c, 0xff07, 0xfe0d, 0xfc19, 0xf63d, 0xec79, 0xd8f1 };
uint16_t timebase_large[] = { 0xffff, 0x0000, 0xfffc, 0xfff7, 0xffe8,
- 0xffce, 0xff9d, 0xff07, 0xfe0d, 0xfc19, 0xf63d, 0xec79 };
+ 0xffce, 0xff9d, 0xff07, 0xfe0d, 0xfc19, 0xf63d, 0xec79 };
+
+ sr_dbg("Preparing CMD_SET_TRIGGER_SAMPLERATE.");
- sr_dbg("hantek-dso: preparing CMD_SET_TRIGGER_SAMPLERATE");
+ devc = sdi->priv;
+ usb = sdi->conn;
memset(cmdstring, 0, sizeof(cmdstring));
/* Command */
cmdstring[0] = CMD_SET_TRIGGER_SAMPLERATE;
/* Trigger source */
- sr_dbg("hantek-dso: trigger source %s", ctx->triggersource);
- if (!strcmp("CH2", ctx->triggersource))
+ sr_dbg("Trigger source %s.", devc->triggersource);
+ if (!strcmp("CH2", devc->triggersource))
tmp = 0;
- else if (!strcmp("CH1", ctx->triggersource))
+ else if (!strcmp("CH1", devc->triggersource))
tmp = 1;
- else if (!strcmp("EXT", ctx->triggersource))
+ else if (!strcmp("EXT", devc->triggersource))
tmp = 2;
else {
- sr_err("hantek-dso: invalid trigger source %s", ctx->triggersource);
+ sr_err("Invalid trigger source: '%s'.", devc->triggersource);
return SR_ERR_ARG;
}
cmdstring[2] = tmp;
/* Frame size */
- sr_dbg("hantek-dso: frame size %d", ctx->framesize);
- cmdstring[2] |= (ctx->framesize == FRAMESIZE_SMALL ? 0x01 : 0x02) << 2;
+ sr_dbg("Frame size: %d.", devc->framesize);
+ cmdstring[2] |= (devc->framesize == FRAMESIZE_SMALL ? 0x01 : 0x02) << 2;
/* Timebase fast */
- sr_dbg("hantek-dso: time base index %d", ctx->timebase);
- switch (ctx->framesize) {
- case FRAMESIZE_SMALL:
- if (ctx->timebase < TIME_20us)
+ sr_dbg("Time base index: %d.", devc->timebase);
+ if (devc->framesize == FRAMESIZE_SMALL) {
+ if (devc->timebase < TIME_20us)
tmp = 0;
- else if (ctx->timebase == TIME_20us)
+ else if (devc->timebase == TIME_20us)
tmp = 1;
- else if (ctx->timebase == TIME_40us)
+ else if (devc->timebase == TIME_40us)
tmp = 2;
- else if (ctx->timebase == TIME_100us)
+ else if (devc->timebase == TIME_100us)
tmp = 3;
- else if (ctx->timebase >= TIME_200us)
+ else if (devc->timebase >= TIME_200us)
tmp = 4;
- break;
- case FRAMESIZE_LARGE:
- if (ctx->timebase < TIME_40us) {
- sr_err("hantek-dso: timebase < 40us only supported with 10K buffer");
+ } else {
+ if (devc->timebase < TIME_40us) {
+ sr_err("Timebase < 40us only supported with 10K buffer.");
return SR_ERR_ARG;
}
- else if (ctx->timebase == TIME_40us)
+ else if (devc->timebase == TIME_40us)
tmp = 0;
- else if (ctx->timebase == TIME_100us)
+ else if (devc->timebase == TIME_100us)
tmp = 2;
- else if (ctx->timebase == TIME_200us)
+ else if (devc->timebase == TIME_200us)
tmp = 3;
- else if (ctx->timebase >= TIME_400us)
+ else if (devc->timebase >= TIME_400us)
tmp = 4;
- break;
}
cmdstring[2] |= (tmp & 0x07) << 5;
/* Enabled channels: 00=CH1 01=CH2 10=both */
- sr_dbg("hantek-dso: channels CH1=%d CH2=%d", ctx->ch1_enabled, ctx->ch2_enabled);
- tmp = (((ctx->ch2_enabled ? 1 : 0) << 1) + (ctx->ch1_enabled ? 1 : 0)) - 1;
+ sr_dbg("Channels CH1=%d CH2=%d", devc->ch1_enabled, devc->ch2_enabled);
+ tmp = (((devc->ch2_enabled ? 1 : 0) << 1) + (devc->ch1_enabled ? 1 : 0)) - 1;
cmdstring[3] = tmp;
/* Fast rates channel */
- /* TODO: is this right? */
- tmp = ctx->timebase < TIME_10us ? 1 : 0;
+ /* TODO: Is this right? */
+ tmp = devc->timebase < TIME_10us ? 1 : 0;
cmdstring[3] |= tmp << 2;
/* Trigger slope: 0=positive 1=negative */
- /* TODO: does this work? */
- sr_dbg("hantek-dso: trigger slope %d", ctx->triggerslope);
- cmdstring[3] |= (ctx->triggerslope == SLOPE_NEGATIVE ? 1 : 0) << 3;
+ /* TODO: Does this work? */
+ sr_dbg("Trigger slope: %d.", devc->triggerslope);
+ cmdstring[3] |= (devc->triggerslope == SLOPE_NEGATIVE ? 1 : 0) << 3;
/* Timebase slow */
- if (ctx->timebase < TIME_100us)
+ if (devc->timebase < TIME_100us)
tmp = 0;
- else if (ctx->timebase > TIME_400ms)
+ else if (devc->timebase > TIME_400ms)
tmp = 0xffed;
else {
- if (ctx->framesize == FRAMESIZE_SMALL)
- tmp = timebase_small[ctx->timebase - 3];
+ if (devc->framesize == FRAMESIZE_SMALL)
+ tmp = timebase_small[devc->timebase - 3];
else
- tmp = timebase_large[ctx->timebase - 3];
+ tmp = timebase_large[devc->timebase - 3];
}
cmdstring[4] = tmp & 0xff;
cmdstring[5] = (tmp >> 8) & 0xff;
/* Horizontal trigger position */
- sr_dbg("hantek-dso: trigger position %3.2f", ctx->triggerposition);
- tmp = 0x77fff + 0x8000 * ctx->triggerposition;
+ sr_dbg("Trigger position: %3.2f.", devc->triggerposition);
+ tmp = 0x77fff + 0x8000 * devc->triggerposition;
cmdstring[6] = tmp & 0xff;
cmdstring[7] = (tmp >> 8) & 0xff;
cmdstring[10] = (tmp >> 16) & 0xff;
- if (send_begin(ctx) != SR_OK)
+ if (send_begin(sdi) != SR_OK)
return SR_ERR;
- if ((ret = libusb_bulk_transfer(ctx->usb->devhdl,
- DSO_EP_OUT | LIBUSB_ENDPOINT_OUT,
- cmdstring, sizeof(cmdstring),
- &tmp, 100)) != 0) {
- sr_err("Failed to set trigger/samplerate: %d", ret);
+ if ((ret = libusb_bulk_transfer(usb->devhdl, DSO_EP_OUT,
+ cmdstring, sizeof(cmdstring), &tmp, 100)) != 0) {
+ sr_err("Failed to set trigger/samplerate: %s.",
+ libusb_error_name(ret));
return SR_ERR;
}
- sr_dbg("hantek-dso: sent CMD_SET_TRIGGER_SAMPLERATE");
+ sr_dbg("Sent CMD_SET_TRIGGER_SAMPLERATE.");
return SR_OK;
}
-SR_PRIV int dso_set_filters(struct context *ctx)
+static int dso_set_filters(const struct sr_dev_inst *sdi)
{
+ struct dev_context *devc;
+ struct sr_usb_dev_inst *usb;
int ret, tmp;
uint8_t cmdstring[8];
- sr_dbg("hantek-dso: preparing CMD_SET_FILTERS");
+ sr_dbg("Preparing CMD_SET_FILTERS.");
+
+ devc = sdi->priv;
+ usb = sdi->conn;
memset(cmdstring, 0, sizeof(cmdstring));
cmdstring[0] = CMD_SET_FILTERS;
cmdstring[1] = 0x0f;
- if (ctx->filter_ch1) {
- sr_dbg("hantek-dso: turning on CH1 filter");
+ if (devc->filter_ch1) {
+ sr_dbg("Turning on CH1 filter.");
cmdstring[2] |= 0x80;
}
- if (ctx->filter_ch2) {
- sr_dbg("hantek-dso: turning on CH2 filter");
+ if (devc->filter_ch2) {
+ sr_dbg("Turning on CH2 filter.");
cmdstring[2] |= 0x40;
}
- if (ctx->filter_trigger) {
+ if (devc->filter_trigger) {
/* TODO: supported on the DSO-2090? */
- sr_dbg("hantek-dso: turning on trigger filter");
+ sr_dbg("Turning on trigger filter.");
cmdstring[2] |= 0x20;
}
- if (send_begin(ctx) != SR_OK)
+ if (send_begin(sdi) != SR_OK)
return SR_ERR;
- if ((ret = libusb_bulk_transfer(ctx->usb->devhdl,
- DSO_EP_OUT | LIBUSB_ENDPOINT_OUT,
- cmdstring, sizeof(cmdstring),
- &tmp, 100)) != 0) {
- sr_err("Failed to set filters: %d", ret);
+ if ((ret = libusb_bulk_transfer(usb->devhdl, DSO_EP_OUT,
+ cmdstring, sizeof(cmdstring), &tmp, 100)) != 0) {
+ sr_err("Failed to set filters: %s.", libusb_error_name(ret));
return SR_ERR;
}
- sr_dbg("hantek-dso: sent CMD_SET_FILTERS");
+ sr_dbg("Sent CMD_SET_FILTERS.");
return SR_OK;
}
-SR_PRIV int dso_set_voltage(struct context *ctx)
+static int dso_set_voltage(const struct sr_dev_inst *sdi)
{
+ struct dev_context *devc;
+ struct sr_usb_dev_inst *usb;
int ret, tmp;
uint8_t cmdstring[8];
- sr_dbg("hantek-dso: preparing CMD_SET_VOLTAGE");
+ sr_dbg("Preparing CMD_SET_VOLTAGE.");
+
+ devc = sdi->priv;
+ usb = sdi->conn;
memset(cmdstring, 0, sizeof(cmdstring));
cmdstring[0] = CMD_SET_VOLTAGE;
cmdstring[2] = 0x30;
/* CH1 volts/div is encoded in bits 0-1 */
- sr_dbg("hantek-dso: CH1 vdiv index %d", ctx->voltage_ch1);
- switch (ctx->voltage_ch1) {
+ sr_dbg("CH1 vdiv index: %d.", devc->voltage_ch1);
+ switch (devc->voltage_ch1) {
case VDIV_1V:
case VDIV_100MV:
case VDIV_10MV:
}
/* CH2 volts/div is encoded in bits 2-3 */
- sr_dbg("hantek-dso: CH2 vdiv index %d", ctx->voltage_ch2);
- switch (ctx->voltage_ch2) {
+ sr_dbg("CH2 vdiv index: %d.", devc->voltage_ch2);
+ switch (devc->voltage_ch2) {
case VDIV_1V:
case VDIV_100MV:
case VDIV_10MV:
case VDIV_2V:
case VDIV_200MV:
case VDIV_20MV:
- cmdstring[2] |= 0x08;
+ cmdstring[2] |= 0x04;
break;
case VDIV_5V:
case VDIV_500MV:
case VDIV_50MV:
- cmdstring[2] |= 0x04;
+ cmdstring[2] |= 0x08;
break;
}
- if (send_begin(ctx) != SR_OK)
+ if (send_begin(sdi) != SR_OK)
return SR_ERR;
- if ((ret = libusb_bulk_transfer(ctx->usb->devhdl,
- DSO_EP_OUT | LIBUSB_ENDPOINT_OUT,
- cmdstring, sizeof(cmdstring),
- &tmp, 100)) != 0) {
- sr_err("Failed to set voltage: %d", ret);
+ if ((ret = libusb_bulk_transfer(usb->devhdl, DSO_EP_OUT,
+ cmdstring, sizeof(cmdstring), &tmp, 100)) != 0) {
+ sr_err("Failed to set voltage: %s.", libusb_error_name(ret));
return SR_ERR;
}
- sr_dbg("hantek-dso: sent CMD_SET_VOLTAGE");
+ sr_dbg("Sent CMD_SET_VOLTAGE.");
return SR_OK;
}
-SR_PRIV int dso_set_relays(struct context *ctx)
+static int dso_set_relays(const struct sr_dev_inst *sdi)
{
- int ret, cv1, cv2;
- uint8_t relays[] = { 0x00, 0x04, 0x08, 0x02, 0x20, 0x40, 0x10, 0x01,
+ struct dev_context *devc;
+ struct sr_usb_dev_inst *usb;
+ GString *gs;
+ int ret, i;
+ uint8_t relays[17] = { 0x00, 0x04, 0x08, 0x02, 0x20, 0x40, 0x10, 0x01,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
- sr_dbg("hantek-dso: preparing CTRL_SETRELAYS");
+ sr_dbg("Preparing CTRL_SETRELAYS.");
- cv1 = ctx->voltage_ch1 / 3;
- cv2 = ctx->voltage_ch2 / 3;
+ devc = sdi->priv;
+ usb = sdi->conn;
- if (cv1 > 0)
+ if (devc->voltage_ch1 < VDIV_1V)
relays[1] = ~relays[1];
- if (cv1 > 1)
+ if (devc->voltage_ch1 < VDIV_100MV)
relays[2] = ~relays[2];
- sr_dbg("hantek-dso: CH1 coupling %d", ctx->coupling_ch1);
- if (ctx->coupling_ch1 != COUPLING_AC)
+ sr_dbg("CH1 coupling: %d.", devc->coupling_ch1);
+ if (devc->coupling_ch1 != COUPLING_AC)
relays[3] = ~relays[3];
- if (cv2 > 0)
+ if (devc->voltage_ch2 < VDIV_1V)
relays[4] = ~relays[4];
- if (cv2 > 1)
+ if (devc->voltage_ch2 < VDIV_100MV)
relays[5] = ~relays[5];
- sr_dbg("hantek-dso: CH2 coupling %d", ctx->coupling_ch1);
- if (ctx->coupling_ch2 != COUPLING_AC)
+ sr_dbg("CH2 coupling: %d.", devc->coupling_ch1);
+ if (devc->coupling_ch2 != COUPLING_AC)
relays[6] = ~relays[6];
- if (!strcmp(ctx->triggersource, "EXT"))
+ if (!strcmp(devc->triggersource, "EXT"))
relays[7] = ~relays[7];
- if ((ret = libusb_control_transfer(ctx->usb->devhdl,
+ if (sr_log_loglevel_get() >= SR_LOG_DBG) {
+ gs = g_string_sized_new(128);
+ g_string_printf(gs, "Relays:");
+ for (i = 0; i < 17; i++)
+ g_string_append_printf(gs, " %.2x", relays[i]);
+ sr_dbg("%s", gs->str);
+ g_string_free(gs, TRUE);
+ }
+
+ if ((ret = libusb_control_transfer(usb->devhdl,
LIBUSB_REQUEST_TYPE_VENDOR, CTRL_SETRELAYS,
- 0, 0, relays, sizeof(relays), 100)) != sizeof(relays)) {
- sr_err("failed to set relays: %d", ret);
+ 0, 0, relays, 17, 100)) != sizeof(relays)) {
+ sr_err("Failed to set relays: %s.", libusb_error_name(ret));
return SR_ERR;
}
- sr_dbg("hantek-dso: sent CTRL_SETRELAYS");
+ sr_dbg("Sent CTRL_SETRELAYS.");
return SR_OK;
}
-SR_PRIV int dso_set_voffsets(struct context *ctx)
+static int dso_set_voffsets(const struct sr_dev_inst *sdi)
{
+ struct dev_context *devc;
+ struct sr_usb_dev_inst *usb;
int offset, ret;
uint16_t *ch_levels;
uint8_t offsets[17];
- sr_dbg("hantek-dso: preparing CTRL_SETOFFSET");
+ sr_dbg("Preparing CTRL_SETOFFSET.");
+
+ devc = sdi->priv;
+ usb = sdi->conn;
memset(offsets, 0, sizeof(offsets));
/* Channel 1 */
- ch_levels = ctx->channel_levels[0][ctx->voltage_ch1];
- offset = (ch_levels[1] - ch_levels[0]) * ctx->voffset_ch1 + ch_levels[0];
+ ch_levels = devc->channel_levels[0][devc->voltage_ch1];
+ offset = (ch_levels[1] - ch_levels[0]) * devc->voffset_ch1 + ch_levels[0];
offsets[0] = (offset >> 8) | 0x20;
offsets[1] = offset & 0xff;
- sr_dbg("hantek-dso: CH1 offset %3.2f (%.2x%.2x)", ctx->voffset_ch1,
- offsets[0], offsets[1]);
+ sr_dbg("CH1 offset: %3.2f (%.2x%.2x).", devc->voffset_ch1,
+ offsets[0], offsets[1]);
/* Channel 2 */
- ch_levels = ctx->channel_levels[1][ctx->voltage_ch2];
- offset = (ch_levels[1] - ch_levels[0]) * ctx->voffset_ch2 + ch_levels[0];
+ ch_levels = devc->channel_levels[1][devc->voltage_ch2];
+ offset = (ch_levels[1] - ch_levels[0]) * devc->voffset_ch2 + ch_levels[0];
offsets[2] = (offset >> 8) | 0x20;
offsets[3] = offset & 0xff;
- sr_dbg("hantek-dso: CH2 offset %3.2f (%.2x%.2x)", ctx->voffset_ch2,
- offsets[2], offsets[3]);
+ sr_dbg("CH2 offset: %3.2f (%.2x%.2x).", devc->voffset_ch2,
+ offsets[2], offsets[3]);
/* Trigger */
- offset = MAX_VERT_TRIGGER * ctx->voffset_trigger;
+ offset = MAX_VERT_TRIGGER * devc->voffset_trigger;
offsets[4] = (offset >> 8) | 0x20;
offsets[5] = offset & 0xff;
- sr_dbg("hantek-dso: trigger offset %3.2f (%.2x%.2x)", ctx->voffset_trigger,
+ sr_dbg("Trigger offset: %3.2f (%.2x%.2x).", devc->voffset_trigger,
offsets[4], offsets[5]);
- if ((ret = libusb_control_transfer(ctx->usb->devhdl,
+ if ((ret = libusb_control_transfer(usb->devhdl,
LIBUSB_REQUEST_TYPE_VENDOR, CTRL_SETOFFSET,
0, 0, offsets, sizeof(offsets), 100)) != sizeof(offsets)) {
- sr_err("failed to set offsets: %d", ret);
+ sr_err("Failed to set offsets: %s.", libusb_error_name(ret));
return SR_ERR;
}
- sr_dbg("hantek-dso: sent CTRL_SETOFFSET");
+ sr_dbg("Sent CTRL_SETOFFSET.");
return SR_OK;
}
-SR_PRIV int dso_enable_trigger(struct context *ctx)
+SR_PRIV int dso_enable_trigger(const struct sr_dev_inst *sdi)
{
+ struct sr_usb_dev_inst *usb;
int ret, tmp;
uint8_t cmdstring[2];
- sr_dbg("hantek-dso: sending CMD_ENABLE_TRIGGER");
+ sr_dbg("Sending CMD_ENABLE_TRIGGER.");
+
+ usb = sdi->conn;
memset(cmdstring, 0, sizeof(cmdstring));
cmdstring[0] = CMD_ENABLE_TRIGGER;
cmdstring[1] = 0x00;
- if (send_begin(ctx) != SR_OK)
+ if (send_begin(sdi) != SR_OK)
return SR_ERR;
- if ((ret = libusb_bulk_transfer(ctx->usb->devhdl,
- DSO_EP_OUT | LIBUSB_ENDPOINT_OUT,
- cmdstring, sizeof(cmdstring),
- &tmp, 100)) != 0) {
- sr_err("Failed to enable trigger: %d", ret);
+ if ((ret = libusb_bulk_transfer(usb->devhdl, DSO_EP_OUT,
+ cmdstring, sizeof(cmdstring), &tmp, 100)) != 0) {
+ sr_err("Failed to enable trigger: %s.", libusb_error_name(ret));
return SR_ERR;
}
return SR_OK;
}
-SR_PRIV int dso_force_trigger(struct context *ctx)
+SR_PRIV int dso_force_trigger(const struct sr_dev_inst *sdi)
{
+ struct sr_usb_dev_inst *usb;
int ret, tmp;
uint8_t cmdstring[2];
- sr_dbg("hantek-dso: sending CMD_FORCE_TRIGGER");
+ sr_dbg("Sending CMD_FORCE_TRIGGER.");
+
+ usb = sdi->conn;
memset(cmdstring, 0, sizeof(cmdstring));
cmdstring[0] = CMD_FORCE_TRIGGER;
cmdstring[1] = 0x00;
- if (send_begin(ctx) != SR_OK)
+ if (send_begin(sdi) != SR_OK)
return SR_ERR;
- if ((ret = libusb_bulk_transfer(ctx->usb->devhdl,
- DSO_EP_OUT | LIBUSB_ENDPOINT_OUT,
- cmdstring, sizeof(cmdstring),
- &tmp, 100)) != 0) {
- sr_err("Failed to force trigger: %d", ret);
+ if ((ret = libusb_bulk_transfer(usb->devhdl, DSO_EP_OUT,
+ cmdstring, sizeof(cmdstring), &tmp, 100)) != 0) {
+ sr_err("Failed to force trigger: %s.", libusb_error_name(ret));
return SR_ERR;
}
return SR_OK;
}
-SR_PRIV int dso_init(struct context *ctx)
+SR_PRIV int dso_init(const struct sr_dev_inst *sdi)
{
- sr_dbg("hantek-dso: initializing dso");
+ sr_dbg("Initializing DSO.");
- if (get_channel_offsets(ctx) != SR_OK)
+ if (get_channel_offsets(sdi) != SR_OK)
return SR_ERR;
- if (dso_set_trigger_samplerate(ctx) != SR_OK)
+ if (dso_set_trigger_samplerate(sdi) != SR_OK)
return SR_ERR;
- if (dso_set_filters(ctx) != SR_OK)
+ if (dso_set_filters(sdi) != SR_OK)
return SR_ERR;
- if (dso_set_voltage(ctx) != SR_OK)
+ if (dso_set_voltage(sdi) != SR_OK)
return SR_ERR;
- if (dso_set_relays(ctx) != SR_OK)
+ if (dso_set_relays(sdi) != SR_OK)
return SR_ERR;
- if (dso_set_voffsets(ctx) != SR_OK)
+ if (dso_set_voffsets(sdi) != SR_OK)
return SR_ERR;
- if (dso_enable_trigger(ctx) != SR_OK)
+ if (dso_enable_trigger(sdi) != SR_OK)
return SR_ERR;
return SR_OK;
}
-SR_PRIV uint8_t dso_get_capturestate(struct context *ctx)
+SR_PRIV int dso_get_capturestate(const struct sr_dev_inst *sdi,
+ uint8_t *capturestate, uint32_t *trigger_offset)
{
- int ret, tmp;
+ struct sr_usb_dev_inst *usb;
+ int ret, tmp, i;
+ unsigned int bitvalue, toff;
uint8_t cmdstring[2], inbuf[512];
- sr_dbg("hantek-dso: sending CMD_GET_CAPTURESTATE");
+ sr_dbg("Sending CMD_GET_CAPTURESTATE.");
+
+ usb = sdi->conn;
cmdstring[0] = CMD_GET_CAPTURESTATE;
cmdstring[1] = 0;
- if ((ret = send_bulkcmd(ctx, cmdstring, sizeof(cmdstring))) != SR_OK) {
- sr_dbg("Failed to send get_capturestate command: %d", ret);
- return CAPTURE_UNKNOWN;
+ if ((ret = send_bulkcmd(sdi, cmdstring, sizeof(cmdstring))) != SR_OK) {
+ sr_dbg("Failed to send get_capturestate command: %s.",
+ libusb_error_name(ret));
+ return SR_ERR;
}
- if ((ret = libusb_bulk_transfer(ctx->usb->devhdl,
- DSO_EP_IN | LIBUSB_ENDPOINT_IN,
+ if ((ret = libusb_bulk_transfer(usb->devhdl, DSO_EP_IN,
inbuf, 512, &tmp, 100)) != 0) {
- sr_dbg("Failed to get capturestate: %d", ret);
- return CAPTURE_UNKNOWN;
+ sr_dbg("Failed to get capturestate: %s.",
+ libusb_error_name(ret));
+ return SR_ERR;
+ }
+ *capturestate = inbuf[0];
+ toff = (inbuf[1] << 16) | (inbuf[3] << 8) | inbuf[2];
+
+ /*
+ * This conversion comes from the openhantek project.
+ * Each set bit in the 24-bit value inverts all bits with a lower
+ * value. No idea why the device reports the trigger point this way.
+ */
+ bitvalue = 1;
+ for (i = 0; i < 24; i++) {
+ /* Each set bit inverts all bits with a lower value. */
+ if(toff & bitvalue)
+ toff ^= bitvalue - 1;
+ bitvalue <<= 1;
}
+ *trigger_offset = toff;
- return inbuf[0];
+ return SR_OK;
}
-SR_PRIV uint8_t dso_capture_start(struct context *ctx)
+SR_PRIV int dso_capture_start(const struct sr_dev_inst *sdi)
{
int ret;
uint8_t cmdstring[2];
- sr_dbg("hantek-dso: sending CMD_CAPTURE_START");
+ sr_dbg("Sending CMD_CAPTURE_START.");
cmdstring[0] = CMD_CAPTURE_START;
cmdstring[1] = 0;
- if ((ret = send_bulkcmd(ctx, cmdstring, sizeof(cmdstring))) != SR_OK) {
- sr_err("Failed to send capture_start command: %d", ret);
+ if ((ret = send_bulkcmd(sdi, cmdstring, sizeof(cmdstring))) != SR_OK) {
+ sr_err("Failed to send capture_start command: %s.",
+ libusb_error_name(ret));
return SR_ERR;
}
return SR_OK;
}
-SR_PRIV int dso_get_channeldata(struct context *ctx, libusb_transfer_cb_fn cb)
+SR_PRIV int dso_get_channeldata(const struct sr_dev_inst *sdi,
+ libusb_transfer_cb_fn cb)
{
+ struct dev_context *devc;
+ struct sr_usb_dev_inst *usb;
struct libusb_transfer *transfer;
int num_transfers, ret, i;
uint8_t cmdstring[2];
unsigned char *buf;
- sr_dbg("hantek-dso: sending CMD_GET_CHANNELDATA");
+ sr_dbg("Sending CMD_GET_CHANNELDATA.");
+
+ devc = sdi->priv;
+ usb = sdi->conn;
cmdstring[0] = CMD_GET_CHANNELDATA;
cmdstring[1] = 0;
- if ((ret = send_bulkcmd(ctx, cmdstring, sizeof(cmdstring))) != SR_OK) {
- sr_err("Failed to get channel data: %d", ret);
+ if ((ret = send_bulkcmd(sdi, cmdstring, sizeof(cmdstring))) != SR_OK) {
+ sr_err("Failed to get channel data: %s.",
+ libusb_error_name(ret));
return SR_ERR;
}
- /* TODO: dso-2xxx only */
- num_transfers = ctx->framesize * sizeof(unsigned short) / ctx->epin_maxpacketsize;
- sr_dbg("hantek-dso: queueing up %d transfers", num_transfers);
+ /* TODO: DSO-2xxx only. */
+ num_transfers = devc->framesize *
+ sizeof(unsigned short) / devc->epin_maxpacketsize;
+ sr_dbg("Queueing up %d transfers.", num_transfers);
for (i = 0; i < num_transfers; i++) {
- if (!(buf = g_try_malloc(ctx->epin_maxpacketsize))) {
- sr_err("hantek-dso: %s: buf malloc failed", __func__);
+ if (!(buf = g_try_malloc(devc->epin_maxpacketsize))) {
+ sr_err("Failed to malloc USB endpoint buffer.");
return SR_ERR_MALLOC;
}
transfer = libusb_alloc_transfer(0);
- libusb_fill_bulk_transfer(transfer, ctx->usb->devhdl,
- DSO_EP_IN | LIBUSB_ENDPOINT_IN, buf,
- ctx->epin_maxpacketsize, cb, ctx, 40);
+ libusb_fill_bulk_transfer(transfer, usb->devhdl, DSO_EP_IN, buf,
+ devc->epin_maxpacketsize, cb, (void *)sdi, 40);
if ((ret = libusb_submit_transfer(transfer)) != 0) {
- sr_err("failed to submit transfer: %d", ret);
+ sr_err("Failed to submit transfer: %s.",
+ libusb_error_name(ret));
/* TODO: Free them all. */
libusb_free_transfer(transfer);
g_free(buf);
return SR_OK;
}
-
projects / libsigrok.git / blobdiff