X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Ffluke-dmm%2Fapi.c;h=0b69010d4dc0762523f4d54f0d185df7be0a0016;hb=4afdfd4628e9955af02a3ea619ecdfe469f9a9e2;hp=7ac86fc8f49ec361a3225234b55395c11d6860c1;hpb=d4b11de09a42710c1c043693d5bda0fc8bc72f90;p=libsigrok.git diff --git a/hardware/fluke-dmm/api.c b/hardware/fluke-dmm/api.c index 7ac86fc8..0b69010d 100644 --- a/hardware/fluke-dmm/api.c +++ b/hardware/fluke-dmm/api.c @@ -28,27 +28,32 @@ #include "fluke-dmm.h" static const int hwopts[] = { - SR_HWOPT_CONN, - SR_HWOPT_SERIALCOMM, + SR_CONF_CONN, + SR_CONF_SERIALCOMM, 0, }; static const int hwcaps[] = { - SR_HWCAP_MULTIMETER, - SR_HWCAP_LIMIT_SAMPLES, - SR_HWCAP_LIMIT_MSEC, - SR_HWCAP_CONTINUOUS, + SR_CONF_MULTIMETER, + SR_CONF_LIMIT_SAMPLES, + SR_CONF_LIMIT_MSEC, + SR_CONF_CONTINUOUS, 0, }; -static const char *probe_names[] = { - "Probe", - NULL, -}; - SR_PRIV struct sr_dev_driver flukedmm_driver_info; static struct sr_dev_driver *di = &flukedmm_driver_info; +static char *scan_conn[] = { + /* 287/289 */ + "115200/8n1", + /* 187/189 */ + "9600/8n1", + /* Scopemeter 190 series */ + "1200/8n1", + NULL +}; + static const struct flukedmm_profile supported_flukedmm[] = { { FLUKE_187, "187", 100, 1000 }, { FLUKE_287, "287", 100, 1000 }, @@ -84,17 +89,7 @@ static int clear_instances(void) static int hw_init(struct sr_context *sr_ctx) { - struct drv_context *drvc; - - if (!(drvc = g_try_malloc0(sizeof(struct drv_context)))) { - sr_err("Driver context malloc failed."); - return SR_ERR_MALLOC; - } - - drvc->sr_ctx = sr_ctx; - di->priv = drvc; - - return SR_OK; + return std_hw_init(sr_ctx, di, DRIVER_LOG_DOMAIN); } static GSList *fluke_scan(const char *conn, const char *serialcomm) @@ -140,10 +135,15 @@ static GSList *fluke_scan(const char *conn, const char *serialcomm) /* If CMD_ACK was OK, ID string follows. */ len = 128; - serial_readline(serial, &b, &len, 150); + serial_readline(serial, &b, &len, 850); if (len < 10) continue; - tokens = g_strsplit(buf, ",", 3); + if (strcspn(buf, ",") < 15) + /* Looks like it's comma-separated. */ + tokens = g_strsplit(buf, ",", 3); + else + /* Fluke 199B, at least, uses semicolon. */ + tokens = g_strsplit(buf, ";", 3); if (!strncmp("FLUKE", tokens[0], 5) && tokens[1] && tokens[2]) { for (i = 0; supported_flukedmm[i].model; i++) { @@ -171,6 +171,9 @@ static GSList *fluke_scan(const char *conn, const char *serialcomm) } } g_strfreev(tokens); + if (devices) + /* Found one. */ + break; } serial_close(serial); if (!devices) @@ -181,19 +184,20 @@ static GSList *fluke_scan(const char *conn, const char *serialcomm) static GSList *hw_scan(GSList *options) { - struct sr_hwopt *opt; + struct sr_config *src; GSList *l, *devices; + int i; const char *conn, *serialcomm; conn = serialcomm = NULL; for (l = options; l; l = l->next) { - opt = l->data; - switch (opt->hwopt) { - case SR_HWOPT_CONN: - conn = opt->value; + src = l->data; + switch (src->key) { + case SR_CONF_CONN: + conn = src->value; break; - case SR_HWOPT_SERIALCOMM: - serialcomm = opt->value; + case SR_CONF_SERIALCOMM: + serialcomm = src->value; break; } } @@ -204,11 +208,13 @@ static GSList *hw_scan(GSList *options) /* Use the provided comm specs. */ devices = fluke_scan(conn, serialcomm); } else { - /* Try 115200, as used on 287/289. */ - devices = fluke_scan(conn, "115200/8n1"); - if (!devices) - /* Fall back to 9600 for 187/189. */ - devices = fluke_scan(conn, "9600/8n1"); + for (i = 0; scan_conn[i]; i++) { + if ((devices = fluke_scan(conn, scan_conn[i]))) + break; + /* The Scopemeter 199B, at least, requires this + * after all the 115k/9.6k confusion. */ + g_usleep(5000); + } } return devices; @@ -216,11 +222,7 @@ static GSList *hw_scan(GSList *options) static GSList *hw_dev_list(void) { - struct drv_context *drvc; - - drvc = di->priv; - - return drvc->instances; + return ((struct drv_context *)(di->priv))->instances; } static int hw_dev_open(struct sr_dev_inst *sdi) @@ -244,10 +246,7 @@ static int hw_dev_close(struct sr_dev_inst *sdi) { struct dev_context *devc; - if (!(devc = sdi->priv)) { - sr_err("sdi->priv was NULL."); - return SR_ERR_BUG; - } + devc = sdi->priv; if (devc->serial && devc->serial->fd != -1) { serial_close(devc->serial); @@ -265,34 +264,7 @@ static int hw_cleanup(void) return SR_OK; } -static int hw_info_get(int info_id, const void **data, - const struct sr_dev_inst *sdi) -{ - - (void)sdi; - - switch (info_id) { - case SR_DI_HWOPTS: - *data = hwopts; - break; - case SR_DI_HWCAPS: - *data = hwcaps; - break; - case SR_DI_NUM_PROBES: - *data = GINT_TO_POINTER(1); - break; - case SR_DI_PROBE_NAMES: - *data = probe_names; - break; - default: - return SR_ERR_ARG; - } - - return SR_OK; -} - -static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap, - const void *value) +static int config_set(int id, const void *value, const struct sr_dev_inst *sdi) { struct dev_context *devc; @@ -304,8 +276,8 @@ static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap, return SR_ERR_BUG; } - switch (hwcap) { - case SR_HWCAP_LIMIT_MSEC: + switch (id) { + case SR_CONF_LIMIT_MSEC: /* TODO: not yet implemented */ if (*(const uint64_t *)value == 0) { sr_err("LIMIT_MSEC can't be 0."); @@ -315,13 +287,13 @@ static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap, sr_dbg("Setting time limit to %" PRIu64 "ms.", devc->limit_msec); break; - case SR_HWCAP_LIMIT_SAMPLES: + case SR_CONF_LIMIT_SAMPLES: devc->limit_samples = *(const uint64_t *)value; sr_dbg("Setting sample limit to %" PRIu64 ".", devc->limit_samples); break; default: - sr_err("Unknown capability: %d.", hwcap); + sr_err("Unknown capability: %d.", id); return SR_ERR; break; } @@ -329,12 +301,28 @@ static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap, return SR_OK; } +static int config_list(int key, const void **data, const struct sr_dev_inst *sdi) +{ + + (void)sdi; + + switch (key) { + case SR_CONF_SCAN_OPTIONS: + *data = hwopts; + break; + case SR_CONF_DEVICE_OPTIONS: + *data = hwcaps; + break; + default: + return SR_ERR_ARG; + } + + return SR_OK; +} + static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data) { - struct sr_datafeed_packet packet; - struct sr_datafeed_header header; - struct sr_datafeed_meta_analog meta; struct dev_context *devc; if (!(devc = sdi->priv)) { @@ -342,24 +330,10 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi, return SR_ERR_BUG; } - sr_dbg("Starting acquisition."); - devc->cb_data = cb_data; /* Send header packet to the session bus. */ - sr_dbg("Sending SR_DF_HEADER."); - packet.type = SR_DF_HEADER; - packet.payload = (uint8_t *)&header; - header.feed_version = 1; - gettimeofday(&header.starttime, NULL); - sr_session_send(devc->cb_data, &packet); - - /* Send metadata about the SR_DF_ANALOG packets to come. */ - sr_dbg("Sending SR_DF_META_ANALOG."); - packet.type = SR_DF_META_ANALOG; - packet.payload = &meta; - meta.num_probes = 1; - sr_session_send(devc->cb_data, &packet); + std_session_send_df_header(cb_data, DRIVER_LOG_DOMAIN); /* Poll every 100ms, or whenever some data comes in. */ sr_source_add(devc->serial->fd, G_IO_IN, 50, fluke_receive_data, (void *)sdi); @@ -409,10 +383,10 @@ SR_PRIV struct sr_dev_driver flukedmm_driver_info = { .scan = hw_scan, .dev_list = hw_dev_list, .dev_clear = clear_instances, + .config_set = config_set, + .config_list = config_list, .dev_open = hw_dev_open, .dev_close = hw_dev_close, - .info_get = hw_info_get, - .dev_config_set = hw_dev_config_set, .dev_acquisition_start = hw_dev_acquisition_start, .dev_acquisition_stop = hw_dev_acquisition_stop, .priv = NULL,