#include "libsigrok.h"
#include "libsigrok-internal.h"
+/** @cond PRIVATE */
#define LOG_PREFIX "hwdriver"
+/** @endcond */
/**
* @file
*/
static struct sr_config_info sr_config_info_data[] = {
- {SR_CONF_CONN, SR_T_CHAR, "conn",
+ {SR_CONF_CONN, SR_T_STRING, "conn",
"Connection", NULL},
- {SR_CONF_SERIALCOMM, SR_T_CHAR, "serialcomm",
+ {SR_CONF_SERIALCOMM, SR_T_STRING, "serialcomm",
"Serial communication", NULL},
{SR_CONF_SAMPLERATE, SR_T_UINT64, "samplerate",
"Sample rate", NULL},
{SR_CONF_CAPTURE_RATIO, SR_T_UINT64, "captureratio",
"Pre-trigger capture ratio", NULL},
- {SR_CONF_PATTERN_MODE, SR_T_CHAR, "pattern",
+ {SR_CONF_PATTERN_MODE, SR_T_STRING, "pattern",
"Pattern", NULL},
- {SR_CONF_TRIGGER_TYPE, SR_T_CHAR, "triggertype",
- "Trigger types", NULL},
+ {SR_CONF_TRIGGER_MATCH, SR_T_INT32, "triggermatch",
+ "Trigger matches", 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_CHAR, "triggerslope",
+ {SR_CONF_TRIGGER_SLOPE, SR_T_STRING, "triggerslope",
"Trigger slope", NULL},
- {SR_CONF_TRIGGER_SOURCE, SR_T_CHAR, "triggersource",
+ {SR_CONF_TRIGGER_SOURCE, SR_T_STRING, "triggersource",
"Trigger source", NULL},
{SR_CONF_HORIZ_TRIGGERPOS, SR_T_FLOAT, "horiz_triggerpos",
"Horizontal trigger position", NULL},
"Buffer size", NULL},
{SR_CONF_TIMEBASE, SR_T_RATIONAL_PERIOD, "timebase",
"Time base", NULL},
- {SR_CONF_FILTER, SR_T_CHAR, "filter",
+ {SR_CONF_FILTER, SR_T_STRING, "filter",
"Filter targets", NULL},
{SR_CONF_VDIV, SR_T_RATIONAL_VOLT, "vdiv",
"Volts/div", NULL},
- {SR_CONF_COUPLING, SR_T_CHAR, "coupling",
+ {SR_CONF_COUPLING, SR_T_STRING, "coupling",
"Coupling", NULL},
{SR_CONF_DATALOG, SR_T_BOOL, "datalog",
"Datalog", NULL},
- {SR_CONF_SPL_WEIGHT_FREQ, SR_T_CHAR, "spl_weight_freq",
+ {SR_CONF_SPL_WEIGHT_FREQ, SR_T_STRING, "spl_weight_freq",
"Sound pressure level frequency weighting", NULL},
- {SR_CONF_SPL_WEIGHT_TIME, SR_T_CHAR, "spl_weight_time",
+ {SR_CONF_SPL_WEIGHT_TIME, SR_T_STRING, "spl_weight_time",
"Sound pressure level time weighting", NULL},
{SR_CONF_HOLD_MAX, SR_T_BOOL, "hold_max",
"Hold max", NULL},
"Voltage threshold", NULL },
{SR_CONF_POWER_OFF, SR_T_BOOL, "power_off",
"Power off", NULL},
- {SR_CONF_DATA_SOURCE, SR_T_CHAR, "data_source",
+ {SR_CONF_DATA_SOURCE, SR_T_STRING, "data_source",
"Data source", NULL},
- {SR_CONF_NUM_LOGIC_PROBES, SR_T_INT32, "logic_probes",
- "Number of logic probes", NULL},
- {SR_CONF_NUM_ANALOG_PROBES, SR_T_INT32, "analog_probes",
- "Number of analog probes", NULL},
+ {SR_CONF_NUM_LOGIC_CHANNELS, SR_T_INT32, "logic_channels",
+ "Number of logic channels", NULL},
+ {SR_CONF_NUM_ANALOG_CHANNELS, SR_T_INT32, "analog_channels",
+ "Number of analog channels", NULL},
{SR_CONF_OUTPUT_VOLTAGE, SR_T_FLOAT, "output_voltage",
"Current output voltage", NULL},
{SR_CONF_OUTPUT_VOLTAGE_MAX, SR_T_FLOAT, "output_voltage_max",
"Maximum output current", NULL},
{SR_CONF_OUTPUT_ENABLED, SR_T_BOOL, "output_enabled",
"Output enabled", NULL},
- {SR_CONF_OUTPUT_CHANNEL, SR_T_CHAR, "output_channel",
+ {SR_CONF_OUTPUT_CHANNEL, SR_T_STRING, "output_channel",
"Output channel modes", NULL},
{SR_CONF_OVER_VOLTAGE_PROTECTION, SR_T_BOOL, "ovp",
"Over-voltage protection", NULL},
"Over-current protection", NULL},
{SR_CONF_LIMIT_SAMPLES, SR_T_UINT64, "limit_samples",
"Sample limit", NULL},
- {SR_CONF_CLOCK_EDGE, SR_T_CHAR, "clock_edge",
+ {SR_CONF_CLOCK_EDGE, SR_T_STRING, "clock_edge",
"Clock edge", NULL},
{0, 0, NULL, NULL, NULL},
};
#ifdef HAVE_HW_ATTEN_PPS3XXX
extern SR_PRIV struct sr_dev_driver atten_pps3203_driver_info;
#endif
+#ifdef HAVE_HW_BRYMEN_BM86X
+extern SR_PRIV struct sr_dev_driver brymen_bm86x_driver_info;
+#endif
#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
+#ifdef HAVE_HW_CONRAD_DIGI_35_CPU
+extern SR_PRIV struct sr_dev_driver conrad_digi_35_cpu_driver_info;
+#endif
#ifdef HAVE_HW_DEMO
extern SR_PRIV struct sr_dev_driver demo_driver_info;
#endif
#ifdef HAVE_HW_GMC_MH_1X_2X
extern SR_PRIV struct sr_dev_driver gmc_mh_1x_2x_rs232_driver_info;
+extern SR_PRIV struct sr_dev_driver gmc_mh_2x_bd232_driver_info;
#endif
#ifdef HAVE_HW_HAMEG_HMO
extern SR_PRIV struct sr_dev_driver hameg_hmo_driver_info;
#ifdef HAVE_HW_LASCAR_EL_USB
extern SR_PRIV struct sr_dev_driver lascar_el_usb_driver_info;
#endif
+#ifdef HAVE_HW_MANSON_HCS_3XXX
+extern SR_PRIV struct sr_dev_driver manson_hcs_3xxx_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_MOTECH_LPS_30X
+extern SR_PRIV struct sr_dev_driver motech_lps_301_driver_info;
+#endif
#ifdef HAVE_HW_NORMA_DMM
extern SR_PRIV struct sr_dev_driver norma_dmm_driver_info;
+extern SR_PRIV struct sr_dev_driver siemens_b102x_driver_info;
#endif
#ifdef HAVE_HW_OLS
extern SR_PRIV struct sr_dev_driver ols_driver_info;
#ifdef HAVE_HW_TELEINFO
extern SR_PRIV struct sr_dev_driver teleinfo_driver_info;
#endif
+#ifdef HAVE_HW_TESTO
+extern SR_PRIV struct sr_dev_driver testo_driver_info;
+#endif
#ifdef HAVE_HW_TONDAJ_SL_814
extern SR_PRIV struct sr_dev_driver tondaj_sl_814_driver_info;
#endif
#ifdef HAVE_HW_ASIX_SIGMA
extern SR_PRIV struct sr_dev_driver asix_sigma_driver_info;
#endif
-#ifdef HAVE_HW_CHRONOVU_LA8
-extern SR_PRIV struct sr_dev_driver chronovu_la8_driver_info;
+#ifdef HAVE_HW_CHRONOVU_LA
+extern SR_PRIV struct sr_dev_driver chronovu_la_driver_info;
#endif
#ifdef HAVE_HW_LINK_MSO19
extern SR_PRIV struct sr_dev_driver link_mso19_driver_info;
#endif
-#ifdef HAVE_HW_ALSA
-extern SR_PRIV struct sr_dev_driver alsa_driver_info;
-#endif
#ifdef HAVE_HW_FX2LAFW
extern SR_PRIV struct sr_dev_driver fx2lafw_driver_info;
#endif
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_m3650cr_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_me42_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;
#ifdef HAVE_HW_ATTEN_PPS3XXX
&atten_pps3203_driver_info,
#endif
+#ifdef HAVE_HW_BRYMEN_BM86X
+ &brymen_bm86x_driver_info,
+#endif
#ifdef HAVE_HW_BRYMEN_DMM
&brymen_bm857_driver_info,
#endif
#ifdef HAVE_HW_COLEAD_SLM
&colead_slm_driver_info,
#endif
+#ifdef HAVE_HW_CONRAD_DIGI_35_CPU
+ &conrad_digi_35_cpu_driver_info,
+#endif
#ifdef HAVE_HW_DEMO
&demo_driver_info,
#endif
#ifdef HAVE_HW_GMC_MH_1X_2X
&gmc_mh_1x_2x_rs232_driver_info,
+ &gmc_mh_2x_bd232_driver_info,
#endif
#ifdef HAVE_HW_HAMEG_HMO
&hameg_hmo_driver_info,
#ifdef HAVE_HW_LASCAR_EL_USB
&lascar_el_usb_driver_info,
#endif
+#ifdef HAVE_HW_MANSON_HCS_3XXX
+ &manson_hcs_3xxx_driver_info,
+#endif
#ifdef HAVE_HW_MIC_985XX
&mic_98581_driver_info,
&mic_98583_driver_info,
#endif
+#ifdef HAVE_HW_MOTECH_LPS_30X
+ &motech_lps_301_driver_info,
+#endif
#ifdef HAVE_HW_NORMA_DMM
&norma_dmm_driver_info,
+ &siemens_b102x_driver_info,
#endif
#ifdef HAVE_HW_OLS
&ols_driver_info,
#ifdef HAVE_HW_TELEINFO
&teleinfo_driver_info,
#endif
+#ifdef HAVE_HW_TESTO
+ &testo_driver_info,
+#endif
#ifdef HAVE_HW_TONDAJ_SL_814
&tondaj_sl_814_driver_info,
#endif
#ifdef HAVE_HW_ASIX_SIGMA
&asix_sigma_driver_info,
#endif
-#ifdef HAVE_HW_CHRONOVU_LA8
- &chronovu_la8_driver_info,
+#ifdef HAVE_HW_CHRONOVU_LA
+ &chronovu_la_driver_info,
#endif
#ifdef HAVE_HW_LINK_MSO19
&link_mso19_driver_info,
#endif
-#ifdef HAVE_HW_ALSA
- &alsa_driver_info,
-#endif
#ifdef HAVE_HW_FX2LAFW
&fx2lafw_driver_info,
#endif
&radioshack_22_805_driver_info,
&radioshack_22_812_driver_info,
&tecpel_dmm_8061_ser_driver_info,
+ &voltcraft_m3650cr_driver_info,
&voltcraft_m3650d_driver_info,
&voltcraft_m4650cr_driver_info,
+ &voltcraft_me42_driver_info,
&voltcraft_vc820_ser_driver_info,
&voltcraft_vc830_ser_driver_info,
&voltcraft_vc840_ser_driver_info,
* Return the list of supported hardware drivers.
*
* @return Pointer to the NULL-terminated list of hardware driver pointers.
+ *
+ * @since 0.1.0
*/
SR_API struct sr_dev_driver **sr_driver_list(void)
{
* @retval SR_ERR_ARG Invalid parameter(s).
* @retval SR_ERR_BUG Internal errors.
* @retval other Another negative error code upon other errors.
+ *
+ * @since 0.2.0
*/
SR_API int sr_driver_init(struct sr_context *ctx, struct sr_dev_driver *driver)
{
* 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.
+ *
+ * @since 0.2.0
*/
SR_API GSList *sr_driver_scan(struct sr_dev_driver *driver, GSList *options)
{
* @param[in] sdi (optional) If the key is specific to a device, this must
* contain a pointer to the struct sr_dev_inst to be checked.
* Otherwise it must be NULL.
- * @param[in] probe_group The probe group on the device for which to list the
+ * @param[in] cg The channel group on the device for which to list the
* values, or NULL.
* @param[in] key The configuration key (SR_CONF_*).
* @param[in,out] data Pointer to a GVariant where the value will be stored.
* @retval SR_ERR_ARG The driver doesn't know that key, but this is not to be
* interpreted as an error by the caller; merely as an indication
* that it's not applicable.
+ *
+ * @since 0.3.0
*/
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,
+ const struct sr_channel_group *cg,
int key, GVariant **data)
{
int ret;
if (!driver->config_get)
return SR_ERR_ARG;
- if ((ret = driver->config_get(key, data, sdi, probe_group)) == SR_OK) {
+ if ((ret = driver->config_get(key, data, sdi, cg)) == 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);
* Set value of a configuration key in a device instance.
*
* @param[in] sdi The device instance.
- * @param[in] probe_group The probe group on the device for which to list the
+ * @param[in] cg The channel group on the device for which to list the
* values, or NULL.
* @param[in] key The configuration key (SR_CONF_*).
* @param data The new value for the key, as a GVariant with GVariantType
* @retval SR_ERR_ARG The driver doesn't know that key, but this is not to be
* interpreted as an error by the caller; merely as an indication
* that it's not applicable.
+ *
+ * @since 0.3.0
*/
SR_API int sr_config_set(const struct sr_dev_inst *sdi,
- const struct sr_probe_group *probe_group,
+ const struct sr_channel_group *cg,
int key, GVariant *data)
{
int ret;
else if (!sdi->driver->config_set)
ret = SR_ERR_ARG;
else
- ret = sdi->driver->config_set(key, data, sdi, probe_group);
+ ret = sdi->driver->config_set(key, data, sdi, cg);
g_variant_unref(data);
* @param sdi The device instance.
*
* @return SR_OK upon success or SR_ERR in case of error.
+ *
+ * @since 0.3.0
*/
SR_API int sr_config_commit(const struct sr_dev_inst *sdi)
{
* @param[in] driver The sr_dev_driver struct to query.
* @param[in] sdi (optional) If the key is specific to a device, this must
* contain a pointer to the struct sr_dev_inst to be checked.
- * @param[in] probe_group The probe group on the device for which to list the
+ * @param[in] cg The channel group on the device for which to list the
* values, or NULL.
* @param[in] key The configuration key (SR_CONF_*).
* @param[in,out] data A pointer to a GVariant where the list will be stored.
* @retval SR_ERR_ARG The driver doesn't know that key, but this is not to be
* interpreted as an error by the caller; merely as an indication
* that it's not applicable.
+ *
+ * @since 0.3.0
*/
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,
+ const struct sr_channel_group *cg,
int key, GVariant **data)
{
int ret;
ret = SR_ERR;
else if (!driver->config_list)
ret = SR_ERR_ARG;
- else if ((ret = driver->config_list(key, data, sdi, probe_group)) == SR_OK)
+ else if ((ret = driver->config_list(key, data, sdi, cg)) == SR_OK)
g_variant_ref_sink(*data);
return ret;
*
* @return A pointer to a struct sr_config_info, or NULL if the key
* was not found.
+ *
+ * @since 0.2.0
*/
SR_API const struct sr_config_info *sr_config_info_get(int key)
{
*
* @return A pointer to a struct sr_config_info, or NULL if the key
* was not found.
+ *
+ * @since 0.2.0
*/
SR_API const struct sr_config_info *sr_config_info_name_get(const char *optname)
{
* @see sr_session_source_add()
*/
SR_PRIV int sr_source_add(int fd, int events, int timeout,
- sr_receive_data_callback_t cb, void *cb_data)
+ sr_receive_data_callback cb, void *cb_data)
{
return sr_session_source_add(fd, events, timeout, cb, cb_data);
}