probe_groups: initialise sdi->probe_groups to NULL.

[libsigrok.git] / hwdriver.c

diff --git a/hwdriver.c b/hwdriver.c
index 65c8c2583b4bb6c540f3ffb7fe3f6f12be21f5d2..8ae5674c32cdcc5c2ae236ab87e73e68ffb59d7c 100644 (file)
--- a/hwdriver.c
+++ b/hwdriver.c
@@ -63,6 +63,10 @@ static struct sr_config_info sr_config_info_data[] = {
                "Pattern generator mode", NULL},
        {SR_CONF_TRIGGER_TYPE, SR_T_CHAR, "triggertype",
                "Trigger types", NULL},
+       {SR_CONF_EXTERNAL_CLOCK, SR_T_BOOL, "external_clock",
+               "External clock mode", NULL},
+       {SR_CONF_SWAP, SR_T_BOOL, "swap",
+               "Swap channel order", NULL},
        {SR_CONF_RLE, SR_T_BOOL, "rle",
                "Run Length Encoding", NULL},
        {SR_CONF_TRIGGER_SLOPE, SR_T_UINT64, "triggerslope",
@@ -135,6 +139,9 @@ extern SR_PRIV struct sr_dev_driver lascar_el_usb_driver_info;
 extern SR_PRIV struct sr_dev_driver mic_98581_driver_info;
 extern SR_PRIV struct sr_dev_driver mic_98583_driver_info;
 #endif
+#ifdef HAVE_HW_NORMA_DMM
+extern SR_PRIV struct sr_dev_driver norma_dmm_driver_info;
+#endif
 #ifdef HAVE_HW_OLS
 extern SR_PRIV struct sr_dev_driver ols_driver_info;
 #endif
@@ -144,6 +151,9 @@ extern SR_PRIV struct sr_dev_driver rigol_ds1xx2_driver_info;
 #ifdef HAVE_HW_SALEAE_LOGIC16
 extern SR_PRIV struct sr_dev_driver saleae_logic16_driver_info;
 #endif
+#ifdef HAVE_HW_TELEINFO
+extern SR_PRIV struct sr_dev_driver teleinfo_driver_info;
+#endif
 #ifdef HAVE_HW_TONDAJ_SL_814
 extern SR_PRIV struct sr_dev_driver tondaj_sl_814_driver_info;
 #endif
@@ -188,6 +198,7 @@ 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 va_va18b_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;
@@ -195,6 +206,7 @@ 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_m3650d_driver_info;
+extern SR_PRIV struct sr_dev_driver voltcraft_m4650cr_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;
@@ -202,6 +214,7 @@ 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_ut61d_ser_driver_info;
 extern SR_PRIV struct sr_dev_driver uni_t_ut61e_ser_driver_info;
+extern SR_PRIV struct sr_dev_driver iso_tech_idm103n_driver_info;
 #endif
 #ifdef HAVE_HW_UNI_T_DMM
 extern SR_PRIV struct sr_dev_driver tecpel_dmm_8061_driver_info;
@@ -248,6 +261,9 @@ static struct sr_dev_driver *drivers_list[] = {
        &mic_98581_driver_info,
        &mic_98583_driver_info,
 #endif
+#ifdef HAVE_HW_NORMA_DMM
+       &norma_dmm_driver_info,
+#endif
 #ifdef HAVE_HW_OLS
        &ols_driver_info,
 #endif
@@ -257,6 +273,9 @@ static struct sr_dev_driver *drivers_list[] = {
 #ifdef HAVE_HW_SALEAE_LOGIC16
        &saleae_logic16_driver_info,
 #endif
+#ifdef HAVE_HW_TELEINFO
+       &teleinfo_driver_info,
+#endif
 #ifdef HAVE_HW_TONDAJ_SL_814
        &tondaj_sl_814_driver_info,
 #endif
@@ -301,6 +320,7 @@ static struct sr_dev_driver *drivers_list[] = {
        &mastech_mas345_driver_info,
        &va_va18b_driver_info,
        &metex_m3640d_driver_info,
+       &metex_m4650cr_driver_info,
        &peaktech_4370_driver_info,
        &pce_pce_dm32_driver_info,
        &radioshack_22_168_driver_info,
@@ -308,6 +328,7 @@ static struct sr_dev_driver *drivers_list[] = {
        &radioshack_22_812_driver_info,
        &tecpel_dmm_8061_ser_driver_info,
        &voltcraft_m3650d_driver_info,
+       &voltcraft_m4650cr_driver_info,
        &voltcraft_vc820_ser_driver_info,
        &voltcraft_vc830_ser_driver_info,
        &voltcraft_vc840_ser_driver_info,
@@ -315,6 +336,7 @@ static struct sr_dev_driver *drivers_list[] = {
        &uni_t_ut60e_ser_driver_info,
        &uni_t_ut61d_ser_driver_info,
        &uni_t_ut61e_ser_driver_info,
+       &iso_tech_idm103n_driver_info,
 #endif
 #ifdef HAVE_HW_UNI_T_DMM
        &tecpel_dmm_8061_driver_info,
@@ -435,7 +457,8 @@ SR_PRIV void sr_hw_cleanup_all(void)
        }
 }
 
-/** A floating reference can be passed in for data. */
+/** A floating reference can be passed in for data.
+ * @private */
 SR_PRIV struct sr_config *sr_config_new(int key, GVariant *data)
 {
        struct sr_config *src;
@@ -448,6 +471,7 @@ SR_PRIV struct sr_config *sr_config_new(int key, GVariant *data)
        return src;
 }
 
+/** @private */
 SR_PRIV void sr_config_free(struct sr_config *src)
 {
 
@@ -480,8 +504,10 @@ SR_PRIV void sr_config_free(struct sr_config *src)
  *         but this is not to be flagged as an error by the caller; merely
  *         as an indication that it's not applicable.
  */
-SR_API int sr_config_get(const struct sr_dev_driver *driver, int key,
-               GVariant **data, const struct sr_dev_inst *sdi)
+SR_API int sr_config_get(const struct sr_dev_driver *driver,
+               const struct sr_dev_inst *sdi,
+               const struct sr_probe_group *probe_group,
+               int key, GVariant **data)
 {
        int ret;
 
@@ -491,7 +517,7 @@ SR_API int sr_config_get(const struct sr_dev_driver *driver, int key,
        if (!driver->config_get)
                return SR_ERR_ARG;
 
-       if ((ret = driver->config_get(key, data, sdi)) == SR_OK) {
+       if ((ret = driver->config_get(key, data, sdi, probe_group)) == SR_OK) {
                /* Got a floating reference from the driver. Sink it here,
                 * caller will need to unref when done with it. */
                g_variant_ref_sink(*data);
@@ -514,7 +540,9 @@ SR_API int sr_config_get(const struct sr_dev_driver *driver, int key,
  *         but this is not to be flagged as an error by the caller; merely
  *         as an indication that it's not applicable.
  */
-SR_API int sr_config_set(const struct sr_dev_inst *sdi, int key, GVariant *data)
+SR_API int sr_config_set(const struct sr_dev_inst *sdi,
+               const struct sr_probe_group *probe_group,
+               int key, GVariant *data)
 {
        int ret;
 
@@ -525,7 +553,7 @@ SR_API int sr_config_set(const struct sr_dev_inst *sdi, int key, GVariant *data)
        else if (!sdi->driver->config_set)
                ret = SR_ERR_ARG;
        else
-               ret = sdi->driver->config_set(key, data, sdi);
+               ret = sdi->driver->config_set(key, data, sdi, probe_group);
 
        g_variant_unref(data);
 
@@ -550,8 +578,10 @@ SR_API int sr_config_set(const struct sr_dev_inst *sdi, int key, GVariant *data)
  *         but this is not to be flagged as an error by the caller; merely
  *         as an indication that it's not applicable.
  */
-SR_API int sr_config_list(const struct sr_dev_driver *driver, int key,
-               GVariant **data, const struct sr_dev_inst *sdi)
+SR_API int sr_config_list(const struct sr_dev_driver *driver,
+               const struct sr_dev_inst *sdi,
+               const struct sr_probe_group *probe_group,
+               int key, GVariant **data)
 {
        int ret;
 
@@ -559,7 +589,7 @@ SR_API int sr_config_list(const struct sr_dev_driver *driver, int key,
                ret = SR_ERR;
        else if (!driver->config_list)
                ret = SR_ERR_ARG;
-       else if ((ret = driver->config_list(key, data, sdi)) == SR_OK)
+       else if ((ret = driver->config_list(key, data, sdi, probe_group)) == SR_OK)
                g_variant_ref_sink(*data);
 
        return ret;