X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fnorma-dmm%2Fapi.c;h=798b60e151b7082ab8dfc1d1804b0d3db8397edd;hb=43cd4637285833706f8a404ca027bcf0ee75b9ae;hp=397694cabfa059eb7d8e299e961223b937ec256e;hpb=d43b090816f61e77d8054084e85202de1a1ebeb7;p=libsigrok.git diff --git a/hardware/norma-dmm/api.c b/hardware/norma-dmm/api.c index 397694ca..798b60e1 100644 --- a/hardware/norma-dmm/api.c +++ b/hardware/norma-dmm/api.c @@ -17,6 +17,11 @@ * along with this program. If not, see . */ +/** @file + * Norma DM9x0/Siemens B102x DMMs driver. + * @internal + */ + #include "protocol.h" static const int32_t hwopts[] = { @@ -36,31 +41,58 @@ static const int32_t hwcaps[] = { #define SERIALCOMM "4800/8n1/dtr=1/rts=0/flow=1" SR_PRIV struct sr_dev_driver norma_dmm_driver_info; -static struct sr_dev_driver *di = &norma_dmm_driver_info; +SR_PRIV struct sr_dev_driver siemens_b102x_driver_info; + +static const char* get_brandstr(struct sr_dev_driver* drv) +{ + if (drv == &norma_dmm_driver_info) + return "Norma"; + else + return "Siemens"; +} + +static const char* get_typestr(int type, struct sr_dev_driver* drv) +{ + static const char* nameref[5][2] = { + {"DM910", "B1024"}, + {"DM920", "B1025"}, + {"DM930", "B1026"}, + {"DM940", "B1027"}, + {"DM950", "B1028"}}; + + if ((type < 1) || (type > 5)) + return "Unknown type!"; + + return nameref[type-1][(drv == &siemens_b102x_driver_info)]; +} -static int init(struct sr_context *sr_ctx) +static int init_norma_dmm(struct sr_context *sr_ctx) { - return std_init(sr_ctx, di, LOG_PREFIX); + return std_init(sr_ctx, &norma_dmm_driver_info, LOG_PREFIX); } -static GSList *scan(GSList *options) +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) { struct sr_dev_inst *sdi; struct drv_context *drvc; struct dev_context *devc; struct sr_config *src; - struct sr_probe *probe; + struct sr_channel *ch; struct sr_serial_dev_inst *serial; GSList *l, *devices; int len, cnt; const char *conn, *serialcomm; char *buf; - char fmttype[10]; char req[10]; int auxtype; devices = NULL; - drvc = di->priv; + drvc = drv->priv; drvc->instances = NULL; conn = serialcomm = NULL; @@ -95,6 +127,7 @@ static GSList *scan(GSList *options) 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.", @@ -102,7 +135,7 @@ static GSList *scan(GSList *options) return NULL; } len = BUF_MAX; - serial_readline(serial, &buf, &len, 1500); + serial_readline(serial, &buf, &len, NMADMM_TIMEOUT_MS); if (!len) continue; buf[BUF_MAX - 1] = '\0'; @@ -110,12 +143,10 @@ static GSList *scan(GSList *options) /* 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]); - // TODO: Will this work with non-DM950? - snprintf(fmttype, sizeof(fmttype), "DM9%d0", auxtype); - sr_spew("Norma %s DMM %s detected!", fmttype, &buf[9]); + 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, - "Norma", fmttype, buf + 9))) + 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."); @@ -127,11 +158,11 @@ static GSList *scan(GSList *options) sdi->conn = serial; sdi->priv = devc; - sdi->driver = di; - if (!(probe = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, + sdi->driver = drv; + if (!(ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "P1"))) return NULL; - sdi->probes = g_slist_append(sdi->probes, probe); + sdi->channels = g_slist_append(sdi->channels, ch); drvc->instances = g_slist_append(drvc->instances, sdi); devices = g_slist_append(devices, sdi); break; @@ -158,27 +189,24 @@ static GSList *scan(GSList *options) return devices; } -static GSList *dev_list(void) +static GSList *scan_norma_dmm(GSList *options) { - return ((struct drv_context *)(di->priv))->instances; + return do_scan(&norma_dmm_driver_info, options); } -static int dev_clear(void) +static GSList *scan_siemens_b102x(GSList *options) { - return std_dev_clear(di, NULL); + return do_scan(&siemens_b102x_driver_info, options); } -static int dev_open(struct sr_dev_inst *sdi) +static GSList *dev_list_norma_dmm(void) { - struct sr_serial_dev_inst *serial; - - serial = sdi->conn; - if (serial_open(serial, SERIAL_RDWR | SERIAL_NONBLOCK) != SR_OK) - return SR_ERR; - - sdi->status = SR_ST_ACTIVE; + return ((struct drv_context *)(norma_dmm_driver_info.priv))->instances; +} - return SR_OK; +static GSList *dev_list_siemens_b102x(void) +{ + return ((struct drv_context *)(siemens_b102x_driver_info.priv))->instances; } static int dev_close(struct sr_dev_inst *sdi) @@ -197,17 +225,22 @@ static int dev_close(struct sr_dev_inst *sdi) return SR_OK; } -static int cleanup(void) +static int cleanup_norma_dmm(void) +{ + return std_dev_clear(&norma_dmm_driver_info, NULL); +} + +static int cleanup_siemens_b102x(void) { - return dev_clear(); + return std_dev_clear(&siemens_b102x_driver_info, NULL); } static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi, - const struct sr_probe_group *probe_group) + const struct sr_channel_group *cg) { struct dev_context *devc; - (void)probe_group; + (void)cg; if (sdi->status != SR_ST_ACTIVE) return SR_ERR_DEV_CLOSED; @@ -219,7 +252,6 @@ static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi, switch (key) { case SR_CONF_LIMIT_MSEC: - /* TODO: not yet implemented */ if (g_variant_get_uint64(data) == 0) { sr_err("LIMIT_MSEC can't be 0."); return SR_ERR; @@ -241,10 +273,10 @@ static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi, } static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi, - const struct sr_probe_group *probe_group) + const struct sr_channel_group *cg) { (void)sdi; - (void)probe_group; + (void)cg; switch (key) { case SR_CONF_SCAN_OPTIONS: @@ -268,9 +300,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, struct dev_context *devc; struct sr_serial_dev_inst *serial; - (void)sdi; - (void)cb_data; - if (!sdi || !cb_data || !(devc = sdi->priv)) return SR_ERR_BUG; @@ -288,8 +317,8 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, /* Poll every 100ms, or whenever some data comes in. */ serial = sdi->conn; - serial_source_add(serial, G_IO_IN, 100, norma_dmm_receive_data, - (void *)sdi); + serial_source_add(sdi->session, serial, G_IO_IN, 100, + norma_dmm_receive_data, (void *)sdi); return SR_OK; } @@ -308,17 +337,37 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data) SR_PRIV struct sr_dev_driver norma_dmm_driver_info = { .name = "norma-dmm", - .longname = "Norma DM9x0 / Siemens B102x DMMs", + .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, + .dev_clear = NULL, + .config_get = NULL, + .config_set = config_set, + .config_list = config_list, + .dev_open = std_serial_dev_open, + .dev_close = dev_close, + .dev_acquisition_start = dev_acquisition_start, + .dev_acquisition_stop = dev_acquisition_stop, + .priv = NULL, +}; + + +SR_PRIV struct sr_dev_driver siemens_b102x_driver_info = { + .name = "siemens-b102x", + .longname = "Siemens B102x DMMs", .api_version = 1, - .init = init, - .cleanup = cleanup, - .scan = scan, - .dev_list = dev_list, - .dev_clear = dev_clear, + .init = init_siemens_b102x, + .cleanup = cleanup_siemens_b102x, + .scan = scan_siemens_b102x, + .dev_list = dev_list_siemens_b102x, + .dev_clear = NULL, .config_get = NULL, .config_set = config_set, .config_list = config_list, - .dev_open = dev_open, + .dev_open = std_serial_dev_open, .dev_close = dev_close, .dev_acquisition_start = dev_acquisition_start, .dev_acquisition_stop = dev_acquisition_stop,