X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Flink-mso19%2Fapi.c;h=4fcc87a076f13c090f2bdb2aa82d2df682b484ac;hb=1c47e0da8f2571bc34dbdc368c3c1f55318c3aa0;hp=08fcb4b74ac347a9b4dc09ec293061cba506e8fb;hpb=5827f61b641cfd326a9cf2ea534eb4f9481a8187;p=libsigrok.git
diff --git a/src/hardware/link-mso19/api.c b/src/hardware/link-mso19/api.c
index 08fcb4b7..4fcc87a0 100644
--- a/src/hardware/link-mso19/api.c
+++ b/src/hardware/link-mso19/api.c
@@ -19,6 +19,7 @@
* along with this program. If not, see .
*/
+#include
#include "protocol.h"
static const uint32_t devopts[] = {
@@ -38,9 +39,9 @@ static const uint32_t devopts[] = {
*
* See also: http://www.linkinstruments.com/images/mso19_1113.gif
*/
-SR_PRIV const char *mso19_channel_names[NUM_CHANNELS + 1] = {
+static const char *channel_names[] = {
/* Note: DSO needs to be first. */
- "DSO", "0", "1", "2", "3", "4", "5", "6", "7", NULL,
+ "DSO", "0", "1", "2", "3", "4", "5", "6", "7",
};
static const uint64_t samplerates[] = {
@@ -50,10 +51,9 @@ static const uint64_t samplerates[] = {
};
SR_PRIV struct sr_dev_driver link_mso19_driver_info;
-static struct sr_dev_driver *di = &link_mso19_driver_info;
/* TODO: Use sr_dev_inst to store connection handle & use std_dev_clear(). */
-static int dev_clear(void)
+static int dev_clear(const struct sr_dev_driver *di)
{
GSList *l;
struct sr_dev_inst *sdi;
@@ -61,7 +61,7 @@ static int dev_clear(void)
struct dev_context *devc;
int ret = SR_OK;
- if (!(drvc = di->priv))
+ if (!(drvc = di->context))
return SR_OK;
/* Properly close and free all devices. */
@@ -88,12 +88,12 @@ static int dev_clear(void)
return ret;
}
-static int init(struct sr_context *sr_ctx)
+static int init(struct sr_dev_driver *di, 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)
{
int i;
GSList *devices = NULL;
@@ -117,7 +117,7 @@ static GSList *scan(GSList *options)
}
if (!conn)
conn = SERIALCONN;
- if (serialcomm == NULL)
+ if (!serialcomm)
serialcomm = SERIALCOMM;
udev = udev_new();
@@ -178,10 +178,7 @@ static GSList *scan(GSList *options)
//Create the device context and set its params
struct dev_context *devc;
- if (!(devc = g_try_malloc0(sizeof(struct dev_context)))) {
- sr_err("Device context malloc failed.");
- return devices;
- }
+ devc = g_malloc0(sizeof(struct dev_context));
if (mso_parse_serial(iSerial, iProduct, devc) != SR_OK) {
sr_err("Invalid iSerial: %s.", iSerial);
@@ -198,13 +195,13 @@ static GSList *scan(GSList *options)
devc->protocol_trigger.mask[i] = 0xff;
}
- if (!(devc->serial = sr_serial_dev_inst_new(conn, serialcomm))) {
- g_free(devc);
- return devices;
- }
+ devc->serial = sr_serial_dev_inst_new(conn, serialcomm);
- struct sr_dev_inst *sdi = sr_dev_inst_new(0, SR_ST_INACTIVE,
- manufacturer, product, hwrev);
+ struct sr_dev_inst *sdi = g_malloc0(sizeof(struct sr_dev_inst));
+ sdi->status = SR_ST_INACTIVE;
+ sdi->vendor = g_strdup(manufacturer);
+ sdi->model = g_strdup(product);
+ sdi->version = g_strdup(hwrev);
if (!sdi) {
sr_err("Unable to create device instance for %s",
@@ -217,17 +214,13 @@ static GSList *scan(GSList *options)
sdi->driver = di;
sdi->priv = devc;
- for (i = 0; i < NUM_CHANNELS; i++) {
- struct sr_channel *ch;
+ for (i = 0; i < ARRAY_SIZE(channel_names); i++) {
chtype = (i == 0) ? SR_CHANNEL_ANALOG : SR_CHANNEL_LOGIC;
- if (!(ch = sr_channel_new(i, chtype, TRUE,
- mso19_channel_names[i])))
- return 0;
- sdi->channels = g_slist_append(sdi->channels, ch);
+ sr_channel_new(sdi, i, chtype, TRUE, channel_names[i]);
}
//Add the driver
- struct drv_context *drvc = di->priv;
+ struct drv_context *drvc = di->context;
drvc->instances = g_slist_append(drvc->instances, sdi);
devices = g_slist_append(devices, sdi);
}
@@ -235,9 +228,9 @@ static GSList *scan(GSList *options)
return devices;
}
-static GSList *dev_list(void)
+static GSList *dev_list(const struct sr_dev_driver *di)
{
- return ((struct drv_context *)(di->priv))->instances;
+ return ((struct drv_context *)(di->context))->instances;
}
static int dev_open(struct sr_dev_inst *sdi)
@@ -271,19 +264,19 @@ static int dev_open(struct sr_dev_inst *sdi)
return SR_OK;
}
-static int cleanup(void)
+static int cleanup(const struct sr_dev_driver *di)
{
return dev_clear();
}
-static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi,
+static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi,
const struct sr_channel_group *cg)
{
struct dev_context *devc;
(void)cg;
- switch (id) {
+ switch (key) {
case SR_CONF_SAMPLERATE:
if (sdi) {
devc = sdi->priv;
@@ -298,7 +291,7 @@ static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi,
return SR_OK;
}
-static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi,
+static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi,
const struct sr_channel_group *cg)
{
int ret;
@@ -314,7 +307,7 @@ static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi,
if (sdi->status != SR_ST_ACTIVE)
return SR_ERR_DEV_CLOSED;
- switch (id) {
+ switch (key) {
case SR_CONF_SAMPLERATE:
// FIXME
return mso_configure_rate(sdi, g_variant_get_uint64(data));
@@ -327,8 +320,6 @@ static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi,
ret = SR_ERR_ARG;
} else {
devc->limit_samples = num_samples;
- sr_dbg("setting limit_samples to %i\n",
- num_samples);
ret = SR_OK;
}
break;
@@ -455,7 +446,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
/* Reset trigger state. */
devc->trigger_state = 0x00;
- /* Send header packet to the session bus. */
std_session_send_df_header(cb_data, LOG_PREFIX);
/* Our first channel is analog, the other 8 are of type 'logic'. */
@@ -493,5 +483,5 @@ SR_PRIV struct sr_dev_driver link_mso19_driver_info = {
.dev_close = std_serial_dev_close,
.dev_acquisition_start = dev_acquisition_start,
.dev_acquisition_stop = dev_acquisition_stop,
- .priv = NULL,
+ .context = NULL,
};