X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fdrivers.c;h=d37d55290c89545a08e24eb0c911062b5801bf76;hb=c11a1e6122998b247df66c59d2076eb814818497;hp=0789b1f7b32c25806c69a7b5292b0f0bce772633;hpb=9e60a31fb954493754770fe2192db74b947c6867;p=libsigrok.git

diff --git a/src/drivers.c b/src/drivers.c
index 0789b1f7..d37d5529 100644
--- a/src/drivers.c
+++ b/src/drivers.c
@@ -101,6 +101,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;
@@ -128,50 +131,7 @@ extern SR_PRIV struct sr_dev_driver saleae_logic16_driver_info;
 extern SR_PRIV struct sr_dev_driver scpi_pps_driver_info;
 #endif
 #ifdef HAVE_HW_SERIAL_DMM
-extern SR_PRIV struct sr_dev_driver bbcgm_m2110_driver_info;
-extern SR_PRIV struct sr_dev_driver digitek_dt4000zc_driver_info;
-extern SR_PRIV struct sr_dev_driver tekpower_tp4000zc_driver_info;
-extern SR_PRIV struct sr_dev_driver metex_me31_driver_info;
-extern SR_PRIV struct sr_dev_driver peaktech_3410_driver_info;
-extern SR_PRIV struct sr_dev_driver mastech_mas345_driver_info;
-extern SR_PRIV struct sr_dev_driver mastech_ms8250b_driver_info;
-extern SR_PRIV struct sr_dev_driver va_va18b_driver_info;
-extern SR_PRIV struct sr_dev_driver va_va40b_driver_info;
-extern SR_PRIV struct sr_dev_driver metex_m3640d_driver_info;
-extern SR_PRIV struct sr_dev_driver metex_m4650cr_driver_info;
-extern SR_PRIV struct sr_dev_driver peaktech_4370_driver_info;
-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_8061_ser_driver_info;
-extern SR_PRIV struct sr_dev_driver voltcraft_m3650cr_driver_info;
-extern SR_PRIV struct sr_dev_driver voltcraft_m3650d_driver_info;
-extern SR_PRIV struct sr_dev_driver voltcraft_m4650cr_driver_info;
-extern SR_PRIV struct sr_dev_driver voltcraft_me42_driver_info;
-extern SR_PRIV struct sr_dev_driver voltcraft_vc820_ser_driver_info;
-extern SR_PRIV struct sr_dev_driver voltcraft_vc830_ser_driver_info;
-extern SR_PRIV struct sr_dev_driver voltcraft_vc840_ser_driver_info;
-extern SR_PRIV struct sr_dev_driver voltcraft_vc870_ser_driver_info;
-extern SR_PRIV struct sr_dev_driver voltcraft_vc920_ser_driver_info;
-extern SR_PRIV struct sr_dev_driver voltcraft_vc940_ser_driver_info;
-extern SR_PRIV struct sr_dev_driver voltcraft_vc960_ser_driver_info;
-extern SR_PRIV struct sr_dev_driver uni_t_ut60a_ser_driver_info;
-extern SR_PRIV struct sr_dev_driver uni_t_ut60e_ser_driver_info;
-extern SR_PRIV struct sr_dev_driver uni_t_ut60g_ser_driver_info;
-extern SR_PRIV struct sr_dev_driver uni_t_ut61b_ser_driver_info;
-extern SR_PRIV struct sr_dev_driver uni_t_ut61c_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;
-extern SR_PRIV struct sr_dev_driver uni_t_ut71a_ser_driver_info;
-extern SR_PRIV struct sr_dev_driver uni_t_ut71b_ser_driver_info;
-extern SR_PRIV struct sr_dev_driver uni_t_ut71c_ser_driver_info;
-extern SR_PRIV struct sr_dev_driver uni_t_ut71d_ser_driver_info;
-extern SR_PRIV struct sr_dev_driver uni_t_ut71e_ser_driver_info;
-extern SR_PRIV struct sr_dev_driver iso_tech_idm103n_driver_info;
-extern SR_PRIV struct sr_dev_driver tenma_72_7745_ser_driver_info;
-extern SR_PRIV struct sr_dev_driver tenma_72_7750_ser_driver_info;
-extern SR_PRIV struct sr_dev_driver brymen_bm25x_driver_info;
+extern SR_PRIV struct sr_dev_driver *serial_dmm_drivers[];
 #endif
 #ifdef HAVE_HW_SYSCLK_LWLA
 extern SR_PRIV struct sr_dev_driver sysclk_lwla_driver_info;
@@ -186,29 +146,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;
@@ -257,7 +195,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},
@@ -284,7 +223,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},
@@ -310,11 +250,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},
@@ -323,7 +267,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},
@@ -341,52 +286,7 @@ SR_PRIV struct sr_dev_driver **drivers_lists[] = {
 	(DRVS) {&scpi_pps_driver_info, NULL},
 #endif
 #ifdef HAVE_HW_SERIAL_DMM
-	(DRVS) {
-		&bbcgm_m2110_driver_info,
-		&digitek_dt4000zc_driver_info,
-		&tekpower_tp4000zc_driver_info,
-		&metex_me31_driver_info,
-		&peaktech_3410_driver_info,
-		&mastech_mas345_driver_info,
-		&mastech_ms8250b_driver_info,
-		&va_va18b_driver_info,
-		&va_va40b_driver_info,
-		&metex_m3640d_driver_info,
-		&metex_m4650cr_driver_info,
-		&peaktech_4370_driver_info,
-		&pce_pce_dm32_driver_info,
-		&radioshack_22_168_driver_info,
-		&radioshack_22_805_driver_info,
-		&radioshack_22_812_driver_info,
-		&tecpel_dmm_8061_ser_driver_info,
-		&voltcraft_m3650cr_driver_info,
-		&voltcraft_m3650d_driver_info,
-		&voltcraft_m4650cr_driver_info,
-		&voltcraft_me42_driver_info,
-		&voltcraft_vc820_ser_driver_info,
-		&voltcraft_vc830_ser_driver_info,
-		&voltcraft_vc840_ser_driver_info,
-		&voltcraft_vc870_ser_driver_info,
-		&voltcraft_vc920_ser_driver_info,
-		&voltcraft_vc940_ser_driver_info,
-		&voltcraft_vc960_ser_driver_info,
-		&uni_t_ut60a_ser_driver_info,
-		&uni_t_ut60e_ser_driver_info,
-		&uni_t_ut60g_ser_driver_info,
-		&uni_t_ut61b_ser_driver_info,
-		&uni_t_ut61c_ser_driver_info,
-		&uni_t_ut61d_ser_driver_info,
-		&uni_t_ut61e_ser_driver_info,
-		&uni_t_ut71a_ser_driver_info,
-		&uni_t_ut71b_ser_driver_info,
-		&uni_t_ut71c_ser_driver_info,
-		&uni_t_ut71d_ser_driver_info,
-		&uni_t_ut71e_ser_driver_info,
-		&iso_tech_idm103n_driver_info,
-		&tenma_72_7745_ser_driver_info,
-		&tenma_72_7750_ser_driver_info,
-		&brymen_bm25x_driver_info,
-		NULL},
+	serial_dmm_drivers,
 #endif
 #ifdef HAVE_HW_SYSCLK_LWLA
 	(DRVS) {&sysclk_lwla_driver_info, NULL},
@@ -401,31 +301,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},
@@ -442,4 +318,3 @@ SR_PRIV struct sr_dev_driver **drivers_lists[] = {
 	NULL,
 };
 /** @endcond */
-