add SR_CONF_DATALOG

[libsigrok.git] / hwdriver.c

diff --git a/hwdriver.c b/hwdriver.c
index 364d97bd471a72141a0de46ec11c882e88d1b12c..a5f85b8861bb065145b6943895ca7202ae8f16cb 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
@@ -157,6 +166,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 +178,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
@@ -289,21 +305,39 @@ SR_API int sr_driver_init(struct sr_context *ctx, struct sr_dev_driver *driver)
  * The order in which the system is scanned for devices is not specified. The
  * caller should not assume or rely on any specific order.
  *
- * @param driver The driver.
- * @param options A list of struct sr_hwopt options to pass to the driver's
- *             scanner.
+ * Before calling sr_driver_scan(), the user must have previously initialized
+ * the driver by calling sr_driver_init().
+ *
+ * @param driver The driver that should scan. This must be a pointer to one of
+ *               the entries returned by sr_driver_list(). Must not be NULL.
+ * @param options A list of 'struct sr_hwopt' options to pass to the driver's
+ *                scanner. Can be NULL/empty.
  *
- * @return A GSList * of struct sr_dev_inst, or NULL if no devices were found.
- * This list must be freed by the caller, but without freeing the data
- * pointed to in the list.
+ * @return A GSList * of 'struct sr_dev_inst', or NULL if no devices were
+ *         found (or errors were encountered). This list must be freed by the
+ *         caller using g_slist_free(), but without freeing the data pointed
+ *         to in the list.
  */
 SR_API GSList *sr_driver_scan(struct sr_dev_driver *driver, GSList *options)
 {
+       GSList *l;
 
-       if (driver->scan)
-               return driver->scan(options);
+       if (!driver) {
+               sr_err("Invalid driver, can't scan for devices.");
+               return NULL;
+       }
 
-       return NULL;
+       if (!driver->priv) {
+               sr_err("Driver not initialized, can't scan for devices.");
+               return NULL;
+       }
+
+       l = driver->scan(options);
+
+       sr_spew("Scan of '%s' found %d devices.", driver->name,
+               g_slist_length(l));
+
+       return l;
 }
 
 /** @private */
@@ -353,9 +387,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;
@@ -413,9 +444,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;