* @internal
*/
+#include <config.h>
#include "protocol.h"
static const uint32_t scanopts[] = {
SR_PRIV struct sr_dev_driver norma_dmm_driver_info;
SR_PRIV struct sr_dev_driver siemens_b102x_driver_info;
-static const char* get_brandstr(struct sr_dev_driver* drv)
+static const char *get_brandstr(struct sr_dev_driver *drv)
{
- if (drv == &norma_dmm_driver_info)
- return "Norma";
- else
- return "Siemens";
+ return (drv == &norma_dmm_driver_info) ? "Norma" : "Siemens";
}
-static const char* get_typestr(int type, struct sr_dev_driver* drv)
+static const char *get_typestr(int type, struct sr_dev_driver *drv)
{
- static const char* nameref[5][2] = {
+ static const char *nameref[5][2] = {
{"DM910", "B1024"},
{"DM920", "B1025"},
{"DM930", "B1026"},
{"DM940", "B1027"},
- {"DM950", "B1028"}};
+ {"DM950", "B1028"},
+ };
if ((type < 1) || (type > 5))
return "Unknown type!";
- return nameref[type-1][(drv == &siemens_b102x_driver_info)];
+ return nameref[type - 1][(drv == &siemens_b102x_driver_info)];
}
-static int init_norma_dmm(struct sr_context *sr_ctx)
+static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
{
- return std_init(sr_ctx, &norma_dmm_driver_info, LOG_PREFIX);
+ return std_init(sr_ctx, di, LOG_PREFIX);
}
-static int init_siemens_b102x(struct sr_context *sr_ctx)
-{
- return std_init(sr_ctx, &siemens_b102x_driver_info, LOG_PREFIX);
-}
-
-static GSList *do_scan(struct sr_dev_driver* drv, GSList *options)
+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_channel *ch;
struct sr_serial_dev_inst *serial;
GSList *l, *devices;
- int len, cnt;
+ int len, cnt, auxtype;
const char *conn, *serialcomm;
char *buf;
char req[10];
- int auxtype;
devices = NULL;
- drvc = drv->priv;
+ drvc = drv->context;
drvc->instances = NULL;
conn = serialcomm = NULL;
if (!serialcomm)
serialcomm = SERIALCOMM;
- 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 | SERIAL_NONBLOCK) != SR_OK)
+ if (serial_open(serial, SERIAL_RDWR) != SR_OK)
return NULL;
serial_flush(serial);
- if (!(buf = g_try_malloc(BUF_MAX))) {
- sr_err("Serial buffer malloc failed.");
- return NULL;
- }
+ buf = g_malloc(BUF_MAX);
snprintf(req, sizeof(req), "%s\r\n",
nmadmm_requests[NMADMM_REQ_IDN].req_str);
g_usleep(150 * 1000); /* Wait a little to allow serial port to settle. */
for (cnt = 0; cnt < 7; cnt++) {
- if (serial_write(serial, req, strlen(req)) == -1) {
- sr_err("Unable to send identification request: %d %s.",
- errno, strerror(errno));
+ if (serial_write_blocking(serial, req, strlen(req),
+ serial_timeout(serial, strlen(req))) < 0) {
+ sr_err("Unable to send identification request.");
return NULL;
}
len = BUF_MAX;
continue;
buf[BUF_MAX - 1] = '\0';
- /* Match ID string, e.g. "1834 065 V1.06,IF V1.02" (DM950) */
+ /* Match ID string, e.g. "1834 065 V1.06,IF V1.02" (DM950). */
if (g_regex_match_simple("^1834 [^,]*,IF V*", (char *)buf, 0, 0)) {
auxtype = xgittoint(buf[7]);
sr_spew("%s %s DMM %s detected!", get_brandstr(drv), get_typestr(auxtype, drv), buf + 9);
- if (!(sdi = sr_dev_inst_new(0, SR_ST_INACTIVE,
- get_brandstr(drv), get_typestr(auxtype, drv), buf + 9)))
- return NULL;
- if (!(devc = g_try_malloc0(sizeof(struct dev_context)))) {
- sr_err("Device context malloc failed.");
- return NULL;
- }
+ sdi = g_malloc0(sizeof(struct sr_dev_inst));
+ sdi->status = SR_ST_INACTIVE;
+ sdi->vendor = g_strdup(get_brandstr(drv));
+ sdi->model = g_strdup(get_typestr(auxtype, drv));
+ sdi->version = g_strdup(buf + 9);
+ devc = g_malloc0(sizeof(struct dev_context));
devc->type = auxtype;
devc->version = g_strdup(&buf[9]);
devc->elapsed_msec = g_timer_new();
-
sdi->conn = serial;
sdi->priv = devc;
sdi->driver = drv;
- if (!(ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE,
- "P1")))
- return NULL;
- sdi->channels = g_slist_append(sdi->channels, ch);
+ 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;
return devices;
}
-static GSList *scan_norma_dmm(GSList *options)
-{
- return do_scan(&norma_dmm_driver_info, options);
-}
-
-static GSList *scan_siemens_b102x(GSList *options)
+static GSList *dev_list(const struct sr_dev_driver *di)
{
- return do_scan(&siemens_b102x_driver_info, options);
-}
-
-static GSList *dev_list_norma_dmm(void)
-{
- return ((struct drv_context *)(norma_dmm_driver_info.priv))->instances;
-}
-
-static GSList *dev_list_siemens_b102x(void)
-{
- return ((struct drv_context *)(siemens_b102x_driver_info.priv))->instances;
+ return ((struct drv_context *)(di->context))->instances;
}
static int dev_close(struct sr_dev_inst *sdi)
return SR_OK;
}
-static int cleanup_norma_dmm(void)
+static int cleanup(const struct sr_dev_driver *di)
{
- return std_dev_clear(&norma_dmm_driver_info, NULL);
-}
-
-static int cleanup_siemens_b102x(void)
-{
- return std_dev_clear(&siemens_b102x_driver_info, NULL);
+ return std_dev_clear(di, NULL);
}
static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sdi,
switch (key) {
case SR_CONF_LIMIT_MSEC:
- if (g_variant_get_uint64(data) == 0) {
- sr_err("LIMIT_MSEC can't be 0.");
- return SR_ERR;
- }
devc->limit_msec = g_variant_get_uint64(data);
- sr_dbg("Setting time limit to %" PRIu64 "ms.",
- devc->limit_msec);
break;
case SR_CONF_LIMIT_SAMPLES:
devc->limit_samples = g_variant_get_uint64(data);
- sr_dbg("Setting sample limit to %" PRIu64 ".",
- devc->limit_samples);
break;
default:
return SR_ERR_NA;
return SR_OK;
}
-static int dev_acquisition_start(const struct sr_dev_inst *sdi,
- void *cb_data)
+static int dev_acquisition_start(const struct sr_dev_inst *sdi)
{
struct dev_context *devc;
struct sr_serial_dev_inst *serial;
- if (!sdi || !cb_data || !(devc = sdi->priv))
- return SR_ERR_BUG;
-
if (sdi->status != SR_ST_ACTIVE)
return SR_ERR_DEV_CLOSED;
- devc->cb_data = cb_data;
+ devc = sdi->priv;
- /* Send header packet to the session bus. */
- std_session_send_df_header(cb_data, LOG_PREFIX);
+ std_session_send_df_header(sdi, LOG_PREFIX);
/* Start timer, if required. */
if (devc->limit_msec)
return SR_OK;
}
-static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
+static int dev_acquisition_stop(struct sr_dev_inst *sdi)
{
struct dev_context *devc;
if (sdi && (devc = sdi->priv) && devc->limit_msec)
g_timer_stop(devc->elapsed_msec);
- return std_serial_dev_acquisition_stop(sdi, cb_data, dev_close,
+ return std_serial_dev_acquisition_stop(sdi, dev_close,
sdi->conn, LOG_PREFIX);
}
.name = "norma-dmm",
.longname = "Norma DM9x0 DMMs",
.api_version = 1,
- .init = init_norma_dmm,
- .cleanup = cleanup_norma_dmm,
- .scan = scan_norma_dmm,
- .dev_list = dev_list_norma_dmm,
+ .init = init,
+ .cleanup = cleanup,
+ .scan = scan,
+ .dev_list = dev_list,
.dev_clear = NULL,
.config_get = NULL,
.config_set = config_set,
.dev_close = dev_close,
.dev_acquisition_start = dev_acquisition_start,
.dev_acquisition_stop = dev_acquisition_stop,
- .priv = NULL,
+ .context = NULL,
};
-
SR_PRIV struct sr_dev_driver siemens_b102x_driver_info = {
.name = "siemens-b102x",
.longname = "Siemens B102x DMMs",
.api_version = 1,
- .init = init_siemens_b102x,
- .cleanup = cleanup_siemens_b102x,
- .scan = scan_siemens_b102x,
- .dev_list = dev_list_siemens_b102x,
+ .init = init,
+ .cleanup = cleanup,
+ .scan = scan,
+ .dev_list = dev_list,
.dev_clear = NULL,
.config_get = NULL,
.config_set = config_set,
.dev_close = dev_close,
.dev_acquisition_start = dev_acquisition_start,
.dev_acquisition_stop = dev_acquisition_stop,
- .priv = NULL,
+ .context = NULL,
};
projects / libsigrok.git / blobdiff