X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fcenter-3xx%2Fapi.c;h=6c01f4ca1facc3ea7bad55ca6c7aa532e71f4ff6;hb=4a8bbed76d127663e62d83f6a3ac5b7e315e5f00;hp=5f61f9bd6f9c976fdeff293673da8bf42c43140d;hpb=4433145f481d077570b371b466e98b17a77ec7e2;p=libsigrok.git diff --git a/hardware/center-3xx/api.c b/hardware/center-3xx/api.c index 5f61f9bd..6c01f4ca 100644 --- a/hardware/center-3xx/api.c +++ b/hardware/center-3xx/api.c @@ -20,41 +20,148 @@ #include "protocol.h" -SR_PRIV struct sr_dev_driver center_3xx_driver_info; -static struct sr_dev_driver *di = ¢er_3xx_driver_info; +static const int32_t hwopts[] = { + SR_CONF_CONN, + SR_CONF_SERIALCOMM, +}; + +static const int32_t hwcaps[] = { + SR_CONF_THERMOMETER, + SR_CONF_LIMIT_SAMPLES, + SR_CONF_LIMIT_MSEC, + SR_CONF_CONTINUOUS, +}; + +static const char *probe_names[] = { + "T1", "T2", "T3", "T4", + NULL, +}; + +SR_PRIV struct sr_dev_driver center_309_driver_info; +SR_PRIV struct sr_dev_driver voltcraft_k204_driver_info; + +SR_PRIV const struct center_dev_info center_devs[] = { + { + "Center", "309", "9600/8n1", 4, 32000, 45, + center_3xx_packet_valid, + ¢er_309_driver_info, receive_data_CENTER_309, + }, + { + "Voltcraft", "K204", "9600/8n1", 4, 32000, 45, + center_3xx_packet_valid, + &voltcraft_k204_driver_info, receive_data_VOLTCRAFT_K204, + }, +}; -static int init(struct sr_context *sr_ctx) +static int dev_clear(int idx) { - return std_init(sr_ctx, di, LOG_PREFIX); + return std_dev_clear(center_devs[idx].di, NULL); } -static GSList *scan(GSList *options) +static int init(struct sr_context *sr_ctx, int idx) { + sr_dbg("Selected '%s' subdriver.", center_devs[idx].di->name); + + return std_init(sr_ctx, center_devs[idx].di, LOG_PREFIX); +} + +static GSList *center_scan(const char *conn, const char *serialcomm, int idx) +{ + int i; + struct sr_dev_inst *sdi; struct drv_context *drvc; + struct dev_context *devc; + struct sr_probe *probe; + struct sr_serial_dev_inst *serial; GSList *devices; - (void)options; + if (!(serial = sr_serial_dev_inst_new(conn, serialcomm))) + return NULL; + + if (serial_open(serial, SERIAL_RDWR | SERIAL_NONBLOCK) != SR_OK) + return NULL; + drvc = center_devs[idx].di->priv; devices = NULL; - drvc = di->priv; - drvc->instances = NULL; + serial_flush(serial); + + sr_info("Found device on port %s.", conn); + + if (!(sdi = sr_dev_inst_new(0, SR_ST_INACTIVE, center_devs[idx].vendor, + center_devs[idx].device, NULL))) + goto scan_cleanup; + + if (!(devc = g_try_malloc0(sizeof(struct dev_context)))) { + sr_err("Device context malloc failed."); + goto scan_cleanup; + } + + sdi->inst_type = SR_INST_SERIAL; + sdi->conn = serial; + + sdi->priv = devc; + sdi->driver = center_devs[idx].di; + + for (i = 0; i < center_devs[idx].num_channels; i++) { + if (!(probe = sr_probe_new(i, SR_PROBE_ANALOG, + TRUE, probe_names[i]))) + goto scan_cleanup; + sdi->probes = g_slist_append(sdi->probes, probe); + } + + drvc->instances = g_slist_append(drvc->instances, sdi); + devices = g_slist_append(devices, sdi); + +scan_cleanup: + serial_close(serial); return devices; } -static GSList *dev_list(void) +static GSList *scan(GSList *options, int idx) { - return ((struct drv_context *)(di->priv))->instances; + struct sr_config *src; + GSList *l, *devices; + const char *conn, *serialcomm; + + 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) { + /* Use the provided comm specs. */ + devices = center_scan(conn, serialcomm, idx); + } else { + /* Try the default. */ + devices = center_scan(conn, center_devs[idx].conn, idx); + } + + return devices; } -static int dev_clear(void) +static GSList *dev_list(int idx) { - return std_dev_clear(di, NULL); + return ((struct drv_context *)(center_devs[idx].di->priv))->instances; } static int dev_open(struct sr_dev_inst *sdi) { - (void)sdi; + 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; @@ -63,105 +170,141 @@ static int dev_open(struct sr_dev_inst *sdi) static int dev_close(struct sr_dev_inst *sdi) { - (void)sdi; + struct sr_serial_dev_inst *serial; - sdi->status = SR_ST_INACTIVE; + serial = sdi->conn; + if (serial && serial->fd != -1) { + serial_close(serial); + sdi->status = SR_ST_INACTIVE; + } return SR_OK; } -static int cleanup(void) -{ - return dev_clear(); -} - -static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi) +static int cleanup(int idx) { - int ret; - - (void)sdi; - (void)data; - - ret = SR_OK; - switch (key) { - default: - return SR_ERR_NA; - } - - return ret; + return dev_clear(idx); } -static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi) +static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi) { - int ret; - - (void)data; + struct dev_context *devc; if (sdi->status != SR_ST_ACTIVE) return SR_ERR_DEV_CLOSED; - ret = SR_OK; - switch (key) { + devc = sdi->priv; + + switch (id) { + case SR_CONF_LIMIT_SAMPLES: + if (g_variant_get_uint64(data) == 0) + return SR_ERR_ARG; + devc->limit_samples = g_variant_get_uint64(data); + break; + case SR_CONF_LIMIT_MSEC: + if (g_variant_get_uint64(data) == 0) + return SR_ERR_ARG; + devc->limit_msec = g_variant_get_uint64(data); + break; default: - ret = SR_ERR_NA; + return SR_ERR_NA; } - return ret; + return SR_OK; } static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi) { - int ret; - (void)sdi; - (void)data; - ret = SR_OK; 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 ret; + return SR_OK; } static int dev_acquisition_start(const struct sr_dev_inst *sdi, - void *cb_data) + void *cb_data, int idx) { - (void)sdi; - (void)cb_data; + struct dev_context *devc; + struct sr_serial_dev_inst *serial; if (sdi->status != SR_ST_ACTIVE) return SR_ERR_DEV_CLOSED; + devc = sdi->priv; + devc->cb_data = cb_data; + devc->num_samples = 0; + devc->starttime = g_get_monotonic_time(); + + /* Send header packet to the session bus. */ + std_session_send_df_header(cb_data, LOG_PREFIX); + + /* Poll every 500ms, or whenever some data comes in. */ + serial = sdi->conn; + sr_source_add(serial->fd, G_IO_IN, 500, + center_devs[idx].receive_data, (void *)sdi); + return SR_OK; } static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data) { - (void)cb_data; - - if (sdi->status != SR_ST_ACTIVE) - return SR_ERR_DEV_CLOSED; - - return SR_OK; + return std_dev_acquisition_stop_serial(sdi, cb_data, dev_close, + sdi->conn, LOG_PREFIX); } -SR_PRIV struct sr_dev_driver center_3xx_driver_info = { - .name = "center-3xx", - .longname = "Center 3xx", - .api_version = 1, - .init = init, - .cleanup = cleanup, - .scan = scan, - .dev_list = dev_list, - .dev_clear = dev_clear, - .config_get = config_get, - .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, +/* Driver-specific API function wrappers */ +#define HW_INIT(X) \ +static int init_##X(struct sr_context *sr_ctx) { return init(sr_ctx, X); } +#define HW_CLEANUP(X) \ +static int cleanup_##X(void) { return cleanup(X); } +#define HW_SCAN(X) \ +static GSList *scan_##X(GSList *options) { return scan(options, X); } +#define HW_DEV_LIST(X) \ +static GSList *dev_list_##X(void) { return dev_list(X); } +#define HW_DEV_CLEAR(X) \ +static int dev_clear_##X(void) { return dev_clear(X); } +#define HW_DEV_ACQUISITION_START(X) \ +static int dev_acquisition_start_##X(const struct sr_dev_inst *sdi, \ +void *cb_data) { return dev_acquisition_start(sdi, cb_data, X); } + +/* Driver structs and API function wrappers */ +#define DRV(ID, ID_UPPER, NAME, LONGNAME) \ +HW_INIT(ID_UPPER) \ +HW_CLEANUP(ID_UPPER) \ +HW_SCAN(ID_UPPER) \ +HW_DEV_LIST(ID_UPPER) \ +HW_DEV_CLEAR(ID_UPPER) \ +HW_DEV_ACQUISITION_START(ID_UPPER) \ +SR_PRIV struct sr_dev_driver ID##_driver_info = { \ + .name = NAME, \ + .longname = LONGNAME, \ + .api_version = 1, \ + .init = init_##ID_UPPER, \ + .cleanup = cleanup_##ID_UPPER, \ + .scan = scan_##ID_UPPER, \ + .dev_list = dev_list_##ID_UPPER, \ + .dev_clear = dev_clear_##ID_UPPER, \ + .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_##ID_UPPER, \ + .dev_acquisition_stop = dev_acquisition_stop, \ + .priv = NULL, \ }; + +DRV(center_309, CENTER_309, "center-309", "Center 309") +DRV(voltcraft_k204, VOLTCRAFT_K204, "voltcraft-k204", "Voltcraft K204")