X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fbrymen-dmm%2Fapi.c;h=d50d5be4e2318030eccb1e0197a191c9b8349e5a;hb=aeea0572202fa20093534a8e97da87c324151932;hp=2a524c84f4870f627044e3f754c3e9058fa70578;hpb=20cbc7854dc0a375e23fea2ca7e7feee3d3ac701;p=libsigrok.git
diff --git a/hardware/brymen-dmm/api.c b/hardware/brymen-dmm/api.c
index 2a524c84..d50d5be4 100644
--- a/hardware/brymen-dmm/api.c
+++ b/hardware/brymen-dmm/api.c
@@ -17,62 +17,125 @@
* 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 int hwopts[] = {
+ SR_CONF_CONN,
+ SR_CONF_SERIALCOMM,
+ 0,
+};
+
+static const int hwcaps[] = {
+ SR_CONF_MULTIMETER,
+ SR_CONF_LIMIT_SAMPLES,
+ SR_CONF_CONTINUOUS,
+ SR_CONF_LIMIT_MSEC,
+ 0,
+};
+
+SR_PRIV struct sr_dev_driver brymen_bm857_driver_info;
+static struct sr_dev_driver *di = &brymen_bm857_driver_info;
+
+static int hw_init(struct sr_context *sr_ctx)
+{
+ return std_hw_init(sr_ctx, di, DRIVER_LOG_DOMAIN);
+}
+
+static void free_instance(void *inst)
+{
+ struct sr_dev_inst *sdi;
+ struct dev_context *devc;
+
+ if (!(sdi = inst))
+ return;
+ if (!(devc = sdi->priv))
+ return;
+ sr_serial_dev_inst_free(devc->serial);
+ sr_dev_inst_free(sdi);
+}
/* Properly close and free all devices. */
static int clear_instances(void)
{
- struct sr_dev_inst *sdi;
struct drv_context *drvc;
- struct dev_context *devc;
- GSList *l;
if (!(drvc = di->priv))
return SR_OK;
- for (l = drvc->instances; l; l = l->next) {
- if (!(sdi = l->data))
- continue;
- if (!(devc = sdi->priv))
- continue;
-
- /* TODO */
-
- sr_dev_inst_free(sdi);
- }
-
- g_slist_free(drvc->instances);
+ g_slist_free_full(drvc->instances, free_instance);
drvc->instances = NULL;
return SR_OK;
}
-static int hw_init(void)
+static GSList *brymen_scan(const char *conn, const char *serialcomm)
{
+ struct sr_dev_inst *sdi;
+ struct dev_context *devc;
struct drv_context *drvc;
+ struct sr_probe *probe;
+ struct sr_serial_dev_inst *serial;
+ GSList *devices;
+ int ret;
+ uint8_t buf[128];
+ size_t len;
+
+ if (!(serial = sr_serial_dev_inst_new(conn, serialcomm)))
+ return NULL;
+
+ if (serial_open(serial, SERIAL_RDWR | SERIAL_NONBLOCK) != SR_OK)
+ return NULL;
+
+ sr_info("Probing port %s.", conn);
+
+ devices = NULL;
- if (!(drvc = g_try_malloc0(sizeof(struct drv_context)))) {
- sr_err("Driver context malloc failed.");
- return SR_ERR_MALLOC;
+ /* Request reading */
+ if ((ret = brymen_packet_request(serial)) < 0) {
+ sr_err("Unable to send command: %d.", ret);
+ goto scan_cleanup;
}
- /* TODO */
+ 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;
- di->priv = drvc;
+ sr_info("Found device on port %s.", conn);
- return SR_OK;
+ if (!(sdi = sr_dev_inst_new(0, SR_ST_INACTIVE, "Brymen", "BM85x", "")))
+ goto scan_cleanup;
+
+ if (!(devc = g_try_malloc0(sizeof(struct dev_context)))) {
+ sr_err("Device context malloc failed.");
+ goto scan_cleanup;
+ }
+
+ devc->serial = serial;
+ drvc = di->priv;
+ sdi->priv = devc;
+ sdi->driver = di;
+
+ if (!(probe = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "P1")))
+ 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 *hw_scan(GSList *options)
{
struct drv_context *drvc;
- GSList *devices;
+ struct sr_config *src;
+ GSList *devices, *l;
+ const char *conn, *serialcomm;
(void)options;
@@ -80,30 +143,65 @@ static GSList *hw_scan(GSList *options)
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 = src->value;
+ break;
+ case SR_CONF_SERIALCOMM:
+ serialcomm = src->value;
+ 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)
{
- 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;
+
+ if (!(devc = sdi->priv)) {
+ sr_err("sdi->priv was NULL.");
+ return SR_ERR_BUG;
+ }
+
+ 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;
}
@@ -112,27 +210,32 @@ static int hw_cleanup(void)
{
clear_instances();
- /* TODO */
-
return SR_OK;
}
-static int hw_info_get(int info_id, const void **data,
+static int config_list(int key, const void **data,
const struct sr_dev_inst *sdi)
{
- switch (info_id) {
- /* TODO */
+ (void)sdi;
+
+ switch (key) {
+ case SR_CONF_SCAN_OPTIONS:
+ *data = hwopts;
+ break;
+ case SR_CONF_DEVICE_OPTIONS:
+ *data = hwcaps;
+ break;
default:
- sr_err("Unknown info_id: %d.", info_id);
+ sr_err("Unknown config key: %d.", key);
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_set(int id, const void *value, const struct sr_dev_inst *sdi)
{
+ struct dev_context *devc;
int ret;
if (sdi->status != SR_ST_ACTIVE) {
@@ -140,11 +243,21 @@ static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
return SR_ERR;
}
+ if (!(devc = sdi->priv)) {
+ sr_err("sdi->priv was NULL.");
+ return SR_ERR_BUG;
+ }
+
ret = SR_OK;
- switch (hwcap) {
- /* TODO */
+ switch (id) {
+ case SR_CONF_LIMIT_SAMPLES:
+ devc->limit_samples = *(const uint64_t *)value;
+ break;
+ case SR_CONF_LIMIT_MSEC:
+ devc->limit_msec = *(const uint64_t *)value;
+ break;
default:
- sr_err("Unknown hardware capability: %d.", hwcap);
+ sr_err("Unknown hardware capability: %d.", id);
ret = SR_ERR_ARG;
}
@@ -154,39 +267,53 @@ static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
void *cb_data)
{
- /* TODO */
+ struct dev_context *devc;
- return SR_OK;
-}
+ if (!(devc = sdi->priv)) {
+ sr_err("sdi->priv was NULL.");
+ return SR_ERR_BUG;
+ }
-static int hw_dev_acquisition_stop(const struct sr_dev_inst *sdi,
- void *cb_data)
-{
- (void)cb_data;
+ devc->cb_data = cb_data;
- if (sdi->status != SR_ST_ACTIVE) {
- sr_err("Device inactive, can't stop acquisition.");
- return SR_ERR;
- }
+ /*
+ * 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();
- /* TODO */
+ /* Send header packet to the session bus. */
+ std_session_send_df_header(cb_data, DRIVER_LOG_DOMAIN);
+
+ /* Poll every 50ms, or whenever some data comes in. */
+ sr_source_add(devc->serial->fd, G_IO_IN, 50,
+ brymen_dmm_receive_data, (void *)sdi);
return SR_OK;
}
-SR_PRIV struct sr_dev_driver brymen_dmm_driver_info = {
- .name = "brymen-dmm",
- .longname = "brymen-dmm",
+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 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,
+ .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,