X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fdrivers.c;h=0dd6f26c7820f2bb0ed97fc1299cb07e35167b6a;hb=607dcdeae13d04fd5c6d41da46d9c29a04206a86;hp=6eac4589cf51035d4e6b2222fa0e125948495de2;hpb=bcbef5ed709a56e8cec3d7d0b5f73a00a4040984;p=libsigrok.git

diff --git a/src/drivers.c b/src/drivers.c
index 6eac4589..0dd6f26c 100644
--- a/src/drivers.c
+++ b/src/drivers.c
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 /** @cond PRIVATE */
@@ -92,6 +92,9 @@ extern SR_PRIV struct sr_dev_driver ikalogic_scanaplus_driver_info;
 #ifdef HAVE_HW_KECHENG_KC_330B
 extern SR_PRIV struct sr_dev_driver kecheng_kc_330b_driver_info;
 #endif
+#ifdef HAVE_HW_KERN_SCALE
+extern SR_PRIV struct sr_dev_driver *kern_scale_drivers[];
+#endif
 #ifdef HAVE_HW_LASCAR_EL_USB
 extern SR_PRIV struct sr_dev_driver lascar_el_usb_driver_info;
 #endif
@@ -101,6 +104,9 @@ extern SR_PRIV struct sr_dev_driver link_mso19_driver_info;
 #ifdef HAVE_HW_MANSON_HCS_3XXX
 extern SR_PRIV struct sr_dev_driver manson_hcs_3xxx_driver_info;
 #endif
+#ifdef HAVE_HW_MAYNUO_M97
+extern SR_PRIV struct sr_dev_driver maynuo_m97_driver_info;
+#endif
 #ifdef HAVE_HW_MIC_985XX
 extern SR_PRIV struct sr_dev_driver mic_98581_driver_info;
 extern SR_PRIV struct sr_dev_driver mic_98583_driver_info;
@@ -143,29 +149,7 @@ extern SR_PRIV struct sr_dev_driver testo_driver_info;
 extern SR_PRIV struct sr_dev_driver tondaj_sl_814_driver_info;
 #endif
 #ifdef HAVE_HW_UNI_T_DMM
-extern SR_PRIV struct sr_dev_driver tecpel_dmm_8061_driver_info;
-extern SR_PRIV struct sr_dev_driver uni_t_ut372_driver_info;
-extern SR_PRIV struct sr_dev_driver uni_t_ut60a_driver_info;
-extern SR_PRIV struct sr_dev_driver uni_t_ut60e_driver_info;
-extern SR_PRIV struct sr_dev_driver uni_t_ut60g_driver_info;
-extern SR_PRIV struct sr_dev_driver uni_t_ut61b_driver_info;
-extern SR_PRIV struct sr_dev_driver uni_t_ut61c_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 uni_t_ut71a_driver_info;
-extern SR_PRIV struct sr_dev_driver uni_t_ut71b_driver_info;
-extern SR_PRIV struct sr_dev_driver uni_t_ut71c_driver_info;
-extern SR_PRIV struct sr_dev_driver uni_t_ut71d_driver_info;
-extern SR_PRIV struct sr_dev_driver uni_t_ut71e_driver_info;
-extern SR_PRIV struct sr_dev_driver voltcraft_vc820_driver_info;
-extern SR_PRIV struct sr_dev_driver voltcraft_vc830_driver_info;
-extern SR_PRIV struct sr_dev_driver voltcraft_vc840_driver_info;
-extern SR_PRIV struct sr_dev_driver voltcraft_vc870_driver_info;
-extern SR_PRIV struct sr_dev_driver voltcraft_vc920_driver_info;
-extern SR_PRIV struct sr_dev_driver voltcraft_vc940_driver_info;
-extern SR_PRIV struct sr_dev_driver voltcraft_vc960_driver_info;
-extern SR_PRIV struct sr_dev_driver tenma_72_7745_driver_info;
-extern SR_PRIV struct sr_dev_driver tenma_72_7750_driver_info;
+extern SR_PRIV struct sr_dev_driver *uni_t_dmm_drivers[];
 #endif
 #ifdef HAVE_HW_UNI_T_UT32X
 extern SR_PRIV struct sr_dev_driver uni_t_ut32x_driver_info;
@@ -214,7 +198,8 @@ SR_PRIV struct sr_dev_driver **drivers_lists[] = {
 	(DRVS) {
 		&center_309_driver_info,
 		&voltcraft_k204_driver_info,
-		NULL},
+		NULL
+	},
 #endif
 #ifdef HAVE_HW_CHRONOVU_LA
 	(DRVS) {&chronovu_la_driver_info, NULL},
@@ -241,7 +226,8 @@ SR_PRIV struct sr_dev_driver **drivers_lists[] = {
 	(DRVS) {
 		&gmc_mh_1x_2x_rs232_driver_info,
 		&gmc_mh_2x_bd232_driver_info,
-		NULL},
+		NULL
+	},
 #endif
 #ifdef HAVE_HW_HAMEG_HMO
 	(DRVS) {&hameg_hmo_driver_info, NULL},
@@ -258,6 +244,9 @@ SR_PRIV struct sr_dev_driver **drivers_lists[] = {
 #ifdef HAVE_HW_KECHENG_KC_330B
 	(DRVS) {&kecheng_kc_330b_driver_info, NULL},
 #endif
+#ifdef HAVE_HW_KERN_SCALE
+	kern_scale_drivers,
+#endif
 #ifdef HAVE_HW_LASCAR_EL_USB
 	(DRVS) {&lascar_el_usb_driver_info, NULL},
 #endif
@@ -267,11 +256,15 @@ SR_PRIV struct sr_dev_driver **drivers_lists[] = {
 #ifdef HAVE_HW_MANSON_HCS_3XXX
 	(DRVS) {&manson_hcs_3xxx_driver_info, NULL},
 #endif
+#ifdef HAVE_HW_MAYNUO_M97
+	(DRVS) {&maynuo_m97_driver_info, NULL},
+#endif
 #ifdef HAVE_HW_MIC_985XX
 	(DRVS) {
 		&mic_98581_driver_info,
 		&mic_98583_driver_info,
-		NULL},
+		NULL
+	},
 #endif
 #ifdef HAVE_HW_MOTECH_LPS_30X
 	(DRVS) {&motech_lps_301_driver_info, NULL},
@@ -280,7 +273,8 @@ SR_PRIV struct sr_dev_driver **drivers_lists[] = {
 	(DRVS) {
 		&norma_dmm_driver_info,
 		&siemens_b102x_driver_info,
-		NULL},
+		NULL
+	},
 #endif
 #ifdef HAVE_HW_OPENBENCH_LOGIC_SNIFFER
 	(DRVS) {&ols_driver_info, NULL},
@@ -313,31 +307,7 @@ SR_PRIV struct sr_dev_driver **drivers_lists[] = {
 	(DRVS) {&tondaj_sl_814_driver_info, NULL},
 #endif
 #ifdef HAVE_HW_UNI_T_DMM
-	(DRVS) {
-		&tecpel_dmm_8061_driver_info,
-		&uni_t_ut372_driver_info,
-		&uni_t_ut60a_driver_info,
-		&uni_t_ut60e_driver_info,
-		&uni_t_ut60g_driver_info,
-		&uni_t_ut61b_driver_info,
-		&uni_t_ut61c_driver_info,
-		&uni_t_ut61d_driver_info,
-		&uni_t_ut61e_driver_info,
-		&uni_t_ut71a_driver_info,
-		&uni_t_ut71b_driver_info,
-		&uni_t_ut71c_driver_info,
-		&uni_t_ut71d_driver_info,
-		&uni_t_ut71e_driver_info,
-		&voltcraft_vc820_driver_info,
-		&voltcraft_vc830_driver_info,
-		&voltcraft_vc840_driver_info,
-		&voltcraft_vc870_driver_info,
-		&voltcraft_vc920_driver_info,
-		&voltcraft_vc940_driver_info,
-		&voltcraft_vc960_driver_info,
-		&tenma_72_7745_driver_info,
-		&tenma_72_7750_driver_info,
-		NULL},
+	uni_t_dmm_drivers,
 #endif
 #ifdef HAVE_HW_UNI_T_UT32X
 	(DRVS) {&uni_t_ut32x_driver_info, NULL},
@@ -354,4 +324,3 @@ SR_PRIV struct sr_dev_driver **drivers_lists[] = {
 	NULL,
 };
 /** @endcond */
-