* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#include <config.h>
#include <string.h>
#include "protocol.h"
};
SR_PRIV struct sr_dev_driver kecheng_kc_330b_driver_info;
-static struct sr_dev_driver *di = &kecheng_kc_330b_driver_info;
-
-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 int scan_kecheng(struct sr_usb_dev_inst *usb, char **model)
+static int scan_kecheng(struct sr_dev_driver *di,
+ struct sr_usb_dev_inst *usb, char **model)
{
struct drv_context *drvc;
int len, ret;
unsigned char cmd, buf[32];
- drvc = di->priv;
+ drvc = di->context;
if (sr_usb_open(drvc->sr_ctx->libusb_ctx, usb) != SR_OK)
return SR_ERR;
return SR_OK;
}
-static GSList *scan(GSList *options)
+static GSList *scan(struct sr_dev_driver *di, GSList *options)
{
struct drv_context *drvc;
struct dev_context *devc;
struct sr_dev_inst *sdi;
- struct sr_channel *ch;
GSList *usb_devices, *devices, *l;
char *model;
(void)options;
- drvc = di->priv;
+ drvc = di->context;
drvc->instances = NULL;
devices = NULL;
/* We have a list of sr_usb_dev_inst matching the connection
* string. Wrap them in sr_dev_inst and we're done. */
for (l = usb_devices; l; l = l->next) {
- if (scan_kecheng(l->data, &model) != SR_OK)
+ if (scan_kecheng(di, l->data, &model) != SR_OK)
continue;
- sdi = sr_dev_inst_new();
+ sdi = g_malloc0(sizeof(struct sr_dev_inst));
sdi->status = SR_ST_INACTIVE;
sdi->vendor = g_strdup(VENDOR);
sdi->model = model; /* Already g_strndup()'d. */
sdi->driver = di;
sdi->inst_type = SR_INST_USB;
sdi->conn = l->data;
- if (!(ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "SPL")))
- return NULL;
- sdi->channels = g_slist_append(sdi->channels, ch);
-
- if (!(devc = g_try_malloc(sizeof(struct dev_context)))) {
- sr_dbg("Device context malloc failed.");
- return NULL;
- }
+ sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "SPL");
+ devc = g_malloc0(sizeof(struct dev_context));
sdi->priv = devc;
devc->limit_samples = 0;
/* The protocol provides no way to read the current
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)
{
+ struct sr_dev_driver *di = sdi->driver;
struct drv_context *drvc;
struct sr_usb_dev_inst *usb;
int ret;
- if (!(drvc = di->priv)) {
+ if (!(drvc = di->context)) {
sr_err("Driver was not initialized.");
return SR_ERR;
}
static int dev_close(struct sr_dev_inst *sdi)
{
+ struct sr_dev_driver *di = sdi->driver;
struct dev_context *devc;
struct sr_usb_dev_inst *usb;
- if (!di->priv) {
+ if (!di->context) {
sr_err("Driver was not initialized.");
return SR_ERR;
}
return SR_OK;
}
-static int cleanup(void)
+static int cleanup(const struct sr_dev_driver *di)
{
int ret;
struct drv_context *drvc;
- if (!(drvc = di->priv))
+ if (!(drvc = di->context))
/* Can get called on an unused driver, doesn't matter. */
return SR_OK;
-
ret = std_dev_clear(di, NULL);
g_free(drvc);
- di->priv = NULL;
return ret;
}
static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sdi,
const struct sr_channel_group *cg)
{
+ struct sr_dev_driver *di = sdi->driver;
struct dev_context *devc;
uint64_t p, q;
unsigned int i;
if (sdi->status != SR_ST_ACTIVE)
return SR_ERR_DEV_CLOSED;
- if (!di->priv) {
+ if (!di->context) {
sr_err("Driver was not initialized.");
return SR_ERR;
}
static int dev_acquisition_start(const struct sr_dev_inst *sdi,
void *cb_data)
{
+ struct sr_dev_driver *di = sdi->driver;
struct drv_context *drvc;
struct dev_context *devc;
struct sr_datafeed_packet packet;
if (sdi->status != SR_ST_ACTIVE)
return SR_ERR_DEV_CLOSED;
- drvc = di->priv;
+ drvc = di->context;
devc = sdi->priv;
usb = sdi->conn;
.dev_close = dev_close,
.dev_acquisition_start = dev_acquisition_start,
.dev_acquisition_stop = dev_acquisition_stop,
- .priv = NULL,
+ .context = NULL,
};