X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fcolead-slm%2Fapi.c;h=acf0c6eb1c27707bb6bbd68b1e9c444caf38ddfe;hb=94e9021b3ee2d18ef0480c6fa95f0d950cf12eb9;hp=b85f831a4ffa3af4acabac24eedd714a0a527417;hpb=4d729ddcaf395de1d04af93dd5ea569cfbc17de4;p=libsigrok.git diff --git a/hardware/colead-slm/api.c b/hardware/colead-slm/api.c index b85f831a..acf0c6eb 100644 --- a/hardware/colead-slm/api.c +++ b/hardware/colead-slm/api.c @@ -21,171 +21,235 @@ #include "libsigrok.h" #include "libsigrok-internal.h" #include "protocol.h" +#include +#include +#include +#include +#include + +/* The Colead SL-5868P uses this. */ +#define SERIALCOMM "2400/8n1" + +static const int32_t hwopts[] = { + SR_CONF_CONN, + SR_CONF_SERIALCOMM, +}; + +static const int32_t hwcaps[] = { + SR_CONF_SOUNDLEVELMETER, + SR_CONF_LIMIT_SAMPLES, + SR_CONF_LIMIT_MSEC, + SR_CONF_CONTINUOUS, +}; SR_PRIV struct sr_dev_driver colead_slm_driver_info; static struct sr_dev_driver *di = &colead_slm_driver_info; -/* Properly close and free all devices. */ -static int clear_instances(void) +static int dev_clear(void) { - struct sr_dev_inst *sdi; - struct drv_context *drvc; - struct dev_context *devc; - GSList *l; - - drvc = di->priv; - for (l = drvc->instances; l; l = l->next) { - if (!(sdi = l->data)) - continue; - if (!(devc = sdi->priv)) - continue; - - /* TODO */ - - sr_dev_inst_free(sdi); - } - - g_slist_free(drvc->instances); - drvc->instances = NULL; - - return SR_OK; + return std_dev_clear(di, NULL); } -static int hw_init(void) +static int 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; - } - - /* TODO */ - - di->priv = drvc; - - return SR_OK; + return std_init(sr_ctx, di, LOG_PREFIX); } -static GSList *hw_scan(GSList *options) +static GSList *scan(GSList *options) { struct drv_context *drvc; - GSList *devices; - - (void)options; + struct dev_context *devc; + struct sr_dev_inst *sdi; + struct sr_config *src; + struct sr_probe *probe; + GSList *devices, *l; + const char *conn, *serialcomm; - devices = NULL; drvc = di->priv; drvc->instances = NULL; - /* TODO */ + devices = NULL; - return devices; -} + conn = serialcomm = NULL; + for (l = options; l; l = l->next) { + src = l->data; + switch (src->key) { + case SR_CONF_CONN: + conn = g_variant_get_string(src->data, NULL); + break; + case SR_CONF_SERIALCOMM: + serialcomm = g_variant_get_string(src->data, NULL); + break; + } + } + if (!conn) + return NULL; + if (!serialcomm) + serialcomm = SERIALCOMM; + + if (!(sdi = sr_dev_inst_new(0, SR_ST_INACTIVE, "Colead", + "SL-5868P", NULL))) + return NULL; + + if (!(devc = g_try_malloc0(sizeof(struct dev_context)))) { + sr_dbg("Device context malloc failed."); + return NULL; + } -static GSList *hw_dev_list(void) -{ - struct drv_context *drvc; + if (!(sdi->conn = sr_serial_dev_inst_new(conn, serialcomm))) + return NULL; - drvc = di->priv; + sdi->inst_type = SR_INST_SERIAL; + sdi->priv = devc; + sdi->driver = di; + if (!(probe = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "P1"))) + return NULL; + sdi->probes = g_slist_append(sdi->probes, probe); + drvc->instances = g_slist_append(drvc->instances, sdi); + devices = g_slist_append(devices, sdi); - return drvc->instances; + return devices; } -static int hw_dev_open(struct sr_dev_inst *sdi) +static GSList *dev_list(void) { - /* TODO */ - - return SR_OK; + return ((struct drv_context *)(di->priv))->instances; } -static int hw_dev_close(struct sr_dev_inst *sdi) +static int dev_open(struct sr_dev_inst *sdi) { - /* TODO */ + struct sr_serial_dev_inst *serial; + + serial = sdi->conn; + if (serial_open(serial, SERIAL_RDWR) != SR_OK) + return SR_ERR; + + sdi->status = SR_ST_ACTIVE; return SR_OK; } -static int hw_cleanup(void) +static int dev_close(struct sr_dev_inst *sdi) { - clear_instances(); + struct sr_serial_dev_inst *serial; - /* TODO */ + serial = sdi->conn; + if (serial && serial->fd != -1) { + serial_close(serial); + sdi->status = SR_ST_INACTIVE; + } return SR_OK; } -static int hw_info_get(int info_id, const void **data, - const struct sr_dev_inst *sdi) +static int cleanup(void) { - switch (info_id) { - /* TODO */ - default: - sr_err("Unknown info_id: %d.", info_id); - return SR_ERR_ARG; - } - - return SR_OK; + return dev_clear(); } -static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap, - const void *value) +static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi) { - int ret; + struct dev_context *devc; - if (sdi->status != SR_ST_ACTIVE) { - sr_err("Device inactive, can't set config options."); - return SR_ERR; + 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; } - ret = SR_OK; - switch (hwcap) { - /* TODO */ + switch (id) { + 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; + } + 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: - sr_err("Unknown hardware capability: %d.", hwcap); - ret = SR_ERR_ARG; + return SR_ERR_NA; } - return ret; + return SR_OK; } -static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi, - void *cb_data) +static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi) { - /* TODO */ + + (void)sdi; + + switch (key) { + case SR_CONF_SCAN_OPTIONS: + *data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32, + hwopts, ARRAY_SIZE(hwopts), sizeof(int32_t)); + break; + case SR_CONF_DEVICE_OPTIONS: + *data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32, + hwcaps, ARRAY_SIZE(hwcaps), sizeof(int32_t)); + break; + default: + return SR_ERR_NA; + } return SR_OK; } -static int hw_dev_acquisition_stop(const struct sr_dev_inst *sdi, - void *cb_data) +static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data) { - (void)cb_data; + struct dev_context *devc; + struct sr_serial_dev_inst *serial; - if (sdi->status != SR_ST_ACTIVE) { - sr_err("Device inactive, can't stop acquisition."); - return SR_ERR; + 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; } - /* TODO */ + devc->cb_data = cb_data; + + /* Send header packet to the session bus. */ + std_session_send_df_header(cb_data, LOG_PREFIX); + + /* Poll every 150ms, or whenever some data comes in. */ + serial = sdi->conn; + sr_source_add(serial->fd, G_IO_IN, 150, colead_slm_receive_data, + (void *)sdi); return SR_OK; } +static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data) +{ + return std_dev_acquisition_stop_serial(sdi, cb_data, dev_close, + sdi->conn, LOG_PREFIX); +} + SR_PRIV struct sr_dev_driver colead_slm_driver_info = { .name = "colead-slm", .longname = "Colead SLM", .api_version = 1, - .init = hw_init, - .cleanup = hw_cleanup, - .scan = hw_scan, - .dev_list = hw_dev_list, - .dev_clear = clear_instances, - .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, + .init = init, + .cleanup = cleanup, + .scan = scan, + .dev_list = dev_list, + .dev_clear = dev_clear, + .config_get = NULL, + .config_set = config_set, + .config_list = config_list, + .dev_open = dev_open, + .dev_close = dev_close, + .dev_acquisition_start = dev_acquisition_start, + .dev_acquisition_stop = dev_acquisition_stop, .priv = NULL, };