#include "protocol.h"
-static const int hwopts[] = {
+static const int32_t hwopts[] = {
SR_CONF_CONN,
SR_CONF_SERIALCOMM,
- 0,
};
-static const int hwcaps[] = {
+static const int32_t hwcaps[] = {
SR_CONF_THERMOMETER,
SR_CONF_HYGROMETER,
SR_CONF_LIMIT_SAMPLES,
SR_CONF_LIMIT_MSEC,
SR_CONF_CONTINUOUS,
- 0,
};
+SR_PRIV struct sr_dev_driver mic_98581_driver_info;
SR_PRIV struct sr_dev_driver mic_98583_driver_info;
SR_PRIV const struct mic_dev_info mic_devs[] = {
{
- "MIC", "98583", "38400/8n2", 32000, TRUE, TRUE,
+ "MIC", "98581", "38400/8n2", 32000, TRUE, FALSE, 6,
+ packet_valid_temp,
+ &mic_98581_driver_info, receive_data_MIC_98581,
+ },
+ {
+ "MIC", "98583", "38400/8n2", 32000, TRUE, TRUE, 10,
+ packet_valid_temp_hum,
&mic_98583_driver_info, receive_data_MIC_98583,
},
};
goto scan_cleanup;
sdi->probes = g_slist_append(sdi->probes, probe);
- if (!(probe = sr_probe_new(1, SR_PROBE_ANALOG, TRUE, "Humidity")))
- goto scan_cleanup;
- sdi->probes = g_slist_append(sdi->probes, probe);
+ if (mic_devs[idx].has_humidity) {
+ if (!(probe = sr_probe_new(1, SR_PROBE_ANALOG, TRUE, "Humidity")))
+ 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);
src = l->data;
switch (src->key) {
case SR_CONF_CONN:
- conn = src->value;
+ conn = g_variant_get_string(src->data, NULL);
break;
case SR_CONF_SERIALCOMM:
- serialcomm = src->value;
+ serialcomm = g_variant_get_string(src->data, NULL);
break;
}
}
return SR_OK;
}
-static int config_set(int id, const void *value, const struct sr_dev_inst *sdi)
+static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi)
{
struct dev_context *devc;
switch (id) {
case SR_CONF_LIMIT_SAMPLES:
- devc->limit_samples = *(const uint64_t *)value;
+ devc->limit_samples = g_variant_get_uint64(data);
sr_dbg("Setting sample limit to %" PRIu64 ".",
devc->limit_samples);
break;
case SR_CONF_LIMIT_MSEC:
- devc->limit_msec = *(const uint64_t *)value;
+ devc->limit_msec = g_variant_get_uint64(data);
sr_dbg("Setting time limit to %" PRIu64 "ms.",
devc->limit_msec);
break;
default:
- sr_err("Unknown config: %d.", id);
- return SR_ERR_ARG;
+ return SR_ERR_NA;
}
return SR_OK;
}
-static int config_list(int key, const void **data, const struct sr_dev_inst *sdi)
+static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi)
{
(void)sdi;
switch (key) {
case SR_CONF_SCAN_OPTIONS:
- *data = hwopts;
+ *data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32,
+ hwopts, ARRAY_SIZE(hwopts), sizeof(int32_t));
break;
case SR_CONF_DEVICE_OPTIONS:
- *data = hwcaps;
+ *data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32,
+ hwcaps, ARRAY_SIZE(hwcaps), sizeof(int32_t));
break;
default:
- return SR_ERR_ARG;
+ return SR_ERR_NA;
}
return SR_OK;
static int hw_dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
{
- struct sr_datafeed_packet packet;
- struct dev_context *devc;
-
- if (sdi->status != SR_ST_ACTIVE) {
- sr_err("Device inactive, can't stop acquisition.");
- return SR_ERR;
- }
-
- devc = sdi->priv;
-
- sr_dbg("Stopping acquisition.");
-
- sr_source_remove(devc->serial->fd);
- hw_dev_close((struct sr_dev_inst *)sdi);
-
- /* Send end packet to the session bus. */
- sr_dbg("Sending SR_DF_END.");
- packet.type = SR_DF_END;
- sr_session_send(cb_data, &packet);
-
- return SR_OK;
+ return std_hw_dev_acquisition_stop_serial(sdi, cb_data, hw_dev_close,
+ ((struct dev_context *)(sdi->priv))->serial, DRIVER_LOG_DOMAIN);
}
/* Driver-specific API function wrappers */
.priv = NULL, \
};
+DRV(mic_98581, MIC_98581, "mic-98581", "MIC 98581")
DRV(mic_98583, MIC_98583, "mic-98583", "MIC 98583")