add VID:PID for generic SILabs F32x USBXpress chips

[libsigrok.git] / hwdriver.c

diff --git a/hwdriver.c b/hwdriver.c
index 5a8caddac8b374c7d19707ba2db6d6285ba050f9..2b04e2298ef082f47ecfff8deb5de01bc6dcf59a 100644 (file)
--- a/hwdriver.c
+++ b/hwdriver.c
@@ -74,6 +74,9 @@ extern SR_PRIV struct sr_dev_driver colead_slm_driver_info;
 #ifdef HAVE_LA_DEMO
 extern SR_PRIV struct sr_dev_driver demo_driver_info;
 #endif
+#ifdef HAVE_HW_LASCAR_EL_USB
+extern SR_PRIV struct sr_dev_driver lascar_el_usb_driver_info;
+#endif
 #ifdef HAVE_LA_OLS
 extern SR_PRIV struct sr_dev_driver ols_driver_info;
 #endif
@@ -110,9 +113,6 @@ extern SR_PRIV struct sr_dev_driver agdmm_driver_info;
 #ifdef HAVE_HW_FLUKE_DMM
 extern SR_PRIV struct sr_dev_driver flukedmm_driver_info;
 #endif
-#ifdef HAVE_HW_RADIOSHACK_DMM
-extern SR_PRIV struct sr_dev_driver radioshackdmm_driver_info;
-#endif
 #ifdef HAVE_HW_SERIAL_DMM
 extern SR_PRIV struct sr_dev_driver digitek_dt4000zc_driver_info;
 extern SR_PRIV struct sr_dev_driver tekpower_tp4000zc_driver_info;
@@ -124,6 +124,7 @@ extern SR_PRIV struct sr_dev_driver metex_m3640d_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_812_driver_info;
 #endif
 #ifdef HAVE_HW_UNI_T_DMM
 extern SR_PRIV struct sr_dev_driver uni_t_ut61d_driver_info;
@@ -138,6 +139,9 @@ static struct sr_dev_driver *drivers_list[] = {
 #ifdef HAVE_LA_DEMO
        &demo_driver_info,
 #endif
+#ifdef HAVE_HW_LASCAR_EL_USB
+       &lascar_el_usb_driver_info,
+#endif
 #ifdef HAVE_LA_OLS
        &ols_driver_info,
 #endif
@@ -174,9 +178,6 @@ static struct sr_dev_driver *drivers_list[] = {
 #ifdef HAVE_HW_FLUKE_DMM
        &flukedmm_driver_info,
 #endif
-#ifdef HAVE_HW_RADIOSHACK_DMM
-       &radioshackdmm_driver_info,
-#endif
 #ifdef HAVE_HW_SERIAL_DMM
        &digitek_dt4000zc_driver_info,
        &tekpower_tp4000zc_driver_info,
@@ -188,6 +189,7 @@ static struct sr_dev_driver *drivers_list[] = {
        &peaktech_4370_driver_info,
        &pce_pce_dm32_driver_info,
        &radioshack_22_168_driver_info,
+       &radioshack_22_812_driver_info,
 #endif
 #ifdef HAVE_HW_UNI_T_DMM
        &uni_t_ut61d_driver_info,
@@ -210,15 +212,17 @@ SR_API struct sr_dev_driver **sr_driver_list(void)
 /**
  * Initialize a hardware driver.
  *
+ * @param ctx A libsigrok context object allocated by a previous call to
+ *             sr_init().
  * @param driver The driver to initialize.
  *
  * @return SR_OK if all went well, or an error code otherwise.
  */
-SR_API int sr_driver_init(struct sr_dev_driver *driver)
+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;
 }