},
};
-static int init_lps301(struct sr_context *sr_ctx)
+static int init_lps301(struct sr_dev_driver *di, struct sr_context *sr_ctx)
{
- return std_init(sr_ctx, &motech_lps_301_driver_info, LOG_PREFIX);
+ return std_init(sr_ctx, di, LOG_PREFIX);
}
/** Send command to device with va_list.
serialcomm = SERIALCOMM;
/* Init serial port. */
- if (!(serial = sr_serial_dev_inst_new(conn, serialcomm)))
- return NULL;
+ serial = sr_serial_dev_inst_new(conn, serialcomm);
if (serial_open(serial, SERIAL_RDWR) != SR_OK)
goto exit_err;
/* Setup channels and channel groups. */
for (cnt = 0; cnt < models[modelid].num_channels; cnt++) {
snprintf(channel, sizeof(channel), "CH%d", cnt + 1);
- ch = sr_channel_new(cnt, SR_CHANNEL_ANALOG, TRUE, channel);
- sdi->channels = g_slist_append(sdi->channels, ch);
+ ch = sr_channel_new(sdi, cnt, SR_CHANNEL_ANALOG, TRUE, channel);
devc->channel_status[cnt].info = g_slist_append(NULL, ch);
}
/** Scan for LPS-301 device. */
-static GSList *scan_lps301(GSList *options)
-{
- return do_scan(LPS_301, &motech_lps_301_driver_info, options);
-}
-
-static GSList *doDevList(struct sr_dev_driver *drv)
+static GSList *scan_lps301(struct sr_dev_driver *di, GSList *options)
{
- return ((struct drv_context *)(drv->priv))->instances;
+ return do_scan(LPS_301, di, options);
}
-static GSList *dev_list_lps301(void)
+static GSList *dev_list_lps301(const struct sr_dev_driver *di)
{
- return doDevList(&motech_lps_301_driver_info);
+ return ((struct drv_context *)(di->priv))->instances;
}
static void dev_clear_private(struct dev_context* devc)
g_timer_destroy(devc->elapsed_msec);
}
-static int dev_clear_lps301(void)
+static int dev_clear_lps301(const struct sr_dev_driver *di)
{
- return std_dev_clear(&motech_lps_301_driver_info, (std_dev_clear_callback)dev_clear_private);
+ return std_dev_clear(di, (std_dev_clear_callback)dev_clear_private);
}
-static int cleanup(void)
+static int cleanup(const struct sr_dev_driver *di)
{
- return dev_clear_lps301();
+ return dev_clear_lps301(di);
}
static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,