s/sr_config_make/sr_config_new/.

[libsigrok.git] / hwdriver.c

diff --git a/hwdriver.c b/hwdriver.c
index d8748e93b27bedda303c1ca9847750bd7141438b..c2e6cda1dd9c8f569e2510ea518ecfa871b44096 100644 (file)
--- a/hwdriver.c
+++ b/hwdriver.c
@@ -79,10 +79,15 @@ static struct sr_config_info sr_config_info_data[] = {
                "Volts/div", NULL},
        {SR_CONF_COUPLING, SR_T_CHAR, "coupling",
                "Coupling", NULL},
+       {SR_CONF_DATALOG, SR_T_BOOL, "datalog",
+               "Datalog", NULL},
        {0, 0, NULL, NULL, NULL},
 };
 
 /** @cond PRIVATE */
+#ifdef HAVE_HW_BRYMEN_DMM
+extern SR_PRIV struct sr_dev_driver brymen_bm857_driver_info;
+#endif
 #ifdef HAVE_HW_COLEAD_SLM
 extern SR_PRIV struct sr_dev_driver colead_slm_driver_info;
 #endif
@@ -92,6 +97,10 @@ 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_MIC_985XX
+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_NEXUS_OSCIPRIME
 extern SR_PRIV struct sr_dev_driver nexus_osciprime_driver_info;
 #endif
@@ -145,6 +154,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_805_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;
@@ -157,6 +167,9 @@ extern SR_PRIV struct sr_dev_driver voltcraft_vc820_driver_info;
 /** @endcond */
 
 static struct sr_dev_driver *drivers_list[] = {
+#ifdef HAVE_HW_BRYMEN_DMM
+       &brymen_bm857_driver_info,
+#endif
 #ifdef HAVE_HW_COLEAD_SLM
        &colead_slm_driver_info,
 #endif
@@ -166,6 +179,10 @@ static struct sr_dev_driver *drivers_list[] = {
 #ifdef HAVE_HW_LASCAR_EL_USB
        &lascar_el_usb_driver_info,
 #endif
+#ifdef HAVE_HW_MIC_985XX
+       &mic_98581_driver_info,
+       &mic_98583_driver_info,
+#endif
 #ifdef HAVE_HW_NEXUS_OSCIPRIME
        &nexus_osciprime_driver_info,
 #endif
@@ -219,6 +236,7 @@ static struct sr_dev_driver *drivers_list[] = {
        &peaktech_4370_driver_info,
        &pce_pce_dm32_driver_info,
        &radioshack_22_168_driver_info,
+       &radioshack_22_805_driver_info,
        &radioshack_22_812_driver_info,
        &voltcraft_vc820_ser_driver_info,
        &voltcraft_vc840_ser_driver_info,
@@ -337,7 +355,7 @@ SR_PRIV void sr_hw_cleanup_all(void)
        }
 }
 
-SR_PRIV struct sr_config *sr_config_make(int key, const void *value)
+SR_PRIV struct sr_config *sr_config_new(int key, const void *value)
 {
        struct sr_config *src;
 
@@ -371,9 +389,6 @@ SR_API int sr_config_get(const struct sr_dev_driver *driver, int key,
        if (!driver || !data)
                return SR_ERR;
 
-       if (!driver->config_get)
-               return SR_ERR_ARG;
-
        ret = driver->config_get(key, data, sdi);
 
        return ret;
@@ -431,9 +446,6 @@ SR_API int sr_config_list(const struct sr_dev_driver *driver, int key,
        if (!driver || !data)
                return SR_ERR;
 
-       if (!driver->config_list)
-               return SR_ERR_ARG;
-
        ret = driver->config_list(key, data, sdi);
 
        return ret;