windows: Fix various compiler warnings.

[libsigrok.git] / src / drivers.c

diff --git a/src/drivers.c b/src/drivers.c
index 6eac4589cf51035d4e6b2222fa0e125948495de2..ffe467d62fe38c64b44440a680393b4932fe4a62 100644 (file)
--- a/src/drivers.c
+++ b/src/drivers.c
@@ -143,29 +143,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 +192,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 +220,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},
@@ -271,7 +251,8 @@ SR_PRIV struct sr_dev_driver **drivers_lists[] = {
        (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 +261,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 +295,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 +312,3 @@ SR_PRIV struct sr_dev_driver **drivers_lists[] = {
        NULL,
 };
 /** @endcond */
-