* @{
*/
-/* Driver scanning options. */
-static struct sr_config_info sr_drvopts[] = {
- {SR_HWOPT_CONN, SR_T_CHAR, "conn",
+static struct sr_config_info sr_config_info_data[] = {
+ {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},
- {0, 0, NULL, NULL, NULL},
-};
-
-/* Device instance options. */
-static struct sr_config_info sr_devopts[] = {
- {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 id The type of information, in the form of an SR_CONF_* 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.
*
if (driver == NULL || data == NULL)
return SR_ERR;
- ret = driver->info_get(id, data, sdi);
+ ret = driver->config_get(id, data, sdi);
+
+ return ret;
+}
+
+SR_API int sr_config_list(struct sr_dev_driver *driver, int id,
+ const void **data, const struct sr_dev_inst *sdi)
+{
+ int ret;
+
+ if (driver == NULL || data == NULL)
+ return SR_ERR;
+
+ if (!driver->config_list)
+ return SR_ERR;
+
+ ret = driver->config_list(id, data, sdi);
return ret;
}
return FALSE;
}
- if (driver->info_get(SR_DI_HWCAPS, (const void **)&hwcaps, NULL) != SR_OK)
+ if (driver->config_get(SR_DI_HWCAPS, (const void **)&hwcaps, NULL) != SR_OK)
return FALSE;
for (i = 0; hwcaps[i]; i++) {
}
/**
- * Get information about a hardware driver option.
- *
- * @param opt The option to get.
- *
- * @return A pointer to a struct sr_hwcap_option, or NULL if the option
- * was not found.
- */
-SR_API const struct sr_config_info *sr_drvopt_get(int opt)
-{
- int i;
-
- for (i = 0; sr_drvopts[i].key; i++) {
- if (sr_drvopts[i].key == opt)
- return &sr_drvopts[i];
- }
-
- return NULL;
-}
-
-/**
- * Get information about a hardware driver option, by name.
- *
- * @param optname The name of the option to get.
- *
- * @return A pointer to a struct sr_hwcap_option, or NULL if the option
- * was not found.
- */
-SR_API const struct sr_config_info *sr_drvopt_name_get(const char *optname)
-{
- int i;
-
- for (i = 0; sr_drvopts[i].key; i++) {
- if (!strcmp(sr_drvopts[i].id, optname))
- return &sr_drvopts[i];
- }
-
- return NULL;
-}
-
-/**
- * Get information about a device option.
+ * Get information about an sr_config key.
*
- * @param opt The option to get.
+ * @param opt The sr_config key.
*
- * @return A pointer to a struct sr_hwcap_option, or NULL if the option
+ * @return A pointer to a struct sr_config_info, or NULL if the key
* was not found.
*/
-SR_API const struct sr_config_info *sr_devopt_get(int opt)
+SR_API const struct sr_config_info *sr_config_info_get(int key)
{
int i;
- for (i = 0; sr_devopts[i].key; i++) {
- if (sr_devopts[i].key == opt)
- return &sr_devopts[i];
+ for (i = 0; sr_config_info_data[i].key; i++) {
+ if (sr_config_info_data[i].key == key)
+ return &sr_config_info_data[i];
}
return NULL;
}
/**
- * Get information about a device option, by name.
+ * Get information about an sr_config key, by name.
*
- * @param optname The name of the option to get.
+ * @param optname The sr_config key.
*
- * @return A pointer to a struct sr_hwcap_option, or NULL if the option
+ * @return A pointer to a struct sr_config_info, or NULL if the key
* was not found.
*/
-SR_API const struct sr_config_info *sr_devopt_name_get(const char *optname)
+SR_API const struct sr_config_info *sr_config_info_name_get(const char *optname)
{
int i;
- for (i = 0; sr_devopts[i].key; i++) {
- if (!strcmp(sr_devopts[i].id, optname))
- return &sr_devopts[i];
+ for (i = 0; sr_config_info_data[i].key; i++) {
+ if (!strcmp(sr_config_info_data[i].id, optname))
+ return &sr_config_info_data[i];
}
return NULL;
projects / libsigrok.git / blobdiff