drivers: Provide proper drvopts.

[libsigrok.git] / src / hardware / uni-t-dmm / api.c

diff --git a/src/hardware/uni-t-dmm/api.c b/src/hardware/uni-t-dmm/api.c
index 02e301cc2a7841ab8d149adb8a63af6b84e2b901..5730633cac52e683a0593af505d5e05b8be41f83 100644 (file)
--- a/src/hardware/uni-t-dmm/api.c
+++ b/src/hardware/uni-t-dmm/api.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
@@ -25,14 +24,15 @@
 #include "libsigrok-internal.h"
 #include "protocol.h"
 
-#define UNI_T_UT_D04_NEW "1a86.e008"
-
 static const uint32_t scanopts[] = {
        SR_CONF_CONN,
 };
 
-static const uint32_t devopts[] = {
+static const uint32_t drvopts[] = {
        SR_CONF_MULTIMETER,
+};
+
+static const uint32_t devopts[] = {
        SR_CONF_CONTINUOUS,
        SR_CONF_LIMIT_SAMPLES | SR_CONF_SET | SR_CONF_GET,
        SR_CONF_LIMIT_MSEC | SR_CONF_SET | SR_CONF_GET,
@@ -101,25 +101,12 @@ static int dev_open(struct sr_dev_inst *sdi)
        struct sr_dev_driver *di;
        struct drv_context *drvc;
        struct sr_usb_dev_inst *usb;
-       int ret;
 
        di = sdi->driver;
        drvc = di->context;
        usb = sdi->conn;
 
-       if ((ret = sr_usb_open(drvc->sr_ctx->libusb_ctx, usb)) == SR_OK)
-               sdi->status = SR_ST_ACTIVE;
-
-       return ret;
-}
-
-static int dev_close(struct sr_dev_inst *sdi)
-{
-       /* TODO */
-
-       sdi->status = SR_ST_INACTIVE;
-
-       return SR_OK;
+       return sr_usb_open(drvc->sr_ctx->libusb_ctx, usb);
 }
 
 static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sdi,
@@ -137,23 +124,7 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
 static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,
                const struct sr_channel_group *cg)
 {
-       (void)sdi;
-       (void)cg;
-
-       switch (key) {
-       case SR_CONF_SCAN_OPTIONS:
-               *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
-                               scanopts, ARRAY_SIZE(scanopts), sizeof(uint32_t));
-               break;
-       case SR_CONF_DEVICE_OPTIONS:
-               *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
-                               devopts, ARRAY_SIZE(devopts), sizeof(uint32_t));
-               break;
-       default:
-               return SR_ERR_NA;
-       }
-
-       return SR_OK;
+       return STD_CONFIG_LIST(key, data, sdi, cg, scanopts, drvopts, devopts);
 }
 
 static int dev_acquisition_start(const struct sr_dev_inst *sdi)
@@ -164,18 +135,17 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 
        sr_sw_limits_acquisition_start(&devc->limits);
 
-       std_session_send_df_header(sdi, LOG_PREFIX);
+       std_session_send_df_header(sdi);
 
        sr_session_source_add(sdi->session, -1, 0, 10 /* poll_timeout */,
-                     uni_t_dmm_receive_data, (void *)sdi);
+                       uni_t_dmm_receive_data, (void *)sdi);
 
        return SR_OK;
 }
 
 static int dev_acquisition_stop(struct sr_dev_inst *sdi)
 {
-       sr_dbg("Stopping acquisition.");
-       std_session_send_df_end(sdi, LOG_PREFIX);
+       std_session_send_df_end(sdi);
        sr_session_source_remove(sdi->session, -1);
 
        return SR_OK;
@@ -183,7 +153,7 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi)
 
 #define DMM(ID, CHIPSET, VENDOR, MODEL, BAUDRATE, PACKETSIZE, \
                        VALID, PARSE, DETAILS) \
-    &((struct dmm_info) { \
+       &((struct dmm_info) { \
                { \
                        .name = ID, \
                        .longname = VENDOR " " MODEL, \
@@ -192,11 +162,12 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi)
                        .cleanup = std_cleanup, \
                        .scan = scan, \
                        .dev_list = std_dev_list, \
+                       .dev_clear = std_dev_clear, \
                        .config_get = NULL, \
                        .config_set = config_set, \
                        .config_list = config_list, \
                        .dev_open = dev_open, \
-                       .dev_close = dev_close, \
+                       .dev_close = std_dummy_dev_close /* TODO */, \
                        .dev_acquisition_start = dev_acquisition_start, \
                        .dev_acquisition_stop = dev_acquisition_stop, \
                        .context = NULL, \
@@ -361,7 +332,7 @@ SR_REGISTER_DEV_DRIVER_LIST(uni_t_dmm_drivers,
                sr_ut71x_packet_valid, sr_ut71x_parse, NULL
        ),
        DMM(
-               "tenma-72-7745", es519xx,
+               "tenma-72-7745", fs9721,
                "Tenma", "72-7745", 2400,
                FS9721_PACKET_SIZE,
                sr_fs9721_packet_valid, sr_fs9721_parse,