X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fcenter-3xx%2Fapi.c;h=7fe70fa9a8030bc01223d053849973c7eb8dcecc;hb=1c47e0da8f2571bc34dbdc368c3c1f55318c3aa0;hp=edaecd7be4af264812247e064d9a4ed23b5c5c9e;hpb=584560f142e1b17b9f4ef9069bd3724f2f77e750;p=libsigrok.git diff --git a/src/hardware/center-3xx/api.c b/src/hardware/center-3xx/api.c index edaecd7b..7fe70fa9 100644 --- a/src/hardware/center-3xx/api.c +++ b/src/hardware/center-3xx/api.c @@ -18,23 +18,26 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include #include "protocol.h" -static const uint32_t hwopts[] = { +static const uint32_t scanopts[] = { SR_CONF_CONN, SR_CONF_SERIALCOMM, }; -static const uint32_t hwcaps[] = { +static const uint32_t drvopts[] = { SR_CONF_THERMOMETER, - SR_CONF_LIMIT_SAMPLES, - SR_CONF_LIMIT_MSEC, - SR_CONF_CONTINUOUS, +}; + +static const uint32_t devopts[] = { + SR_CONF_CONTINUOUS | SR_CONF_SET, + SR_CONF_LIMIT_SAMPLES | SR_CONF_SET, + SR_CONF_LIMIT_MSEC | SR_CONF_SET, }; static const char *channel_names[] = { "T1", "T2", "T3", "T4", - NULL, }; SR_PRIV struct sr_dev_driver center_309_driver_info; @@ -69,48 +72,36 @@ static GSList *center_scan(const char *conn, const char *serialcomm, int idx) struct sr_dev_inst *sdi; struct drv_context *drvc; struct dev_context *devc; - struct sr_channel *ch; struct sr_serial_dev_inst *serial; GSList *devices; - if (!(serial = sr_serial_dev_inst_new(conn, serialcomm))) - return NULL; + serial = sr_serial_dev_inst_new(conn, serialcomm); - if (serial_open(serial, SERIAL_RDWR | SERIAL_NONBLOCK) != SR_OK) + if (serial_open(serial, SERIAL_RDWR) != SR_OK) return NULL; - drvc = center_devs[idx].di->priv; + drvc = center_devs[idx].di->context; devices = 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 = g_malloc0(sizeof(struct sr_dev_inst)); + sdi->status = SR_ST_INACTIVE; + sdi->vendor = g_strdup(center_devs[idx].vendor); + sdi->model = g_strdup(center_devs[idx].device); + devc = g_malloc0(sizeof(struct dev_context)); 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 (!(ch = sr_channel_new(i, SR_CHANNEL_ANALOG, - TRUE, channel_names[i]))) - goto scan_cleanup; - sdi->channels = g_slist_append(sdi->channels, ch); - } + for (i = 0; i < center_devs[idx].num_channels; i++) + sr_channel_new(sdi, i, SR_CHANNEL_ANALOG, TRUE, channel_names[i]); drvc->instances = g_slist_append(drvc->instances, sdi); devices = g_slist_append(devices, sdi); -scan_cleanup: serial_close(serial); return devices; @@ -150,7 +141,7 @@ static GSList *scan(GSList *options, int idx) static GSList *dev_list(int idx) { - return ((struct drv_context *)(center_devs[idx].di->priv))->instances; + return ((struct drv_context *)(center_devs[idx].di->context))->instances; } static int cleanup(int idx) @@ -191,17 +182,20 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi, const struct sr_channel_group *cg) { - (void)sdi; (void)cg; switch (key) { case SR_CONF_SCAN_OPTIONS: *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, - hwopts, ARRAY_SIZE(hwopts), sizeof(uint32_t)); + scanopts, ARRAY_SIZE(scanopts), sizeof(uint32_t)); break; case SR_CONF_DEVICE_OPTIONS: - *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, - hwcaps, ARRAY_SIZE(hwcaps), sizeof(uint32_t)); + if (!sdi) + *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, + drvopts, ARRAY_SIZE(drvopts), sizeof(uint32_t)); + else + *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, + devopts, ARRAY_SIZE(devopts), sizeof(uint32_t)); break; default: return SR_ERR_NA; @@ -224,7 +218,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, 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. */ @@ -243,15 +236,20 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data) /* Driver-specific API function wrappers */ #define HW_INIT(X) \ -static int init_##X(struct sr_context *sr_ctx) { return init(sr_ctx, X); } +static int init_##X(struct sr_dev_driver *d, \ + struct sr_context *sr_ctx) { (void)d; return init(sr_ctx, X); } #define HW_CLEANUP(X) \ -static int cleanup_##X(void) { return cleanup(X); } +static int cleanup_##X(const struct sr_dev_driver *d) { \ + (void)d; return cleanup(X); } #define HW_SCAN(X) \ -static GSList *scan_##X(GSList *options) { return scan(options, X); } +static GSList *scan_##X(struct sr_dev_driver *d, GSList *options) { \ + (void)d; return scan(options, X); } #define HW_DEV_LIST(X) \ -static GSList *dev_list_##X(void) { return dev_list(X); } +static GSList *dev_list_##X(const struct sr_dev_driver *d) { \ + (void)d; return dev_list(X); } #define HW_DEV_CLEAR(X) \ -static int dev_clear_##X(void) { return dev_clear(X); } +static int dev_clear_##X(const struct sr_dev_driver *d) { \ + (void)d; 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); } @@ -280,7 +278,7 @@ SR_PRIV struct sr_dev_driver ID##_driver_info = { \ .dev_close = std_serial_dev_close, \ .dev_acquisition_start = dev_acquisition_start_##ID_UPPER, \ .dev_acquisition_stop = dev_acquisition_stop, \ - .priv = NULL, \ + .context = NULL, \ }; DRV(center_309, CENTER_309, "center-309", "Center 309")