Re-enable link-mso19 and nexus-osciprime drivers.

[libsigrok.git] / hwdriver.c

diff --git a/hwdriver.c b/hwdriver.c
index d48131d26b4069d9577998dc0819676915f484ce..d4ae56057204c23b8e86957dd14cddfe6c2eb2f3 100644 (file)
--- a/hwdriver.c
+++ b/hwdriver.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the sigrok project.
+ * This file is part of the libsigrok project.
  *
  * Copyright (C) 2013 Bert Vermeulen <bert@biot.com>
  *
@@ -27,14 +27,14 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
-/* Message logging helpers with driver-specific prefix string. */
-#define DRIVER_LOG_DOMAIN "hwdriver: "
-#define sr_log(l, s, args...) sr_log(l, DRIVER_LOG_DOMAIN s, ## args)
-#define sr_spew(s, args...) sr_spew(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_dbg(s, args...) sr_dbg(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_info(s, args...) sr_info(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_warn(s, args...) sr_warn(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_err(s, args...) sr_err(DRIVER_LOG_DOMAIN s, ## args)
+/* Message logging helpers with subsystem-specific prefix string. */
+#define LOG_PREFIX "hwdriver: "
+#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args)
+#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args)
+#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args)
+#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args)
+#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args)
+#define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args)
 
 /**
  * @file
@@ -158,13 +158,20 @@ extern SR_PRIV struct sr_dev_driver pce_pce_dm32_driver_info;
 extern SR_PRIV struct sr_dev_driver radioshack_22_168_driver_info;
 extern SR_PRIV struct sr_dev_driver radioshack_22_805_driver_info;
 extern SR_PRIV struct sr_dev_driver radioshack_22_812_driver_info;
+extern SR_PRIV struct sr_dev_driver tecpel_dmm_8060_ser_driver_info;
+extern SR_PRIV struct sr_dev_driver tecpel_dmm_8061_ser_driver_info;
 extern SR_PRIV struct sr_dev_driver voltcraft_vc820_ser_driver_info;
 extern SR_PRIV struct sr_dev_driver voltcraft_vc840_ser_driver_info;
+extern SR_PRIV struct sr_dev_driver uni_t_ut61d_ser_driver_info;
 extern SR_PRIV struct sr_dev_driver uni_t_ut61e_ser_driver_info;
 #endif
 #ifdef HAVE_HW_UNI_T_DMM
+extern SR_PRIV struct sr_dev_driver tecpel_dmm_8060_driver_info;
+extern SR_PRIV struct sr_dev_driver tecpel_dmm_8061_driver_info;
 extern SR_PRIV struct sr_dev_driver uni_t_ut61d_driver_info;
+extern SR_PRIV struct sr_dev_driver uni_t_ut61e_driver_info;
 extern SR_PRIV struct sr_dev_driver voltcraft_vc820_driver_info;
+extern SR_PRIV struct sr_dev_driver voltcraft_vc840_driver_info;
 #endif
 /** @endcond */
 
@@ -240,13 +247,20 @@ static struct sr_dev_driver *drivers_list[] = {
        &radioshack_22_168_driver_info,
        &radioshack_22_805_driver_info,
        &radioshack_22_812_driver_info,
+       &tecpel_dmm_8060_ser_driver_info,
+       &tecpel_dmm_8061_ser_driver_info,
        &voltcraft_vc820_ser_driver_info,
        &voltcraft_vc840_ser_driver_info,
+       &uni_t_ut61d_ser_driver_info,
        &uni_t_ut61e_ser_driver_info,
 #endif
 #ifdef HAVE_HW_UNI_T_DMM
+       &tecpel_dmm_8060_driver_info,
+       &tecpel_dmm_8061_driver_info,
        &uni_t_ut61d_driver_info,
+       &uni_t_ut61e_driver_info,
        &voltcraft_vc820_driver_info,
+       &voltcraft_vc840_driver_info,
 #endif
        NULL,
 };
@@ -479,7 +493,7 @@ SR_API int sr_config_list(const struct sr_dev_driver *driver, int key,
 
        if (!driver || !data)
                ret = SR_ERR;
-       else if (!sdi->driver->config_list)
+       else if (!driver->config_list)
                ret = SR_ERR_ARG;
        else if ((ret = driver->config_list(key, data, sdi)) == SR_OK)
                g_variant_ref_sink(*data);