Drop unneeded std_session_send_df_header() comments.

[libsigrok.git] / src / hardware / brymen-bm86x / api.c

diff --git a/src/hardware/brymen-bm86x/api.c b/src/hardware/brymen-bm86x/api.c
index f434c136061323128686bb167bd9f908352d5a2a..71de86d1e6750b2824dd5b8d585f1b60a67edb6d 100644 (file)
--- a/src/hardware/brymen-bm86x/api.c
+++ b/src/hardware/brymen-bm86x/api.c
@@ -17,30 +17,30 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include "protocol.h"
 
 #define BRYMEN_BC86X "0820.0001"
 
-static const uint32_t hwopts[] = {
+static const uint32_t scanopts[] = {
        SR_CONF_CONN,
 };
 
 static const uint32_t devopts[] = {
        SR_CONF_MULTIMETER,
-       SR_CONF_LIMIT_SAMPLES,
-       SR_CONF_LIMIT_MSEC,
        SR_CONF_CONTINUOUS,
+       SR_CONF_LIMIT_SAMPLES | SR_CONF_GET | SR_CONF_SET,
+       SR_CONF_LIMIT_MSEC | SR_CONF_GET | SR_CONF_SET,
 };
 
 SR_PRIV struct sr_dev_driver brymen_bm86x_driver_info;
-static struct sr_dev_driver *di = &brymen_bm86x_driver_info;
 
-static int init(struct sr_context *sr_ctx)
+static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
        return std_init(sr_ctx, di, LOG_PREFIX);
 }
 
-static GSList *scan(GSList *options)
+static GSList *scan(struct sr_dev_driver *di, GSList *options)
 {
        GSList *usb_devices, *devices, *l;
        struct drv_context *drvc;
@@ -48,10 +48,9 @@ static GSList *scan(GSList *options)
        struct sr_dev_inst *sdi;
        struct sr_usb_dev_inst *usb;
        struct sr_config *src;
-       struct sr_channel *ch;
        const char *conn;
 
-       drvc = di->priv;
+       drvc = di->context;
        drvc->instances = NULL;
 
        conn = BRYMEN_BC86X;
@@ -73,25 +72,15 @@ static GSList *scan(GSList *options)
        for (l = usb_devices; l; l = l->next) {
                usb = l->data;
 
-               if (!(sdi = sr_dev_inst_new(0, SR_ST_INACTIVE,
-                                           "Brymen", "BM869", NULL))) {
-                       sr_err("sr_dev_inst_new returned NULL.");
-                       return NULL;
-               }
-
-               if (!(devc = g_try_malloc0(sizeof(*devc)))) {
-                       sr_err("Device context malloc failed.");
-                       return NULL;
-               }
-
+               sdi = g_malloc0(sizeof(struct sr_dev_inst));
+               sdi->status = SR_ST_INACTIVE;
+               sdi->vendor = g_strdup("Brymen");
+               sdi->model = g_strdup("BM869");
+               devc = g_malloc0(sizeof(struct dev_context));
                sdi->priv = devc;
                sdi->driver = di;
-               if (!(ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "P1")))
-                       return NULL;
-               sdi->channels = g_slist_append(sdi->channels, ch);
-               if (!(ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "P2")))
-                       return NULL;
-               sdi->channels = g_slist_append(sdi->channels, ch);
+               sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "P1");
+               sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "P2");
 
                sdi->inst_type = SR_INST_USB;
                sdi->conn = usb;
@@ -103,14 +92,15 @@ static GSList *scan(GSList *options)
        return devices;
 }
 
-static GSList *dev_list(void)
+static GSList *dev_list(const struct sr_dev_driver *di)
 {
-       return ((struct drv_context *)(di->priv))->instances;
+       return ((struct drv_context *)(di->context))->instances;
 }
 
 static int dev_open(struct sr_dev_inst *sdi)
 {
-       struct drv_context *drvc = di->priv;
+       struct sr_dev_driver *di = sdi->driver;
+       struct drv_context *drvc = di->context;
        struct sr_usb_dev_inst *usb;
        struct dev_context *devc;
        int ret;
@@ -120,6 +110,8 @@ static int dev_open(struct sr_dev_inst *sdi)
 
        if ((ret = sr_usb_open(drvc->sr_ctx->libusb_ctx, usb)) == SR_OK)
                sdi->status = SR_ST_ACTIVE;
+       else
+               return SR_ERR;
 
        /* Detach kernel drivers which grabbed this device (if any). */
        if (libusb_kernel_driver_active(usb->devhdl, 0) == 1) {
@@ -152,6 +144,9 @@ static int dev_close(struct sr_dev_inst *sdi)
        struct dev_context *devc;
        int ret;
 
+       if (sdi->status != SR_ST_ACTIVE)
+               return SR_ERR_DEV_CLOSED;
+
        usb = sdi->conn;
        devc = sdi->priv;
 
@@ -177,7 +172,7 @@ static int dev_close(struct sr_dev_inst *sdi)
        return ret;
 }
 
-static int cleanup(void)
+static int cleanup(const struct sr_dev_driver *di)
 {
        return std_dev_clear(di, NULL);
 }
@@ -221,11 +216,9 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
        switch (key) {
        case SR_CONF_LIMIT_SAMPLES:
                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 = g_variant_get_uint64(data);
-               sr_dbg("Setting time limit to %" PRIu64 "ms.", devc->limit_msec);
                break;
        default:
                return SR_ERR_NA;
@@ -243,7 +236,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
        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,
@@ -269,10 +262,9 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi,
        devc = sdi->priv;
        devc->start_time = g_get_monotonic_time();
 
-       /* Send header packet to the session bus. */
        std_session_send_df_header(sdi, LOG_PREFIX);
 
-       sr_session_source_add(sdi->session, 0, 0, 10,
+       sr_session_source_add(sdi->session, -1, 0, 10,
                        brymen_bm86x_receive_data, (void *)sdi);
 
        return SR_OK;
@@ -280,18 +272,14 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi,
 
 static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
 {
-       struct sr_datafeed_packet packet;
-
        (void)cb_data;
 
        if (sdi->status != SR_ST_ACTIVE)
                return SR_ERR_DEV_CLOSED;
 
-       /* Send end packet to the session bus. */
-       packet.type = SR_DF_END;
-       sr_session_send(sdi, &packet);
+       std_session_send_df_end(sdi, LOG_PREFIX);
 
-       sr_session_source_remove(sdi->session, 0);
+       sr_session_source_remove(sdi->session, -1);
 
        return SR_OK;
 }
@@ -312,5 +300,5 @@ SR_PRIV struct sr_dev_driver brymen_bm86x_driver_info = {
        .dev_close = dev_close,
        .dev_acquisition_start = dev_acquisition_start,
        .dev_acquisition_stop = dev_acquisition_stop,
-       .priv = NULL,
+       .context = NULL,
 };