X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=blobdiff_plain;f=hardware%2Fbrymen-dmm%2Fapi.c;h=1ccd18af0fa36f3eb92685d818c2fe94308b6edc;hp=2a524c84f4870f627044e3f754c3e9058fa70578;hb=43cd4637285833706f8a404ca027bcf0ee75b9ae;hpb=20cbc7854dc0a375e23fea2ca7e7feee3d3ac701
diff --git a/hardware/brymen-dmm/api.c b/hardware/brymen-dmm/api.c
index 2a524c84..1ccd18af 100644
--- a/hardware/brymen-dmm/api.c
+++ b/hardware/brymen-dmm/api.c
@@ -17,177 +17,246 @@
* along with this program. If not, see .
*/
-#include
-#include "libsigrok.h"
-#include "libsigrok-internal.h"
#include "protocol.h"
-SR_PRIV struct sr_dev_driver brymen_dmm_driver_info;
-static struct sr_dev_driver *di = &brymen_dmm_driver_info;
+static const int32_t hwopts[] = {
+ SR_CONF_CONN,
+ SR_CONF_SERIALCOMM,
+};
+
+static const int32_t hwcaps[] = {
+ SR_CONF_MULTIMETER,
+ SR_CONF_LIMIT_SAMPLES,
+ SR_CONF_CONTINUOUS,
+ SR_CONF_LIMIT_MSEC,
+};
+
+SR_PRIV struct sr_dev_driver brymen_bm857_driver_info;
+static struct sr_dev_driver *di = &brymen_bm857_driver_info;
-/* Properly close and free all devices. */
-static int clear_instances(void)
+static int init(struct sr_context *sr_ctx)
+{
+ return std_init(sr_ctx, di, LOG_PREFIX);
+}
+
+static GSList *brymen_scan(const char *conn, const char *serialcomm)
{
struct sr_dev_inst *sdi;
- struct drv_context *drvc;
struct dev_context *devc;
- GSList *l;
+ struct drv_context *drvc;
+ struct sr_channel *ch;
+ struct sr_serial_dev_inst *serial;
+ GSList *devices;
+ int ret;
+ uint8_t buf[128];
+ size_t len;
- if (!(drvc = di->priv))
- return SR_OK;
+ if (!(serial = sr_serial_dev_inst_new(conn, serialcomm)))
+ return NULL;
- for (l = drvc->instances; l; l = l->next) {
- if (!(sdi = l->data))
- continue;
- if (!(devc = sdi->priv))
- continue;
+ if (serial_open(serial, SERIAL_RDWR | SERIAL_NONBLOCK) != SR_OK)
+ return NULL;
- /* TODO */
+ sr_info("Probing port %s.", conn);
- sr_dev_inst_free(sdi);
+ devices = NULL;
+
+ /* Request reading */
+ if ((ret = brymen_packet_request(serial)) < 0) {
+ sr_err("Unable to send command: %d.", ret);
+ goto scan_cleanup;
}
- g_slist_free(drvc->instances);
- drvc->instances = NULL;
+ len = 128;
+ ret = brymen_stream_detect(serial, buf, &len, brymen_packet_length,
+ brymen_packet_is_valid, 1000, 9600);
+ if (ret != SR_OK)
+ goto scan_cleanup;
- return SR_OK;
-}
+ sr_info("Found device on port %s.", conn);
-static int hw_init(void)
-{
- struct drv_context *drvc;
+ if (!(sdi = sr_dev_inst_new(0, SR_ST_INACTIVE, "Brymen", "BM85x", NULL)))
+ goto scan_cleanup;
- if (!(drvc = g_try_malloc0(sizeof(struct drv_context)))) {
- sr_err("Driver context malloc failed.");
- return SR_ERR_MALLOC;
+ if (!(devc = g_try_malloc0(sizeof(struct dev_context)))) {
+ sr_err("Device context malloc failed.");
+ goto scan_cleanup;
}
- /* TODO */
+ sdi->inst_type = SR_INST_SERIAL;
+ sdi->conn = serial;
+ drvc = di->priv;
+ sdi->priv = devc;
+ sdi->driver = di;
+
+ if (!(ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "P1")))
+ goto scan_cleanup;
- di->priv = drvc;
+ sdi->channels = g_slist_append(sdi->channels, ch);
+ drvc->instances = g_slist_append(drvc->instances, sdi);
+ devices = g_slist_append(devices, sdi);
- return SR_OK;
+scan_cleanup:
+ serial_close(serial);
+
+ return devices;
}
-static GSList *hw_scan(GSList *options)
+static GSList *scan(GSList *options)
{
struct drv_context *drvc;
- GSList *devices;
-
- (void)options;
+ struct sr_config *src;
+ GSList *devices, *l;
+ const char *conn, *serialcomm;
devices = NULL;
drvc = di->priv;
drvc->instances = NULL;
- /* TODO */
+ 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 = brymen_scan(conn, serialcomm);
+ } else {
+ /* But 9600/8n1 should work all of the time. */
+ devices = brymen_scan(conn, "9600/8n1/dtr=1/rts=1");
+ }
return devices;
}
-static GSList *hw_dev_list(void)
+static GSList *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)
+static int cleanup(void)
{
- /* TODO */
-
- return SR_OK;
+ return std_dev_clear(di, NULL);
}
-static int hw_dev_close(struct sr_dev_inst *sdi)
+static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi,
+ const struct sr_channel_group *cg)
{
- /* TODO */
+ struct dev_context *devc;
+ int ret;
- return SR_OK;
-}
+ (void)cg;
-static int hw_cleanup(void)
-{
- clear_instances();
+ if (sdi->status != SR_ST_ACTIVE)
+ return SR_ERR_DEV_CLOSED;
- /* TODO */
+ if (!(devc = sdi->priv)) {
+ sr_err("sdi->priv was NULL.");
+ return SR_ERR_BUG;
+ }
- return SR_OK;
+ ret = SR_OK;
+ switch (id) {
+ case SR_CONF_LIMIT_SAMPLES:
+ devc->limit_samples = g_variant_get_uint64(data);
+ break;
+ case SR_CONF_LIMIT_MSEC:
+ devc->limit_msec = g_variant_get_uint64(data);
+ break;
+ default:
+ ret = SR_ERR_NA;
+ }
+
+ return ret;
}
-static int hw_info_get(int info_id, const void **data,
- const struct sr_dev_inst *sdi)
+static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi,
+ const struct sr_channel_group *cg)
{
- switch (info_id) {
- /* TODO */
+ (void)sdi;
+ (void)cg;
+
+ 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:
- sr_err("Unknown info_id: %d.", info_id);
- return SR_ERR_ARG;
+ return SR_ERR_NA;
}
return SR_OK;
}
-static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
- const void *value)
+static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
{
- int ret;
+ struct dev_context *devc;
+ struct sr_serial_dev_inst *serial;
- 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;
- ret = SR_OK;
- switch (hwcap) {
- /* TODO */
- default:
- sr_err("Unknown hardware capability: %d.", hwcap);
- ret = SR_ERR_ARG;
+ if (!(devc = sdi->priv)) {
+ sr_err("sdi->priv was NULL.");
+ return SR_ERR_BUG;
}
- return ret;
-}
+ devc->cb_data = cb_data;
-static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
- void *cb_data)
-{
- /* TODO */
+ /*
+ * Reset the number of samples to take. If we've already collected our
+ * quota, but we start a new session, and don't reset this, we'll just
+ * quit without acquiring any new samples.
+ */
+ 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 50ms, or whenever some data comes in. */
+ serial = sdi->conn;
+ serial_source_add(sdi->session, serial, G_IO_IN, 50,
+ brymen_dmm_receive_data, (void *)sdi);
return SR_OK;
}
-static int hw_dev_acquisition_stop(const struct sr_dev_inst *sdi,
- void *cb_data)
+static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
{
- (void)cb_data;
-
- if (sdi->status != SR_ST_ACTIVE) {
- sr_err("Device inactive, can't stop acquisition.");
- return SR_ERR;
- }
-
- /* TODO */
-
- return SR_OK;
+ return std_serial_dev_acquisition_stop(sdi, cb_data, std_serial_dev_close,
+ sdi->conn, LOG_PREFIX);
}
-SR_PRIV struct sr_dev_driver brymen_dmm_driver_info = {
- .name = "brymen-dmm",
- .longname = "brymen-dmm",
+SR_PRIV struct sr_dev_driver brymen_bm857_driver_info = {
+ .name = "brymen-bm857",
+ .longname = "Brymen BM857",
.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 = NULL,
+ .config_get = NULL,
+ .config_set = config_set,
+ .config_list = config_list,
+ .dev_open = std_serial_dev_open,
+ .dev_close = std_serial_dev_close,
+ .dev_acquisition_start = dev_acquisition_start,
+ .dev_acquisition_stop = dev_acquisition_stop,
.priv = NULL,
};