*/
static struct sr_config_info sr_config_info_data[] = {
- {SR_HWOPT_CONN, SR_T_CHAR, "conn",
+ {SR_CONF_CONN, SR_T_CHAR, "conn",
"Connection", NULL},
- {SR_HWOPT_SERIALCOMM, SR_T_CHAR, "serialcomm",
+ {SR_CONF_SERIALCOMM, SR_T_CHAR, "serialcomm",
"Serial communication", NULL},
- {SR_HWCAP_SAMPLERATE, SR_T_UINT64, "samplerate",
+ {SR_CONF_SAMPLERATE, SR_T_UINT64, "samplerate",
"Sample rate", NULL},
- {SR_HWCAP_CAPTURE_RATIO, SR_T_UINT64, "captureratio",
+ {SR_CONF_CAPTURE_RATIO, SR_T_UINT64, "captureratio",
"Pre-trigger capture ratio", NULL},
- {SR_HWCAP_PATTERN_MODE, SR_T_CHAR, "pattern",
+ {SR_CONF_PATTERN_MODE, SR_T_CHAR, "pattern",
"Pattern generator mode", NULL},
- {SR_HWCAP_RLE, SR_T_BOOL, "rle",
+ {SR_CONF_RLE, SR_T_BOOL, "rle",
"Run Length Encoding", NULL},
- {SR_HWCAP_TRIGGER_SLOPE, SR_T_UINT64, "triggerslope",
+ {SR_CONF_TRIGGER_SLOPE, SR_T_UINT64, "triggerslope",
"Trigger slope", NULL},
- {SR_HWCAP_TRIGGER_SOURCE, SR_T_CHAR, "triggersource",
+ {SR_CONF_TRIGGER_SOURCE, SR_T_CHAR, "triggersource",
"Trigger source", NULL},
- {SR_HWCAP_HORIZ_TRIGGERPOS, SR_T_FLOAT, "horiz_triggerpos",
+ {SR_CONF_HORIZ_TRIGGERPOS, SR_T_FLOAT, "horiz_triggerpos",
"Horizontal trigger position", NULL},
- {SR_HWCAP_BUFFERSIZE, SR_T_UINT64, "buffersize",
+ {SR_CONF_BUFFERSIZE, SR_T_UINT64, "buffersize",
"Buffer size", NULL},
- {SR_HWCAP_TIMEBASE, SR_T_RATIONAL_PERIOD, "timebase",
+ {SR_CONF_TIMEBASE, SR_T_RATIONAL_PERIOD, "timebase",
"Time base", NULL},
- {SR_HWCAP_FILTER, SR_T_CHAR, "filter",
+ {SR_CONF_FILTER, SR_T_CHAR, "filter",
"Filter targets", NULL},
- {SR_HWCAP_VDIV, SR_T_RATIONAL_VOLT, "vdiv",
+ {SR_CONF_VDIV, SR_T_RATIONAL_VOLT, "vdiv",
"Volts/div", NULL},
- {SR_HWCAP_COUPLING, SR_T_CHAR, "coupling",
+ {SR_CONF_COUPLING, SR_T_CHAR, "coupling",
"Coupling", NULL},
{0, 0, NULL, NULL, NULL},
};
* Returns information about the given driver or device instance.
*
* @param driver The sr_dev_driver struct to query.
- * @param id The type of information, in the form of an SR_HWCAP_* option.
- * @param data Pointer where the value. will be stored. Must not be NULL.
- * @param sdi Pointer to the struct sr_dev_inst to be checked. Must not be NULL.
+ * @param key The configuration key (SR_CONF_*).
+ * @param data Pointer where the value will be stored. Must not be NULL.
+ * @param sdi If the key is specific to a device, this must contain a
+ * pointer to the struct sr_dev_inst to be checked.
*
* @return SR_OK upon success or SR_ERR in case of error. Note SR_ERR_ARG
- * may be returned by the driver indicating it doesn't know that id,
+ * may be returned by the driver indicating it doesn't know that 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_info_get(struct sr_dev_driver *driver, int id,
+SR_API int sr_config_get(const struct sr_dev_driver *driver, int key,
const void **data, const struct sr_dev_inst *sdi)
{
int ret;
- if (driver == NULL || data == NULL)
+ if (!driver || !data)
return SR_ERR;
- ret = driver->info_get(id, data, sdi);
+ if (!driver->config_get)
+ return SR_ERR_ARG;
+
+ ret = driver->config_get(key, data, sdi);
return ret;
}
/**
- * Find out if a hardware driver has a specific capability.
+ * Set a configuration key in a device instance.
*
- * @param driver The hardware driver in which to search for the capability.
- * @param hwcap The capability to find in the list.
+ * @param sdi The device instance.
+ * @param key The configuration key (SR_CONF_*).
+ * @param value The new value for the key, as a pointer to whatever type
+ * is appropriate for that key.
*
- * @return TRUE if the specified capability exists in the specified driver,
- * FALSE otherwise. Also, if 'driver' is NULL or the respective driver
- * returns an invalid capability list, FALSE is returned.
+ * @return SR_OK upon success or SR_ERR in case of error. Note SR_ERR_ARG
+ * may be returned by the driver indicating it doesn't know that 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 gboolean sr_driver_hwcap_exists(struct sr_dev_driver *driver, int hwcap)
+SR_API int sr_config_set(const struct sr_dev_inst *sdi, int key,
+ const void *value)
{
- const int *hwcaps;
- int i;
+ int ret;
- if (!driver) {
- sr_err("hwdriver: %s: driver was NULL", __func__);
- return FALSE;
- }
+ if (!sdi || !sdi->driver)
+ return SR_ERR;
- if (driver->info_get(SR_DI_HWCAPS, (const void **)&hwcaps, NULL) != SR_OK)
- return FALSE;
+ if (!sdi->driver->config_set)
+ return SR_ERR_ARG;
- for (i = 0; hwcaps[i]; i++) {
- if (hwcaps[i] == hwcap)
- return TRUE;
- }
+ ret = sdi->driver->config_set(key, value, sdi);
+
+ return ret;
+}
- return FALSE;
+/**
+ * List all possible values for a configuration key.
+ *
+ * @param driver The sr_dev_driver struct to query.
+ * @param key The configuration key (SR_CONF_*).
+ * @param data A pointer to a list of values, in whatever format is
+ * appropriate for that key.
+ * @param sdi If the key is specific to a device, this must contain a
+ * pointer to the struct sr_dev_inst to be checked.
+ *
+ * @return SR_OK upon success or SR_ERR in case of error. Note SR_ERR_ARG
+ * may be returned by the driver indicating it doesn't know that 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_list(struct sr_dev_driver *driver, int key,
+ const void **data, const struct sr_dev_inst *sdi)
+{
+ int ret;
+
+ if (!driver || !data)
+ return SR_ERR;
+
+ if (!driver->config_list)
+ return SR_ERR_ARG;
+
+ ret = driver->config_list(key, data, sdi);
+
+ return ret;
}
/**
- * Get information about an sr_config key.
+ * Get information about a configuration key.
*
- * @param opt The sr_config key.
+ * @param opt The configuration key.
*
* @return A pointer to a struct sr_config_info, or NULL if the key
* was not found.
}
/**
- * Get information about an sr_config key, by name.
+ * Get information about an configuration key, by name.
*
- * @param optname The sr_config key.
+ * @param optname The configuration key.
*
* @return A pointer to a struct sr_config_info, or NULL if the key
* was not found.