X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hwdriver.c;h=455f02aa6c4d31225a4926fc37d1d365a328bc5d;hb=6375e1c3eba6243bcaa28f0eee5452cc6f9ae2fd;hp=d2f62e3a88d0768d26d4af1901b69e239926bc38;hpb=44fc870c9cc5c0e53b47b9d7fa3dffe81731ee3c;p=libsigrok.git

diff --git a/hwdriver.c b/hwdriver.c
index d2f62e3a..455f02aa 100644
--- a/hwdriver.c
+++ b/hwdriver.c
@@ -77,6 +77,9 @@ 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
@@ -98,7 +101,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 +128,8 @@ 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;
 #endif
 #ifdef HAVE_HW_UNI_T_DMM
 extern SR_PRIV struct sr_dev_driver uni_t_ut61d_driver_info;
@@ -142,6 +147,9 @@ 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
@@ -163,7 +171,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 +198,8 @@ 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,
 #endif
 #ifdef HAVE_HW_UNI_T_DMM
 	&uni_t_ut61d_driver_info,
@@ -222,7 +232,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;
 }