#include <glib.h>
#include <libudev.h>
#include <arpa/inet.h>
-#include "sigrok.h"
-#include "sigrok-internal.h"
+#include "libsigrok.h"
+#include "libsigrok-internal.h"
#include "link-mso19.h"
#define USB_VENDOR "3195"
#define NUM_PROBES 8
-static int hwcaps[] = {
+static const int hwcaps[] = {
SR_HWCAP_LOGIC_ANALYZER,
// SR_HWCAP_OSCILLOSCOPE,
// SR_HWCAP_PAT_GENERATOR,
NULL,
};
-static uint64_t supported_samplerates[] = {
+static const uint64_t supported_samplerates[] = {
SR_HZ(100),
SR_HZ(200),
SR_HZ(500),
0,
};
-static struct sr_samplerates samplerates = {
- SR_HZ(100),
- SR_MHZ(200),
- SR_HZ(0),
+static const struct sr_samplerates samplerates = {
+ 0,
+ 0,
+ 0,
supported_samplerates,
};
return SR_OK;
}
-static int hw_init(const char *devinfo)
+static int hw_init(void)
+{
+
+ /* Nothing to do. */
+
+ return SR_OK;
+}
+
+static int hw_scan(void)
{
struct sr_dev_inst *sdi;
int devcnt = 0;
struct udev_list_entry *devs, *dev_list_entry;
struct context *ctx;
- devinfo = devinfo;
-
/* It's easier to map usb<->serial using udev */
/*
* FIXME: On windows we can get the same information from the
if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) {
sr_err("mso19: %s: sdi was NULL", __func__);
- return SR_ERR; /* TODO: SR_ERR_ARG? */
+ return SR_ERR_BUG;
}
/* TODO */
return SR_OK;
}
-static void *hw_dev_info_get(int dev_index, int dev_info_id)
+static const void *hw_dev_info_get(int dev_index, int dev_info_id)
{
struct sr_dev_inst *sdi;
struct context *ctx;
- void *info = NULL;
+ const void *info = NULL;
if (!(sdi = sr_dev_inst_get(dev_insts, dev_index)))
return NULL;
return sdi->status;
}
-static int *hw_hwcap_get_all(void)
+static const int *hw_hwcap_get_all(void)
{
return hwcaps;
}
-static int hw_dev_config_set(int dev_index, int hwcap, void *value)
+static int hw_dev_config_set(int dev_index, int hwcap, const void *value)
{
struct sr_dev_inst *sdi;
switch (hwcap) {
case SR_HWCAP_SAMPLERATE:
- return mso_configure_rate(sdi, *(uint64_t *) value);
+ return mso_configure_rate(sdi, *(const uint64_t *) value);
case SR_HWCAP_PROBECONFIG:
case SR_HWCAP_LIMIT_SAMPLES:
default:
#define MSO_TRIGGER_DATAREADY '6'
/* FIXME: Pass errors? */
-static int receive_data(int fd, int revents, void *user_data)
+static int receive_data(int fd, int revents, void *cb_data)
{
- struct sr_dev_inst *sdi = user_data;
+ struct sr_dev_inst *sdi = cb_data;
struct context *ctx = sdi->priv;
struct sr_datafeed_packet packet;
struct sr_datafeed_logic logic;
double analog_out[1024];
size_t i, s;
- revents = revents;
+ /* Avoid compiler warnings. */
+ (void)revents;
s = serial_read(fd, in, sizeof(in));
if (s <= 0)
logic.length = 1024;
logic.unitsize = 1;
logic.data = logic_out;
- sr_session_send(ctx->session_id, &packet);
+ sr_session_send(ctx->session_dev_id, &packet);
// Dont bother fixing this yet, keep it "old style"
/*
packet.length = 1024;
packet.unitsize = sizeof(double);
packet.payload = analog_out;
- sr_session_send(ctx->session_id, &packet);
+ sr_session_send(ctx->session_dev_id, &packet);
*/
packet.type = SR_DF_END;
- sr_session_send(ctx->session_id, &packet);
+ sr_session_send(ctx->session_dev_id, &packet);
return TRUE;
}
-static int hw_dev_acquisition_start(int dev_index, gpointer session_dev_id)
+static int hw_dev_acquisition_start(int dev_index, void *cb_data)
{
struct sr_dev_inst *sdi;
struct context *ctx;
if (ret != SR_OK)
return ret;
- ctx->session_id = session_dev_id;
+ ctx->session_dev_id = cb_data;
sr_source_add(sdi->serial->fd, G_IO_IN, -1, receive_data, sdi);
packet.type = SR_DF_HEADER;
header.samplerate = ctx->cur_rate;
// header.num_analog_probes = 1;
header.num_logic_probes = 8;
- sr_session_send(session_dev_id, &packet);
+ sr_session_send(ctx->session_dev_id, &packet);
return ret;
}
-/* FIXME */
-static int hw_dev_acquisition_stop(int dev_index, gpointer session_dev_id)
+/* TODO: This stops acquisition on ALL devices, ignoring dev_index. */
+static int hw_dev_acquisition_stop(int dev_index, void *cb_data)
{
struct sr_datafeed_packet packet;
- dev_index = dev_index;
+ /* Avoid compiler warnings. */
+ (void)dev_index;
packet.type = SR_DF_END;
- sr_session_send(session_dev_id, &packet);
+ sr_session_send(cb_data, &packet);
return SR_OK;
}
.api_version = 1,
.init = hw_init,
.cleanup = hw_cleanup,
+ .scan = hw_scan,
.dev_open = hw_dev_open,
.dev_close = hw_dev_close,
.dev_info_get = hw_dev_info_get,