Add and use std_session_send_df_header().

[libsigrok.git] / hardware / serial-dmm / api.c

diff --git a/hardware/serial-dmm/api.c b/hardware/serial-dmm/api.c
index ce37c9dc6f04039de47309269580a0c9e3bd0eda..b6920819870ab3830629d9a189c95b2464c34ee5 100644 (file)
--- a/hardware/serial-dmm/api.c
+++ b/hardware/serial-dmm/api.c
@@ -192,19 +192,9 @@ static int clear_instances(int dmm)
 
 static int hw_init(struct sr_context *sr_ctx, int dmm)
 {
-       struct drv_context *drvc;
-
-       if (!(drvc = g_try_malloc0(sizeof(struct drv_context)))) {
-               sr_err("Driver context malloc failed.");
-               return SR_ERR_MALLOC;
-       }
-
        sr_dbg("Selected '%s' subdriver.", dmms[dmm].di->name);
 
-       drvc->sr_ctx = sr_ctx;
-       dmms[dmm].di->priv = drvc;
-
-       return SR_OK;
+       return std_hw_init(sr_ctx, dmms[dmm].di, DRIVER_LOG_DOMAIN);
 }
 
 static GSList *scan(const char *conn, const char *serialcomm, int dmm)
@@ -325,11 +315,7 @@ static GSList *hw_scan(GSList *options, int dmm)
 
 static GSList *hw_dev_list(int dmm)
 {
-       struct drv_context *drvc;
-
-       drvc = dmms[dmm].di->priv;
-
-       return drvc->instances;
+       return ((struct drv_context *)(dmms[dmm].di->priv))->instances;
 }
 
 static int hw_dev_open(struct sr_dev_inst *sdi)
@@ -353,10 +339,7 @@ static int hw_dev_close(struct sr_dev_inst *sdi)
 {
        struct dev_context *devc;
 
-       if (!(devc = sdi->priv)) {
-               sr_err("sdi->priv was NULL.");
-               return SR_ERR_BUG;
-       }
+       devc = sdi->priv;
 
        if (devc->serial && devc->serial->fd != -1) {
                serial_close(devc->serial);
@@ -373,24 +356,6 @@ static int hw_cleanup(int dmm)
        return SR_OK;
 }
 
-static int config_get(int id, const void **data, const struct sr_dev_inst *sdi)
-{
-       (void)sdi;
-
-       switch (id) {
-       case SR_DI_HWOPTS:
-               *data = hwopts;
-               break;
-       case SR_DI_HWCAPS:
-               *data = hwcaps;
-               break;
-       default:
-               return SR_ERR_ARG;
-       }
-
-       return SR_OK;
-}
-
 static int config_set(int id, const void *value, const struct sr_dev_inst *sdi)
 {
        struct dev_context *devc;
@@ -429,6 +394,12 @@ static int config_list(int key, const void **data, const struct sr_dev_inst *sdi
        (void)sdi;
 
        switch (key) {
+       case SR_CONF_SCAN_OPTIONS:
+               *data = hwopts;
+               break;
+       case SR_CONF_DEVICE_OPTIONS:
+               *data = hwcaps;
+               break;
        default:
                return SR_ERR_ARG;
        }
@@ -439,8 +410,6 @@ static int config_list(int key, const void **data, const struct sr_dev_inst *sdi
 static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
                                    void *cb_data, int dmm)
 {
-       struct sr_datafeed_packet packet;
-       struct sr_datafeed_header header;
        struct dev_context *devc;
 
        if (!(devc = sdi->priv)) {
@@ -448,8 +417,6 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
                return SR_ERR_BUG;
        }
 
-       sr_dbg("Starting acquisition.");
-
        devc->cb_data = cb_data;
 
        /*
@@ -461,12 +428,7 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
        devc->starttime = g_get_monotonic_time();
 
        /* Send header packet to the session bus. */
-       sr_dbg("Sending SR_DF_HEADER.");
-       packet.type = SR_DF_HEADER;
-       packet.payload = (uint8_t *)&header;
-       header.feed_version = 1;
-       gettimeofday(&header.starttime, NULL);
-       sr_session_send(devc->cb_data, &packet);
+       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,
@@ -533,7 +495,6 @@ SR_PRIV struct sr_dev_driver ID##_driver_info = { \
        .scan = hw_scan_##ID_UPPER, \
        .dev_list = hw_dev_list_##ID_UPPER, \
        .dev_clear = clear_instances_##ID_UPPER, \
-       .config_get = config_get, \
        .config_set = config_set, \
        .config_list = config_list, \
        .dev_open = hw_dev_open, \