X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Ftondaj-sl-814%2Fapi.c;h=3a3ea9662e9772c259c8e95f4b6f2c8c2b6cab50;hb=d5a669a9e0319531595a8a45b6c21f0c316a24f1;hp=8e79a81b049ab792b9e01af5ba302419a4e34b35;hpb=aa2af32432b3410421a89303ef48cc990ff39db9;p=libsigrok.git diff --git a/hardware/tondaj-sl-814/api.c b/hardware/tondaj-sl-814/api.c index 8e79a81b..3a3ea966 100644 --- a/hardware/tondaj-sl-814/api.c +++ b/hardware/tondaj-sl-814/api.c @@ -18,11 +18,27 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include #include #include "libsigrok.h" #include "libsigrok-internal.h" #include "protocol.h" +#define SERIALCOMM "9600/8e1" + +static const int hwopts[] = { + SR_CONF_CONN, + SR_CONF_SERIALCOMM, + 0, +}; + +static const int hwcaps[] = { + SR_CONF_SOUNDLEVELMETER, + SR_CONF_LIMIT_SAMPLES, + SR_CONF_CONTINUOUS, + 0, +}; + SR_PRIV struct sr_dev_driver tondaj_sl_814_driver_info; static struct sr_dev_driver *di = &tondaj_sl_814_driver_info; @@ -42,9 +58,7 @@ static int clear_instances(void) continue; if (!(devc = sdi->priv)) continue; - - /* TODO */ - + sr_serial_dev_inst_free(devc->serial); sr_dev_inst_free(sdi); } @@ -54,57 +68,109 @@ static int clear_instances(void) return SR_OK; } -static int hw_init(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; - } - - /* TODO */ - - di->priv = drvc; - - return SR_OK; + return std_hw_init(sr_ctx, di, DRIVER_LOG_DOMAIN); } static GSList *hw_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; + + conn = serialcomm = NULL; + for (l = options; l; l = l->next) { + if (!(src = l->data)) { + sr_err("Invalid option data, skipping."); + continue; + } + switch (src->key) { + case SR_CONF_CONN: + conn = src->value; + break; + case SR_CONF_SERIALCOMM: + serialcomm = src->value; + break; + default: + sr_err("Unknown option %d, skipping.", src->key); + break; + } + } + if (!conn) + return NULL; + if (!serialcomm) + serialcomm = SERIALCOMM; + + if (!(sdi = sr_dev_inst_new(0, SR_ST_INACTIVE, "Tondaj", + "SL-814", NULL))) { + sr_err("Failed to create device instance."); + return NULL; + } + + if (!(devc = g_try_malloc0(sizeof(struct dev_context)))) { + sr_err("Device context malloc failed."); + return NULL; + } + + if (!(devc->serial = sr_serial_dev_inst_new(conn, serialcomm))) + return NULL; + + if (serial_open(devc->serial, SERIAL_RDWR | SERIAL_NONBLOCK) != SR_OK) + return NULL; + + sdi->priv = devc; + sdi->driver = di; + probe = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "P1"); + if (!probe) { + sr_err("Failed to create probe."); + 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 devices; } 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) { - /* TODO */ + struct dev_context *devc; + + devc = sdi->priv; + + if (serial_open(devc->serial, SERIAL_RDWR | SERIAL_NONBLOCK) != SR_OK) + return SR_ERR; + + sdi->status = SR_ST_ACTIVE; return SR_OK; } static int hw_dev_close(struct sr_dev_inst *sdi) { - /* TODO */ + struct dev_context *devc; + + devc = sdi->priv; + + if (devc->serial && devc->serial->fd != -1) { + serial_close(devc->serial); + sdi->status = SR_ST_INACTIVE; + } return SR_OK; } @@ -113,68 +179,77 @@ static int hw_cleanup(void) { clear_instances(); - /* TODO */ - return SR_OK; } -static int hw_info_get(int info_id, const void **data, - const struct sr_dev_inst *sdi) +static int config_set(int id, const void *value, const struct sr_dev_inst *sdi) { - switch (info_id) { - /* TODO */ + struct dev_context *devc; + + if (sdi->status != SR_ST_ACTIVE) { + sr_err("Device inactive, can't set config options."); + return SR_ERR; + } + + devc = sdi->priv; + + switch (id) { + 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 info_id: %d.", info_id); + sr_err("Unknown hardware capability: %d.", id); 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_list(int key, const void **data, const struct sr_dev_inst *sdi) { - int ret; - if (sdi->status != SR_ST_ACTIVE) { - sr_err("Device inactive, can't set config options."); - return SR_ERR; - } + (void)sdi; - ret = SR_OK; - switch (hwcap) { - /* TODO */ + switch (key) { + case SR_CONF_SCAN_OPTIONS: + *data = hwopts; + break; + case SR_CONF_DEVICE_OPTIONS: + *data = hwcaps; + break; default: - sr_err("Unknown hardware capability: %d.", hwcap); - ret = SR_ERR_ARG; + return SR_ERR_ARG; } - return ret; + return SR_OK; } static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data) { - /* TODO */ - - return SR_OK; -} + struct dev_context *devc; -static int hw_dev_acquisition_stop(const struct sr_dev_inst *sdi, - void *cb_data) -{ - (void)cb_data; + devc = sdi->priv; + devc->cb_data = cb_data; - if (sdi->status != SR_ST_ACTIVE) { - sr_err("Device inactive, can't stop acquisition."); - return SR_ERR; - } + /* Send header packet to the session bus. */ + std_session_send_df_header(cb_data, DRIVER_LOG_DOMAIN); - /* TODO */ + /* Poll every 500ms, or whenever some data comes in. */ + sr_source_add(devc->serial->fd, G_IO_IN, 500, + tondaj_sl_814_receive_data, (void *)sdi); return SR_OK; } +static int hw_dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data) +{ + return std_hw_dev_acquisition_stop_serial(sdi, cb_data, hw_dev_close, + ((struct dev_context *)(sdi->priv))->serial, DRIVER_LOG_DOMAIN); +} + SR_PRIV struct sr_dev_driver tondaj_sl_814_driver_info = { .name = "tondaj-sl-814", .longname = "Tondaj SL-814", @@ -184,10 +259,11 @@ SR_PRIV struct sr_dev_driver tondaj_sl_814_driver_info = { .scan = hw_scan, .dev_list = hw_dev_list, .dev_clear = clear_instances, + .config_get = NULL, + .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,