rigol-ds1xx2: Cosmetics, whitespace.

[libsigrok.git] / hwdriver.c

diff --git a/hwdriver.c b/hwdriver.c
index d2f62e3a88d0768d26d4af1901b69e239926bc38..2640ba9720b98e9a8b338fd000ad9423c45beda0 100644 (file)
--- a/hwdriver.c
+++ b/hwdriver.c
@@ -77,9 +77,15 @@ extern SR_PRIV struct sr_dev_driver demo_driver_info;
 #ifdef HAVE_HW_LASCAR_EL_USB
 extern SR_PRIV struct sr_dev_driver lascar_el_usb_driver_info;
 #endif
+#ifdef HAVE_HW_NEXUS_OSCIPRIME
+extern SR_PRIV struct sr_dev_driver nexus_osciprime_driver_info;
+#endif
 #ifdef HAVE_LA_OLS
 extern SR_PRIV struct sr_dev_driver ols_driver_info;
 #endif
+#ifdef HAVE_HW_RIGOL_DS1XX2
+extern SR_PRIV struct sr_dev_driver rigol_ds1xx2_driver_info;
+#endif
 #ifdef HAVE_HW_TONDAJ_SL_814
 extern SR_PRIV struct sr_dev_driver tondaj_sl_814_driver_info;
 #endif
@@ -98,7 +104,7 @@ extern SR_PRIV struct sr_dev_driver chronovu_la8_driver_info;
 #ifdef HAVE_LA_LINK_MSO19
 extern SR_PRIV struct sr_dev_driver link_mso19_driver_info;
 #endif
-#ifdef HAVE_LA_ALSA
+#ifdef HAVE_HW_ALSA
 extern SR_PRIV struct sr_dev_driver alsa_driver_info;
 #endif
 #ifdef HAVE_LA_FX2LAFW
@@ -125,6 +131,9 @@ 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_812_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_ut61e_ser_driver_info;
 #endif
 #ifdef HAVE_HW_UNI_T_DMM
 extern SR_PRIV struct sr_dev_driver uni_t_ut61d_driver_info;
@@ -142,9 +151,15 @@ static struct sr_dev_driver *drivers_list[] = {
 #ifdef HAVE_HW_LASCAR_EL_USB
        &lascar_el_usb_driver_info,
 #endif
+#ifdef HAVE_HW_NEXUS_OSCIPRIME
+       &nexus_osciprime_driver_info,
+#endif
 #ifdef HAVE_LA_OLS
        &ols_driver_info,
 #endif
+#ifdef HAVE_HW_RIGOL_DS1XX2
+       &rigol_ds1xx2_driver_info,
+#endif
 #ifdef HAVE_HW_TONDAJ_SL_814
        &tondaj_sl_814_driver_info,
 #endif
@@ -163,7 +178,7 @@ static struct sr_dev_driver *drivers_list[] = {
 #ifdef HAVE_LA_LINK_MSO19
        &link_mso19_driver_info,
 #endif
-#ifdef HAVE_LA_ALSA
+#ifdef HAVE_HW_ALSA
        &alsa_driver_info,
 #endif
 #ifdef HAVE_LA_FX2LAFW
@@ -190,6 +205,9 @@ static struct sr_dev_driver *drivers_list[] = {
        &pce_pce_dm32_driver_info,
        &radioshack_22_168_driver_info,
        &radioshack_22_812_driver_info,
+       &voltcraft_vc820_ser_driver_info,
+       &voltcraft_vc840_ser_driver_info,
+       &uni_t_ut61e_ser_driver_info,
 #endif
 #ifdef HAVE_HW_UNI_T_DMM
        &uni_t_ut61d_driver_info,
@@ -222,7 +240,7 @@ SR_API int sr_driver_init(struct sr_context *ctx, struct sr_dev_driver *driver)
 {
 
        if (driver->init)
-               return driver->init();
+               return driver->init(ctx);
 
        return SR_OK;
 }