X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Ftesto%2Fapi.c;h=8e60f6b892fb72e03d4974e31a7a5819767ebe88;hb=dd5c48a6d567a3cac62c4b0058588273bbeea171;hp=8970a9f9b5f34efaefa61c49620ab62c8e6adc53;hpb=5827f61b641cfd326a9cf2ea534eb4f9481a8187;p=libsigrok.git
diff --git a/src/hardware/testo/api.c b/src/hardware/testo/api.c
index 8970a9f9..8e60f6b8 100644
--- a/src/hardware/testo/api.c
+++ b/src/hardware/testo/api.c
@@ -17,14 +17,12 @@
* along with this program. If not, see .
*/
+#include
#include
#include "protocol.h"
#define SERIALCOMM "115200/8n1"
-
-SR_PRIV struct sr_dev_driver testo_driver_info;
-static struct sr_dev_driver *di = &testo_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 const uint32_t scanopts[] = {
SR_CONF_CONN,
@@ -33,21 +31,17 @@ static const uint32_t scanopts[] = {
static const uint32_t devopts[] = {
SR_CONF_MULTIMETER,
SR_CONF_CONTINUOUS,
- SR_CONF_LIMIT_SAMPLES | SR_CONF_SET,
- SR_CONF_LIMIT_MSEC | SR_CONF_SET,
+ SR_CONF_LIMIT_SAMPLES | SR_CONF_SET | SR_CONF_GET,
+ SR_CONF_LIMIT_MSEC | SR_CONF_SET | SR_CONF_GET,
};
-unsigned char TESTO_x35_REQUEST[] = { 0x12, 0, 0, 0, 1, 1, 0x55, 0xd1, 0xb7 };
-struct testo_model models[] = {
+static const uint8_t TESTO_x35_REQUEST[] = { 0x12, 0, 0, 0, 1, 1, 0x55, 0xd1, 0xb7 };
+
+static const struct testo_model models[] = {
{ "435", 9, TESTO_x35_REQUEST },
};
-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;
@@ -58,12 +52,12 @@ static GSList *scan(GSList *options)
libusb_device **devlist;
struct libusb_device_handle *hdl;
GSList *conn_devices, *devices, *l;
- int devcnt, ret, i;
+ int ret, i;
const char *str;
- char manufacturer[64], product[64];
+ char manufacturer[64], product[64], connection_id[64];
devices = NULL;
- drvc = di->priv;
+ drvc = di->context;
drvc->instances = NULL;
conn_devices = NULL;
@@ -91,11 +85,7 @@ static GSList *scan(GSList *options)
continue;
}
- if ((ret = libusb_get_device_descriptor( devlist[i], &des)) != 0) {
- sr_warn("Failed to get device descriptor: %s.",
- libusb_error_name(ret));
- continue;
- }
+ libusb_get_device_descriptor(devlist[i], &des);
if ((ret = libusb_open(devlist[i], &hdl)) < 0)
continue;
@@ -118,21 +108,24 @@ static GSList *scan(GSList *options)
if (strncmp(manufacturer, "testo", 5))
continue;
+ usb_get_port_path(devlist[i], connection_id, sizeof(connection_id));
+
/* Hardcode the 435 for now.*/
if (strcmp(product, "testo 435/635/735"))
continue;
- devcnt = g_slist_length(drvc->instances);
- sdi = sr_dev_inst_new(devcnt, SR_ST_INACTIVE, "Testo",
- "435/635/735", NULL);
+ sdi = g_malloc0(sizeof(struct sr_dev_inst));
+ sdi->status = SR_ST_INACTIVE;
+ sdi->vendor = g_strdup("Testo");
+ sdi->model = g_strdup("435/635/735");
sdi->driver = di;
sdi->inst_type = SR_INST_USB;
sdi->conn = sr_usb_dev_inst_new(libusb_get_bus_number(devlist[i]),
libusb_get_device_address(devlist[i]), NULL);
+ sdi->connection_id = g_strdup(connection_id);
devc = g_malloc(sizeof(struct dev_context));
devc->model = &models[0];
- devc->limit_msec = 0;
- devc->limit_samples = 0;
+ sr_sw_limits_init(&devc->sw_limits);
sdi->priv = devc;
if (testo_probe_channels(sdi) != SR_OK)
continue;
@@ -145,45 +138,18 @@ static GSList *scan(GSList *options)
return devices;
}
-static GSList *dev_list(void)
-{
- return ((struct drv_context *)(di->priv))->instances;
-}
-
-static int dev_clear(void)
-{
- return std_dev_clear(di, NULL);
-}
-
static int dev_open(struct sr_dev_inst *sdi)
{
- struct drv_context *drvc = di->priv;
+ struct sr_dev_driver *di = sdi->driver;
+ struct drv_context *drvc = di->context;
struct sr_usb_dev_inst *usb;
- libusb_device **devlist;
- int ret, i;
-
- if (!di->priv) {
- sr_err("Driver was not initialized.");
- return SR_ERR;
- }
+ int ret;
usb = sdi->conn;
- libusb_get_device_list(drvc->sr_ctx->libusb_ctx, &devlist);
- for (i = 0; devlist[i]; i++) {
- if (libusb_get_bus_number(devlist[i]) != usb->bus
- || libusb_get_device_address(devlist[i]) != usb->address)
- continue;
- if ((ret = libusb_open(devlist[i], &usb->devhdl))) {
- sr_err("Failed to open device: %s.", libusb_error_name(ret));
- return SR_ERR;
- }
- break;
- }
- libusb_free_device_list(devlist, 1);
- if (!devlist[i]) {
- sr_err("Device not found.");
- return SR_ERR;
- }
+
+ ret = sr_usb_open(drvc->sr_ctx->libusb_ctx, usb);
+ if (ret != SR_OK)
+ return ret;
if (libusb_has_capability(LIBUSB_CAP_SUPPORTS_DETACH_KERNEL_DRIVER)) {
if (libusb_kernel_driver_active(usb->devhdl, 0) == 1) {
@@ -208,11 +174,6 @@ static int dev_close(struct sr_dev_inst *sdi)
{
struct sr_usb_dev_inst *usb;
- if (!di->priv) {
- sr_err("Driver was not initialized.");
- return SR_ERR;
- }
-
usb = sdi->conn;
if (!usb->devhdl)
/* Nothing to do. */
@@ -226,24 +187,10 @@ static int dev_close(struct sr_dev_inst *sdi)
return SR_OK;
}
-static int cleanup(void)
-{
- int ret;
- struct drv_context *drvc;
-
- if (!(drvc = di->priv))
- return SR_OK;
-
- ret = dev_clear();
- g_free(drvc);
- di->priv = NULL;
-
- return ret;
-}
-
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 = sdi->priv;
struct sr_usb_dev_inst *usb;
char str[128];
@@ -257,6 +204,9 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s
snprintf(str, 128, "%d.%d", usb->bus, usb->address);
*data = g_variant_new_string(str);
break;
+ case SR_CONF_LIMIT_MSEC:
+ case SR_CONF_LIMIT_SAMPLES:
+ return sr_sw_limits_config_get(&devc->sw_limits, key, data);
default:
return SR_ERR_NA;
}
@@ -267,40 +217,14 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s
static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sdi,
const struct sr_channel_group *cg)
{
- struct dev_context *devc;
- gint64 now;
- int ret;
+ struct dev_context *devc = sdi->priv;
(void)cg;
if (sdi->status != SR_ST_ACTIVE)
return SR_ERR_DEV_CLOSED;
- if (!di->priv) {
- sr_err("Driver was not initialized.");
- return SR_ERR;
- }
-
- devc = sdi->priv;
- ret = SR_OK;
- switch (key) {
- case SR_CONF_LIMIT_MSEC:
- devc->limit_msec = g_variant_get_uint64(data);
- now = g_get_monotonic_time() / 1000;
- devc->end_time = now + devc->limit_msec;
- sr_dbg("Setting time limit to %" PRIu64 "ms.",
- devc->limit_msec);
- break;
- case SR_CONF_LIMIT_SAMPLES:
- devc->limit_samples = g_variant_get_uint64(data);
- sr_dbg("Setting sample limit to %" PRIu64 ".",
- devc->limit_samples);
- break;
- default:
- ret = SR_ERR_NA;
- }
-
- return ret;
+ return sr_sw_limits_config_set(&devc->sw_limits, key, data);
}
static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,
@@ -356,20 +280,20 @@ static void receive_data(struct sr_dev_inst *sdi, unsigned char *data, int len)
crc = crc16_mcrf4xx(0xffff, devc->reply, devc->reply_size - 2);
if (crc == RL16(&devc->reply[devc->reply_size - 2])) {
testo_receive_packet(sdi);
- devc->num_samples++;
+ sr_sw_limits_update_samples_read(&devc->sw_limits, 1);
} else {
sr_dbg("Packet has invalid CRC.");
}
devc->reply_size = 0;
- if (devc->limit_samples && devc->num_samples >= devc->limit_samples)
- dev_acquisition_stop(sdi, devc->cb_data);
+ if (sr_sw_limits_check(&devc->sw_limits))
+ dev_acquisition_stop(sdi);
else
testo_request_packet(sdi);
}
-SR_PRIV void receive_transfer(struct libusb_transfer *transfer)
+SR_PRIV void LIBUSB_CALL receive_transfer(struct libusb_transfer *transfer)
{
struct dev_context *devc;
struct sr_dev_inst *sdi;
@@ -383,7 +307,7 @@ SR_PRIV void receive_transfer(struct libusb_transfer *transfer)
if (transfer->status == LIBUSB_TRANSFER_NO_DEVICE) {
/* USB device was unplugged. */
- dev_acquisition_stop(sdi, devc->cb_data);
+ dev_acquisition_stop(sdi);
} else if (transfer->status == LIBUSB_TRANSFER_COMPLETED) {
/* First two bytes in any transfer are FTDI status bytes. */
if (transfer->actual_length > 2)
@@ -398,7 +322,7 @@ SR_PRIV void receive_transfer(struct libusb_transfer *transfer)
libusb_error_name(ret));
g_free(transfer->buffer);
libusb_free_transfer(transfer);
- dev_acquisition_stop(sdi, devc->cb_data);
+ dev_acquisition_stop(sdi);
}
} else {
/* This was the last transfer we're going to receive, so
@@ -410,32 +334,27 @@ SR_PRIV void receive_transfer(struct libusb_transfer *transfer)
static int handle_events(int fd, int revents, void *cb_data)
{
+ struct sr_dev_driver *di;
struct dev_context *devc;
- struct drv_context *drvc = di->priv;
- struct sr_datafeed_packet packet;
+ struct drv_context *drvc;
struct sr_dev_inst *sdi;
struct timeval tv;
- gint64 now;
(void)fd;
(void)revents;
sdi = cb_data;
devc = sdi->priv;
+ di = sdi->driver;
+ drvc = di->context;
- if (devc->limit_msec) {
- now = g_get_monotonic_time() / 1000;
- if (now > devc->end_time)
- dev_acquisition_stop(sdi, devc->cb_data);
- }
+ if (sr_sw_limits_check(&devc->sw_limits))
+ dev_acquisition_stop(sdi);
if (sdi->status == SR_ST_STOPPING) {
usb_source_remove(sdi->session, drvc->sr_ctx);
-
dev_close(sdi);
-
- packet.type = SR_DF_END;
- sr_session_send(sdi, &packet);
+ std_session_send_df_end(sdi, LOG_PREFIX);
}
memset(&tv, 0, sizeof(struct timeval));
@@ -445,8 +364,9 @@ static int handle_events(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 sr_dev_driver *di = sdi->driver;
struct drv_context *drvc;
struct dev_context *devc;
struct sr_usb_dev_inst *usb;
@@ -454,24 +374,16 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
int ret;
unsigned char *buf;
- drvc = di->priv;
+ drvc = di->context;
if (sdi->status != SR_ST_ACTIVE)
return SR_ERR_DEV_CLOSED;
- if (!di->priv) {
- sr_err("Driver was not initialized.");
- return SR_ERR;
- }
devc = sdi->priv;
usb = sdi->conn;
- devc->cb_data = cb_data;
- devc->end_time = 0;
- devc->num_samples = 0;
devc->reply_size = 0;
- /* Send header packet to the session bus. */
- std_session_send_df_header(cb_data, LOG_PREFIX);
+ std_session_send_df_header(sdi, LOG_PREFIX);
usb_source_add(sdi->session, drvc->sr_ctx, 100,
handle_events, (void *)sdi);
@@ -483,7 +395,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
if (testo_request_packet(sdi) != SR_OK)
return SR_ERR;
- buf = g_try_malloc(MAX_REPLY_SIZE);
+ buf = g_malloc(MAX_REPLY_SIZE);
transfer = libusb_alloc_transfer(0);
libusb_fill_bulk_transfer(transfer, usb->devhdl, EP_IN, buf,
MAX_REPLY_SIZE, receive_transfer, (void *)sdi, 100);
@@ -495,18 +407,13 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
}
devc->reply_size = 0;
+ sr_sw_limits_acquisition_start(&devc->sw_limits);
+
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)
{
- (void)cb_data;
-
- if (!di->priv) {
- sr_err("Driver was not initialized.");
- return SR_ERR;
- }
-
if (sdi->status != SR_ST_ACTIVE)
return SR_ERR_DEV_CLOSED;
@@ -515,15 +422,14 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
return SR_OK;
}
-SR_PRIV struct sr_dev_driver testo_driver_info = {
+static struct sr_dev_driver testo_driver_info = {
.name = "testo",
.longname = "Testo",
.api_version = 1,
- .init = init,
- .cleanup = cleanup,
+ .init = std_init,
+ .cleanup = std_cleanup,
.scan = scan,
- .dev_list = dev_list,
- .dev_clear = dev_clear,
+ .dev_list = std_dev_list,
.config_get = config_get,
.config_set = config_set,
.config_list = config_list,
@@ -531,5 +437,6 @@ SR_PRIV struct sr_dev_driver testo_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(testo_driver_info);