#define SERIALCOMM "4800/8n1/dtr=1/rts=0/flow=1"
-SR_PRIV struct sr_dev_driver norma_dmm_driver_info;
-SR_PRIV struct sr_dev_driver siemens_b102x_driver_info;
+static struct sr_dev_driver norma_dmm_driver_info;
+static struct sr_dev_driver siemens_b102x_driver_info;
static const char *get_brandstr(struct sr_dev_driver *drv)
{
return nameref[type - 1][(drv == &siemens_b102x_driver_info)];
}
-static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
-{
- return std_init(di, sr_ctx, LOG_PREFIX);
-}
-
static GSList *scan(struct sr_dev_driver *drv, GSList *options)
{
struct sr_dev_inst *sdi;
- struct drv_context *drvc;
struct dev_context *devc;
struct sr_config *src;
struct sr_serial_dev_inst *serial;
char req[10];
devices = NULL;
- drvc = drv->context;
- drvc->instances = NULL;
conn = serialcomm = NULL;
for (l = options; l; l = l->next) {
devc = g_malloc0(sizeof(struct dev_context));
sr_sw_limits_init(&devc->limits);
devc->type = auxtype;
- devc->version = g_strdup(&buf[9]);
sdi->conn = serial;
sdi->priv = devc;
- sdi->driver = drv;
sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "P1");
- drvc->instances = g_slist_append(drvc->instances, sdi);
devices = g_slist_append(devices, sdi);
break;
}
if (!devices)
sr_serial_dev_inst_free(serial);
- return devices;
-}
-
-static int dev_close(struct sr_dev_inst *sdi)
-{
- struct dev_context *devc;
-
- std_serial_dev_close(sdi);
-
- /* Free dynamically allocated resources. */
- if ((devc = sdi->priv) && devc->version) {
- g_free(devc->version);
- devc->version = NULL;
- }
-
- return SR_OK;
+ return std_scan_complete(drv, devices);
}
static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sdi,
if (sdi->status != SR_ST_ACTIVE)
return SR_ERR_DEV_CLOSED;
- if (!(devc = sdi->priv)) {
- sr_err("sdi->priv was NULL.");
- return SR_ERR_BUG;
- }
+ devc = sdi->priv;
return sr_sw_limits_config_set(&devc->limits, key, data);
}
devc = sdi->priv;
sr_sw_limits_acquisition_start(&devc->limits);
- std_session_send_df_header(sdi, LOG_PREFIX);
+ std_session_send_df_header(sdi);
/* Poll every 100ms, or whenever some data comes in. */
serial = sdi->conn;
return SR_OK;
}
-static int dev_acquisition_stop(struct sr_dev_inst *sdi)
-{
- return std_serial_dev_acquisition_stop(sdi, dev_close,
- sdi->conn, LOG_PREFIX);
-}
-
-SR_PRIV struct sr_dev_driver norma_dmm_driver_info = {
+static struct sr_dev_driver norma_dmm_driver_info = {
.name = "norma-dmm",
.longname = "Norma DM9x0 DMMs",
.api_version = 1,
- .init = init,
+ .init = std_init,
.cleanup = std_cleanup,
.scan = scan,
.dev_list = std_dev_list,
.config_set = config_set,
.config_list = config_list,
.dev_open = std_serial_dev_open,
- .dev_close = dev_close,
+ .dev_close = std_serial_dev_close,
.dev_acquisition_start = dev_acquisition_start,
- .dev_acquisition_stop = dev_acquisition_stop,
+ .dev_acquisition_stop = std_serial_dev_acquisition_stop,
.context = NULL,
};
+SR_REGISTER_DEV_DRIVER(norma_dmm_driver_info);
-SR_PRIV struct sr_dev_driver siemens_b102x_driver_info = {
+static struct sr_dev_driver siemens_b102x_driver_info = {
.name = "siemens-b102x",
.longname = "Siemens B102x DMMs",
.api_version = 1,
- .init = init,
+ .init = std_init,
.cleanup = std_cleanup,
.scan = scan,
.dev_list = std_dev_list,
.config_set = config_set,
.config_list = config_list,
.dev_open = std_serial_dev_open,
- .dev_close = dev_close,
+ .dev_close = std_serial_dev_close,
.dev_acquisition_start = dev_acquisition_start,
- .dev_acquisition_stop = dev_acquisition_stop,
+ .dev_acquisition_stop = std_serial_dev_acquisition_stop,
.context = NULL,
};
+SR_REGISTER_DEV_DRIVER(siemens_b102x_driver_info);