BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
libsigrok/hwdriver.c

783 lines
23 KiB
C
Raw Normal View History

Start of code base layout restructuring.
2010-04-02 18:18:27 +00:00
/*
GPL headers: Use correct project name.
2013-04-23 20:24:30 +00:00
* This file is part of the libsigrok project.
Start of code base layout restructuring.
2010-04-02 18:18:27 +00:00
*
Bump copyright year
2013-03-24 10:21:00 +00:00
* Copyright (C) 2013 Bert Vermeulen <bert@biot.com>
Start of code base layout restructuring.
2010-04-02 18:18:27 +00:00
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <stdlib.h>
#include <stdio.h>
#include <sys/types.h>
#include <dirent.h>
#include <string.h>
#include <glib.h>
config.h usage cleanups. - Drop config.h #include from files that don't actually use any of its contents (at the moment). - Add comment for those that do need it.
2012-10-23 22:41:21 +00:00
#include "config.h" /* Needed for HAVE_LIBUSB_1_0 and others. */
sr: moved sigrok.h so libsigrok/libsigrok.h All frontends will have to include <libsigrok/libsigrok.h> from now on. This header includes proto.h and version.h, both installed from the distribution into $INCLUDE/libsigrok/ as well. The only dynamically changed header is now version.h, which has both libsigrok and libtool compile-time versions in it.
2012-07-04 22:55:07 +00:00
#include "libsigrok.h"
#include "libsigrok-internal.h"
Start of code base layout restructuring.
2010-04-02 18:18:27 +00:00
Centralise duplicated logging helper defines.
2013-12-23 03:38:35 +00:00
#define LOG_PREFIX "hwdriver"
hwdriver: Use message logging helpers.
2013-01-29 11:55:00 +00:00
Doxygen: Add @file items for the relevant files. These short descriptions are shown in the "Files" section of the Doxygen output.
2012-10-21 22:30:12 +00:00
/**
* @file
*
* Hardware driver handling in libsigrok.
*/
Doxygen: Initial groups and topic short descriptions.
2012-10-21 14:13:36 +00:00
/**
* @defgroup grp_driver Hardware drivers
*
* Hardware driver handling in libsigrok.
*
* @{
*/
sr: split driver options into separate list
2012-07-12 18:54:45 +00:00
Unify all SR_HWOPT_* and SR_HWCAP_* enums. Only two functions remain for accessing meta info on the keys: sr_config_info_get() and sr_config_info_name_get().
2013-01-21 20:58:19 +00:00
static struct sr_config_info sr_config_info_data[] = {
Rename SR_HWOPT_* and SR_HWCAP_* to SR_CONF_*
2013-01-21 22:22:47 +00:00
{SR_CONF_CONN, SR_T_CHAR, "conn",
Use new struct sr_config_info for option metadata
2013-01-20 15:35:25 +00:00
"Connection", NULL},
Rename SR_HWOPT_* and SR_HWCAP_* to SR_CONF_*
2013-01-21 22:22:47 +00:00
{SR_CONF_SERIALCOMM, SR_T_CHAR, "serialcomm",
Use new struct sr_config_info for option metadata
2013-01-20 15:35:25 +00:00
"Serial communication", NULL},
Rename SR_HWOPT_* and SR_HWCAP_* to SR_CONF_*
2013-01-21 22:22:47 +00:00
{SR_CONF_SAMPLERATE, SR_T_UINT64, "samplerate",
Use new struct sr_config_info for option metadata
2013-01-20 15:35:25 +00:00
"Sample rate", NULL},
Rename SR_HWOPT_* and SR_HWCAP_* to SR_CONF_*
2013-01-21 22:22:47 +00:00
{SR_CONF_CAPTURE_RATIO, SR_T_UINT64, "captureratio",
Use new struct sr_config_info for option metadata
2013-01-20 15:35:25 +00:00
"Pre-trigger capture ratio", NULL},
Rename SR_HWOPT_* and SR_HWCAP_* to SR_CONF_*
2013-01-21 22:22:47 +00:00
{SR_CONF_PATTERN_MODE, SR_T_CHAR, "pattern",
demo: Bring analog square wave amplitude into line with other patterns.
2014-01-15 00:51:04 +00:00
"Pattern", NULL},
Add SR_CONF_TRIGGER_TYPE config_info list
2013-03-25 19:29:45 +00:00
{SR_CONF_TRIGGER_TYPE, SR_T_CHAR, "triggertype",
"Trigger types", NULL},
ols: add external clock support Add external clock support that allows you to use the tracing targets bus clock line for sampling. Signed-off-by: Matt Ranostay <mranostay@gmail.com>
2013-08-25 05:01:15 +00:00
{SR_CONF_EXTERNAL_CLOCK, SR_T_BOOL, "external_clock",
"External clock mode", NULL},
ols: add swap channels feature Allow channel groups to be swapped. This is useful for demux at 200mhz with the unbuffered channels. Signed-off-by: Matt Ranostay <mranostay@gmail.com>
2013-08-28 04:19:56 +00:00
{SR_CONF_SWAP, SR_T_BOOL, "swap",
"Swap channel order", NULL},
Rename SR_HWOPT_* and SR_HWCAP_* to SR_CONF_*
2013-01-21 22:22:47 +00:00
{SR_CONF_RLE, SR_T_BOOL, "rle",
Use new struct sr_config_info for option metadata
2013-01-20 15:35:25 +00:00
"Run Length Encoding", NULL},
hwdriver: Change TRIGGER_SLOPE setting to string type. Drivers interpreted the uint64 values to the SR_CONF_TRIGGER_SLOPE configuration setting in different ways. In order to orthogonalize the API, change the type of the setting to a string with the same format as uses for logic probes.
2014-01-26 23:22:01 +00:00
{SR_CONF_TRIGGER_SLOPE, SR_T_CHAR, "triggerslope",
Use new struct sr_config_info for option metadata
2013-01-20 15:35:25 +00:00
"Trigger slope", NULL},
Rename SR_HWOPT_* and SR_HWCAP_* to SR_CONF_*
2013-01-21 22:22:47 +00:00
{SR_CONF_TRIGGER_SOURCE, SR_T_CHAR, "triggersource",
Use new struct sr_config_info for option metadata
2013-01-20 15:35:25 +00:00
"Trigger source", NULL},
Rename SR_HWOPT_* and SR_HWCAP_* to SR_CONF_*
2013-01-21 22:22:47 +00:00
{SR_CONF_HORIZ_TRIGGERPOS, SR_T_FLOAT, "horiz_triggerpos",
Use new struct sr_config_info for option metadata
2013-01-20 15:35:25 +00:00
"Horizontal trigger position", NULL},
Rename SR_HWOPT_* and SR_HWCAP_* to SR_CONF_*
2013-01-21 22:22:47 +00:00
{SR_CONF_BUFFERSIZE, SR_T_UINT64, "buffersize",
Use new struct sr_config_info for option metadata
2013-01-20 15:35:25 +00:00
"Buffer size", NULL},
Rename SR_HWOPT_* and SR_HWCAP_* to SR_CONF_*
2013-01-21 22:22:47 +00:00
{SR_CONF_TIMEBASE, SR_T_RATIONAL_PERIOD, "timebase",
Use new struct sr_config_info for option metadata
2013-01-20 15:35:25 +00:00
"Time base", NULL},
Rename SR_HWOPT_* and SR_HWCAP_* to SR_CONF_*
2013-01-21 22:22:47 +00:00
{SR_CONF_FILTER, SR_T_CHAR, "filter",
Use new struct sr_config_info for option metadata
2013-01-20 15:35:25 +00:00
"Filter targets", NULL},
Rename SR_HWOPT_* and SR_HWCAP_* to SR_CONF_*
2013-01-21 22:22:47 +00:00
{SR_CONF_VDIV, SR_T_RATIONAL_VOLT, "vdiv",
Use new struct sr_config_info for option metadata
2013-01-20 15:35:25 +00:00
"Volts/div", NULL},
Rename SR_HWOPT_* and SR_HWCAP_* to SR_CONF_*
2013-01-21 22:22:47 +00:00
{SR_CONF_COUPLING, SR_T_CHAR, "coupling",
Use new struct sr_config_info for option metadata
2013-01-20 15:35:25 +00:00
"Coupling", NULL},
add SR_CONF_DATALOG
2013-03-11 15:35:18 +00:00
{SR_CONF_DATALOG, SR_T_BOOL, "datalog",
"Datalog", NULL},
Add SR_CONF keys for sound pressure level time and frequency weighting
2013-06-15 10:09:31 +00:00
{SR_CONF_SPL_WEIGHT_FREQ, SR_T_CHAR, "spl_weight_freq",
"Sound pressure level frequency weighting", NULL},
{SR_CONF_SPL_WEIGHT_TIME, SR_T_CHAR, "spl_weight_time",
"Sound pressure level time weighting", NULL},
Add SR_CONF keys for max/min hold modes
2013-06-16 10:12:20 +00:00
{SR_CONF_HOLD_MAX, SR_T_BOOL, "hold_max",
"Hold max", NULL},
{SR_CONF_HOLD_MIN, SR_T_BOOL, "hold_min",
"Hold min", NULL},
Add SR_CONF key for sound pressure level measurement range
2013-06-16 23:25:41 +00:00
{SR_CONF_SPL_MEASUREMENT_RANGE, SR_T_UINT64_RANGE, "spl_meas_range",
"Sound pressure level measurement range", NULL},
saleae-logic16: Add voltage threshold conf.
2013-08-04 14:20:07 +00:00
{SR_CONF_VOLTAGE_THRESHOLD, SR_T_DOUBLE_RANGE, "voltage_threshold",
"Voltage threshold", NULL },
Add SR_CONF key for powering off a device
2013-06-17 09:54:37 +00:00
{SR_CONF_POWER_OFF, SR_T_BOOL, "power_off",
"Power off", NULL},
Add SR_CONF key for data source
2013-06-19 10:18:00 +00:00
{SR_CONF_DATA_SOURCE, SR_T_CHAR, "data_source",
"Data source", NULL},
A few more random 'probe' to 'channel' changes. This fixes parts of bug #259.
2014-03-24 15:11:45 +00:00
{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},
Add config keys for programmable power supplies.
2014-01-08 20:15:45 +00:00
{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 voltage", NULL},
{SR_CONF_OUTPUT_CURRENT, SR_T_FLOAT, "output_current",
"Current output current", NULL},
{SR_CONF_OUTPUT_CURRENT_MAX, SR_T_FLOAT, "output_current_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",
"Output channel modes", NULL},
{SR_CONF_OVER_VOLTAGE_PROTECTION, SR_T_BOOL, "ovp",
"Over-voltage protection", NULL},
{SR_CONF_OVER_CURRENT_PROTECTION, SR_T_BOOL, "ocp",
"Over-current protection", NULL},
Remove SR_CONF_MAX_UNCOMPRESSED_SAMPLES again. The maximum sample size that can be set on a device is now published by sr_config_list(SR_CONF_LIMIT_SAMPLES). This returns a tuple of uint64_t representing minimum and maximum number of samples.
2014-01-19 16:18:59 +00:00
{SR_CONF_LIMIT_SAMPLES, SR_T_UINT64, "limit_samples",
"Sample limit", NULL},
hwdriver: Add SR_CONF_CLOCK_EDGE option. Allow the edge of an external clock input to be configured by means of an SR_CONF_CLOCK_EDGE configuration setting. This is a string option with the same format as SR_CONF_TRIGGER_SLOPE.
2014-01-29 19:53:51 +00:00
{SR_CONF_CLOCK_EDGE, SR_T_CHAR, "clock_edge",
"Clock edge", NULL},
Use new struct sr_config_info for option metadata
2013-01-20 15:35:25 +00:00
{0, 0, NULL, NULL, NULL},
Start of code base layout restructuring.
2010-04-02 18:18:27 +00:00
};
Doxygen: Mark non-public stuff for exclusion. - /** @private */ can be used for functions, and /** @cond PRIVATE */ and /** @endcond */ for variables or #defines. - Document the above in HACKING.
2012-10-19 08:07:22 +00:00
/** @cond PRIVATE */
appa-55ii: Initial driver skeleton.
2013-12-01 00:13:44 +00:00
#ifdef HAVE_HW_APPA_55II
extern SR_PRIV struct sr_dev_driver appa_55ii_driver_info;
#endif
atten-pps3xxx: Initial driver skeleton.
2014-01-05 12:12:01 +00:00
#ifdef HAVE_HW_ATTEN_PPS3XXX
atten-pps3xxx: Full support for the PPS3203T-3S.
2014-01-08 20:18:19 +00:00
extern SR_PRIV struct sr_dev_driver atten_pps3203_driver_info;
atten-pps3xxx: Initial driver skeleton.
2014-01-05 12:12:01 +00:00
#endif
brymen-bm86x: Initial driver skeleton.
2014-02-08 21:40:36 +00:00
#ifdef HAVE_HW_BRYMEN_BM86X
extern SR_PRIV struct sr_dev_driver brymen_bm86x_driver_info;
#endif
brymen-dmm: Initial driver skeleton.
2012-11-22 03:20:39 +00:00
#ifdef HAVE_HW_BRYMEN_DMM
brymen-dmm: Cosmetics, coding-style, consistency. Also, name the driver "brymen-bm857" in preparation to doing "subdrivers" for other Brymen models later (similar to serial-dmm).
2013-02-02 10:35:20 +00:00
extern SR_PRIV struct sr_dev_driver brymen_bm857_driver_info;
brymen-dmm: Initial driver skeleton.
2012-11-22 03:20:39 +00:00
#endif
cem-dt-885x: Initial driver skeleton.
2013-06-07 23:12:10 +00:00
#ifdef HAVE_HW_CEM_DT_885X
extern SR_PRIV struct sr_dev_driver cem_dt_885x_driver_info;
#endif
center-3xx: Initial driver skeleton.
2013-07-19 07:35:48 +00:00
#ifdef HAVE_HW_CENTER_3XX
center-3xx: Initial Center 309 / Voltcraft K204 support.
2013-07-22 17:48:15 +00:00
extern SR_PRIV struct sr_dev_driver center_309_driver_info;
extern SR_PRIV struct sr_dev_driver voltcraft_k204_driver_info;
center-3xx: Initial driver skeleton.
2013-07-19 07:35:48 +00:00
#endif
colead-slm: Initial driver skeleton.
2012-10-29 21:33:47 +00:00
#ifdef HAVE_HW_COLEAD_SLM
extern SR_PRIV struct sr_dev_driver colead_slm_driver_info;
#endif
conrad-digi-35-cpu: Initial driver framework.
2014-02-05 18:50:46 +00:00
#ifdef HAVE_HW_CONRAD_DIGI_35_CPU
extern SR_PRIV struct sr_dev_driver conrad_digi_35_cpu_driver_info;
#endif
Use consistent HW_ name prefixes everywhere. Older drivers used LA_* previously, we now use HW_* everywhere though.
2013-05-08 17:33:30 +00:00
#ifdef HAVE_HW_DEMO
sr/cli/gtk/qt/: s/plugin/driver/.
2012-02-28 22:52:30 +00:00
extern SR_PRIV struct sr_dev_driver demo_driver_info;
configure: Add --enable-demo option.
2011-01-11 21:17:33 +00:00
#endif
gmc_mh_1x_2x: Inital driver skeleton.
2013-11-19 16:49:23 +00:00
#ifdef HAVE_HW_GMC_MH_1X_2X
extern SR_PRIV struct sr_dev_driver gmc_mh_1x_2x_rs232_driver_info;
gmc-mh-1x-2x: Added new driver gmc-mh-2x-bd232.
2014-02-05 13:59:02 +00:00
extern SR_PRIV struct sr_dev_driver gmc_mh_2x_bd232_driver_info;
gmc_mh_1x_2x: Inital driver skeleton.
2013-11-19 16:49:23 +00:00
#endif
hameg-hmo: Initial driver skeleton.
2013-10-15 18:45:14 +00:00
#ifdef HAVE_HW_HAMEG_HMO
extern SR_PRIV struct sr_dev_driver hameg_hmo_driver_info;
#endif
ikalogic-scanalogic2: Initial driver skeleton.
2013-06-07 18:34:40 +00:00
#ifdef HAVE_HW_IKALOGIC_SCANALOGIC2
extern SR_PRIV struct sr_dev_driver ikalogic_scanalogic2_driver_info;
#endif
ikalogic-scanaplus: Initial driver skeleton.
2013-06-21 15:15:10 +00:00
#ifdef HAVE_HW_IKALOGIC_SCANAPLUS
extern SR_PRIV struct sr_dev_driver ikalogic_scanaplus_driver_info;
Fix build
2013-07-16 15:18:20 +00:00
#endif
kecheng-kc-330b: Initial driver skeleton.
2013-06-20 19:31:31 +00:00
#ifdef HAVE_HW_KECHENG_KC_330B
extern SR_PRIV struct sr_dev_driver kecheng_kc_330b_driver_info;
ikalogic-scanaplus: Initial driver skeleton.
2013-06-21 15:15:10 +00:00
#endif
lascar-el-usb: Initial driver skeleton.
2012-11-27 16:40:14 +00:00
#ifdef HAVE_HW_LASCAR_EL_USB
extern SR_PRIV struct sr_dev_driver lascar_el_usb_driver_info;
#endif
mic-985xx: Initial driver skeleton.
2013-01-30 15:58:01 +00:00
#ifdef HAVE_HW_MIC_985XX
mic-985xx: Add support for the MIC 98581. This device only supports temperature measurements, no humidity.
2013-02-09 15:13:03 +00:00
extern SR_PRIV struct sr_dev_driver mic_98581_driver_info;
Initial driver implementation for MIC 98583. This is a USB/serial (Prolific) based temperature and humidity logger.
2013-01-30 17:21:07 +00:00
extern SR_PRIV struct sr_dev_driver mic_98583_driver_info;
mic-985xx: Initial driver skeleton.
2013-01-30 15:58:01 +00:00
#endif
norma dmm: Initial driver skeleton.
2013-10-17 08:57:17 +00:00
#ifdef HAVE_HW_NORMA_DMM
extern SR_PRIV struct sr_dev_driver norma_dmm_driver_info;
#endif
Use consistent HW_ name prefixes everywhere. Older drivers used LA_* previously, we now use HW_* everywhere though.
2013-05-08 17:33:30 +00:00
#ifdef HAVE_HW_OLS
sr/cli/gtk/qt/: s/plugin/driver/.
2012-02-28 22:52:30 +00:00
extern SR_PRIV struct sr_dev_driver ols_driver_info;
Only build hardware plugins if requested by user. Per default all plugins will be built, though. The user can override this via the --disable-la-xxxx options.
2010-06-24 23:11:11 +00:00
#endif
Rename rigol-ds1xx2 driver to rigol-ds.
2013-10-31 17:31:39 +00:00
#ifdef HAVE_HW_RIGOL_DS
extern SR_PRIV struct sr_dev_driver rigol_ds_driver_info;
rigol-ds1xx2: Initial driver skeleton.
2012-12-29 21:22:10 +00:00
#endif
saleae-logic16: Initial driver skeleton.
2013-07-21 10:30:32 +00:00
#ifdef HAVE_HW_SALEAE_LOGIC16
extern SR_PRIV struct sr_dev_driver saleae_logic16_driver_info;
#endif
sysclk-lwla: Initial driver skeleton.
2014-01-13 21:49:55 +00:00
#ifdef HAVE_HW_SYSCLK_LWLA
extern SR_PRIV struct sr_dev_driver sysclk_lwla_driver_info;
#endif
teleinfo: Initial driver skeleton.
2013-09-23 20:02:02 +00:00
#ifdef HAVE_HW_TELEINFO
extern SR_PRIV struct sr_dev_driver teleinfo_driver_info;
#endif
tondaj-sl-814: Initial driver skeleton.
2012-11-09 02:33:05 +00:00
#ifdef HAVE_HW_TONDAJ_SL_814
extern SR_PRIV struct sr_dev_driver tondaj_sl_814_driver_info;
#endif
uni-t-ut32x: Initial driver skeleton.
2013-08-08 22:29:04 +00:00
#ifdef HAVE_HW_UNI_T_UT32X
extern SR_PRIV struct sr_dev_driver uni_t_ut32x_driver_info;
#endif
victor-dmm: Initial driver skeleton.
2012-11-02 19:47:06 +00:00
#ifdef HAVE_HW_VICTOR_DMM
extern SR_PRIV struct sr_dev_driver victor_dmm_driver_info;
#endif
Use consistent HW_ name prefixes everywhere. Older drivers used LA_* previously, we now use HW_* everywhere though.
2013-05-08 17:33:30 +00:00
#ifdef HAVE_HW_ZEROPLUS_LOGIC_CUBE
sr/cli/gtk/qt/: s/plugin/driver/.
2012-02-28 22:52:30 +00:00
extern SR_PRIV struct sr_dev_driver zeroplus_logic_cube_driver_info;
Only build hardware plugins if requested by user. Per default all plugins will be built, though. The user can override this via the --disable-la-xxxx options.
2010-06-24 23:11:11 +00:00
#endif
Use consistent HW_ name prefixes everywhere. Older drivers used LA_* previously, we now use HW_* everywhere though.
2013-05-08 17:33:30 +00:00
#ifdef HAVE_HW_ASIX_SIGMA
sr/cli/gtk/qt/: s/plugin/driver/.
2012-02-28 22:52:30 +00:00
extern SR_PRIV struct sr_dev_driver asix_sigma_driver_info;
Add per-LA --enable-XXXX configure options.
2010-05-31 09:34:10 +00:00
#endif
Rename 'chronovu-la8' driver to 'chronovu-la'. The driver now also supports the LA16 device (and possibly others in the future).
2014-04-01 19:47:11 +00:00
#ifdef HAVE_HW_CHRONOVU_LA
extern SR_PRIV struct sr_dev_driver chronovu_la_driver_info;
Add initial support for the ChronoVu LA8.
2011-04-04 17:40:30 +00:00
#endif
Use consistent HW_ name prefixes everywhere. Older drivers used LA_* previously, we now use HW_* everywhere though.
2013-05-08 17:33:30 +00:00
#ifdef HAVE_HW_LINK_MSO19
Re-enable link-mso19 and nexus-osciprime drivers.
2013-05-08 14:40:45 +00:00
extern SR_PRIV struct sr_dev_driver link_mso19_driver_info;
#endif
alsa: Update to latest APIs/conventions. The alsa driver was out of date wrt APIs and libsigrok conventions in general, and wasn't compiling. This fixes the compile and updates it to _basically_ work with the current state of analog support in libsigrok. This is not finished/full support for ALSA analog sampling yet, though, various TODOs remain that will be addressed later.
2012-12-17 18:39:13 +00:00
#ifdef HAVE_HW_ALSA
sr/cli/gtk/qt/: s/plugin/driver/.
2012-02-28 22:52:30 +00:00
extern SR_PRIV struct sr_dev_driver alsa_driver_info;
initial version of alsa plugin. It does NOT work yet.
2011-01-22 02:57:27 +00:00
#endif
Use consistent HW_ name prefixes everywhere. Older drivers used LA_* previously, we now use HW_* everywhere though.
2013-05-08 17:33:30 +00:00
#ifdef HAVE_HW_FX2LAFW
sr/cli/gtk/qt/: s/plugin/driver/.
2012-02-28 22:52:30 +00:00
extern SR_PRIV struct sr_dev_driver fx2lafw_driver_info;
fx2lafw: Added empty hardware module for fx2lafw
2012-02-11 12:08:49 +00:00
#endif
sr: initial support for Hantek 2xxx/5200 USB oscilloscopes
2012-04-22 23:05:58 +00:00
#ifdef HAVE_HW_HANTEK_DSO
sr: hantek-dso: Consistency renames, constification.
2012-05-31 23:12:09 +00:00
extern SR_PRIV struct sr_dev_driver hantek_dso_driver_info;
sr: initial support for Hantek 2xxx/5200 USB oscilloscopes
2012-04-22 23:05:58 +00:00
#endif
sr: mostly finished Agilent DMM driver
2012-09-02 13:11:52 +00:00
#ifdef HAVE_HW_AGILENT_DMM
extern SR_PRIV struct sr_dev_driver agdmm_driver_info;
#endif
fluke-dmm: build fixes
2012-09-15 16:28:43 +00:00
#ifdef HAVE_HW_FLUKE_DMM
extern SR_PRIV struct sr_dev_driver flukedmm_driver_info;
#endif
Rename tekpower-dmm to serial-dmm. This is now a generic driver for multiple DMM "subdrivers" that use simple serial port protocols.
2012-12-01 18:35:19 +00:00
#ifdef HAVE_HW_SERIAL_DMM
serial-dmm: Add BBC Goerz Metrawatt M2110 DMM driver.
2013-12-18 22:37:42 +00:00
extern SR_PRIV struct sr_dev_driver bbcgm_m2110_driver_info;
serial-dmm: Add Digitek DT4000ZC support.
2012-12-01 18:53:05 +00:00
extern SR_PRIV struct sr_dev_driver digitek_dt4000zc_driver_info;
tekpower-dmm: Generalize & first-class TP4000ZC driver. Prepare the tekpower-dmm driver to be able to support various simple serial port based DMMs. Also, make a 'tekpower-tp4000zc' "first-class" driver which is currently the only user of this generic driver.
2012-12-01 18:28:36 +00:00
extern SR_PRIV struct sr_dev_driver tekpower_tp4000zc_driver_info;
serial-dmm: Add Metex ME-31 support.
2012-12-02 13:22:15 +00:00
extern SR_PRIV struct sr_dev_driver metex_me31_driver_info;
serial-dmm: Add PeakTech 3410 support.
2012-12-01 21:45:45 +00:00
extern SR_PRIV struct sr_dev_driver peaktech_3410_driver_info;
serial-dmm: Add MASTECH MAS345 support.
2012-12-01 22:04:00 +00:00
extern SR_PRIV struct sr_dev_driver mastech_mas345_driver_info;
serial-dmm: Add V&A VA18B support.
2012-12-01 22:32:39 +00:00
extern SR_PRIV struct sr_dev_driver va_va18b_driver_info;
Add initial support for the V&A VA40B multimeter.
2014-01-02 00:34:21 +00:00
extern SR_PRIV struct sr_dev_driver va_va40b_driver_info;
serial-dmm: Add Metex M-3640D support.
2012-12-01 23:40:15 +00:00
extern SR_PRIV struct sr_dev_driver metex_m3640d_driver_info;
Add support for the Metex M-4650CR. (the Voltcraft M-4650CR is a rebadged Metex M-4650CR)
2013-10-29 19:31:24 +00:00
extern SR_PRIV struct sr_dev_driver metex_m4650cr_driver_info;
serial-dmm: Add PeakTech 4370 support.
2012-12-02 00:02:16 +00:00
extern SR_PRIV struct sr_dev_driver peaktech_4370_driver_info;
serial-dmm: Add PCE PCE-DM32 support.
2012-12-02 00:32:57 +00:00
extern SR_PRIV struct sr_dev_driver pce_pce_dm32_driver_info;
serial-dmm: Add RadioShack 22-168 support. Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
2012-12-02 15:17:46 +00:00
extern SR_PRIV struct sr_dev_driver radioshack_22_168_driver_info;
serial-dmm: Add support for RadioShack 22-805 Protocol-wise, this is identical to the 22-168, except that it communicates at 600 baud instead of 1200 baud.
2013-03-21 01:36:56 +00:00
extern SR_PRIV struct sr_dev_driver radioshack_22_805_driver_info;
radioshack-dmm: Integrate into serial-dmm Use the infrastructure of serial-dmm to handle the RadioShack 22-812, and completely remove radioshack-dmm. Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
2012-12-02 19:15:21 +00:00
extern SR_PRIV struct sr_dev_driver radioshack_22_812_driver_info;
serial-dmm: Add Tecpel DMM-8061 support.
2013-05-01 01:13:15 +00:00
extern SR_PRIV struct sr_dev_driver tecpel_dmm_8061_ser_driver_info;
serial-dmm: Implemented support for Voltcraft M-3650CR (driver voltcraft-m3650cr).
2014-03-24 20:50:07 +00:00
extern SR_PRIV struct sr_dev_driver voltcraft_m3650cr_driver_info;
added Voltcraft M-3650D Multimeter
2013-06-11 18:35:57 +00:00
extern SR_PRIV struct sr_dev_driver voltcraft_m3650d_driver_info;
Add support for the Voltcraft M-4650CR.
2013-10-29 17:10:10 +00:00
extern SR_PRIV struct sr_dev_driver voltcraft_m4650cr_driver_info;
serial-dmm: Implemented support for Voltcraft ME-42 (driver voltcraft-me42).
2014-03-24 16:42:52 +00:00
extern SR_PRIV struct sr_dev_driver voltcraft_me42_driver_info;
serial-dmm: Add Voltcraft VC-820 (UT-D02) support. This works with the UNI-T UT-D02 (RS232) cable. For the USB/HID based cable (UNI-T UT-D04), the uni-t-dmm driver must be used.
2012-12-16 21:03:28 +00:00
extern SR_PRIV struct sr_dev_driver voltcraft_vc820_ser_driver_info;
serial-dmm: Add support for the Voltcraft VC-830.
2013-06-22 14:48:00 +00:00
extern SR_PRIV struct sr_dev_driver voltcraft_vc830_ser_driver_info;
serial-dmm: Add Voltcraft VC-840 (UT-D02) support. This works with the UNI-T UT-D02 (RS232) cable. For the USB/HID based cable (UNI-T UT-D04), the uni-t-dmm driver must be used. Note: This is untested, but should work just fine for all settings, with the possible exception of temperature (testers needed!)
2012-12-16 21:17:48 +00:00
extern SR_PRIV struct sr_dev_driver voltcraft_vc840_ser_driver_info;
Support for UNI-T UT60A/E multimeters via RS232 or USB
2013-07-05 12:02:50 +00:00
extern SR_PRIV struct sr_dev_driver uni_t_ut60a_ser_driver_info;
extern SR_PRIV struct sr_dev_driver uni_t_ut60e_ser_driver_info;
Add initial support for the UNI-T UT60G.
2014-01-03 21:32:16 +00:00
extern SR_PRIV struct sr_dev_driver uni_t_ut60g_ser_driver_info;
Add support for the UNI-T UT61B multimeter.
2014-01-01 14:25:39 +00:00
extern SR_PRIV struct sr_dev_driver uni_t_ut61b_ser_driver_info;
Add support for the UNI-T UT61C multimeter.
2013-12-29 16:35:51 +00:00
extern SR_PRIV struct sr_dev_driver uni_t_ut61c_ser_driver_info;
serial-dmm: Add support for the UNI-T UT61D. This DMM is already supported via the uni-t-dmm driver when using the USB/HID cable. The serial-dmm support makes it usable with the RS232 cable too.
2013-04-29 18:15:02 +00:00
extern SR_PRIV struct sr_dev_driver uni_t_ut61d_ser_driver_info;
serial-dmm: Add UNI-T UT61E support (UT-D02 cable).
2012-12-26 00:53:50 +00:00
extern SR_PRIV struct sr_dev_driver uni_t_ut61e_ser_driver_info;
ISO-TECH IDM103N: remove the useless -ser postfix
2013-10-10 23:36:52 +00:00
extern SR_PRIV struct sr_dev_driver iso_tech_idm103n_driver_info;
serial-dmm: Support the Tenma 72-7745 via UT-D02 cable. (it was already supported in uni-t-dmm via UT-D04 cable)
2014-01-06 17:08:55 +00:00
extern SR_PRIV struct sr_dev_driver tenma_72_7745_ser_driver_info;
Add support for the Tenma 72-7750 (UNI-T UT60G rebadge).
2014-01-06 16:20:35 +00:00
extern SR_PRIV struct sr_dev_driver tenma_72_7750_ser_driver_info;
Add support for the TekPower TP4000ZC DMM. Also known as Digitek DT4000ZC. Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
2012-10-21 01:39:37 +00:00
#endif
Initial support for UNI-T DMMs. This is not yet fully finished, but works for most use-cases. Tested with a UNI-T UT61D using the UT-D04 USB/HID cable (new version).
2012-10-27 20:41:50 +00:00
#ifdef HAVE_HW_UNI_T_DMM
uni-t-dmm: Add Tecpel DMM-8061 support.
2013-05-01 01:00:08 +00:00
extern SR_PRIV struct sr_dev_driver tecpel_dmm_8061_driver_info;
Support for UNI-T UT60A/E multimeters via RS232 or USB
2013-07-05 12:02:50 +00:00
extern SR_PRIV struct sr_dev_driver uni_t_ut60a_driver_info;
extern SR_PRIV struct sr_dev_driver uni_t_ut60e_driver_info;
Add initial support for the UNI-T UT60G.
2014-01-03 21:32:16 +00:00
extern SR_PRIV struct sr_dev_driver uni_t_ut60g_driver_info;
Add support for the UNI-T UT61B multimeter.
2014-01-01 14:25:39 +00:00
extern SR_PRIV struct sr_dev_driver uni_t_ut61b_driver_info;
Add support for the UNI-T UT61C multimeter.
2013-12-29 16:35:51 +00:00
extern SR_PRIV struct sr_dev_driver uni_t_ut61c_driver_info;
Draft: Make UT61D and VC-820 "first-class" drivers. The 'uni-t-dmm' driver/directory will not appear as a "driver" to frontends anymore, it's just an internal thing. The frontends will see a uni-t-ut61d and voltcraft-vc820 driver now, with the correct names and parsers etc. attached to them. This is not fully finished yet, but it's a start (and works mostly): $ sigrok-cli -D The following devices were found: UNI-T UT61D with 1 probe: P1 Voltcraft VC-820 with 1 probe: P1 $ sigrok-cli --driver voltcraft-vc820 -D The following devices were found: Voltcraft VC-820 with 1 probe: P1 $ sigrok-cli --driver uni-t-ut61d -D The following devices were found: UNI-T UT61D with 1 probe: P1 # Now attaching a UNI-T UT61D device via USB. $ sigrok-cli --driver uni-t-ut61d --samples 3 -O analog P1: -0.017800 V DC P1: -0.017600 V DC P1: -0.017700 V DC # Now attaching a Voltcraft VC-820 device via USB instead. $ sigrok-cli --driver voltcraft-vc820 --samples 3 -O analog P1: -0.319200 V DC P1: -0.319300 V DC P1: -0.319300 V DC
2012-10-30 12:11:27 +00:00
extern SR_PRIV struct sr_dev_driver uni_t_ut61d_driver_info;
uni-t-dmm: Add support for the UNI-T UT61E. This DMM is already supported via the serial-dmm driver when using the RS232 cable. The uni-t-dmm support makes it usable with the USB/HID cable too.
2013-04-29 18:23:21 +00:00
extern SR_PRIV struct sr_dev_driver uni_t_ut61e_driver_info;
Draft: Make UT61D and VC-820 "first-class" drivers. The 'uni-t-dmm' driver/directory will not appear as a "driver" to frontends anymore, it's just an internal thing. The frontends will see a uni-t-ut61d and voltcraft-vc820 driver now, with the correct names and parsers etc. attached to them. This is not fully finished yet, but it's a start (and works mostly): $ sigrok-cli -D The following devices were found: UNI-T UT61D with 1 probe: P1 Voltcraft VC-820 with 1 probe: P1 $ sigrok-cli --driver voltcraft-vc820 -D The following devices were found: Voltcraft VC-820 with 1 probe: P1 $ sigrok-cli --driver uni-t-ut61d -D The following devices were found: UNI-T UT61D with 1 probe: P1 # Now attaching a UNI-T UT61D device via USB. $ sigrok-cli --driver uni-t-ut61d --samples 3 -O analog P1: -0.017800 V DC P1: -0.017600 V DC P1: -0.017700 V DC # Now attaching a Voltcraft VC-820 device via USB instead. $ sigrok-cli --driver voltcraft-vc820 --samples 3 -O analog P1: -0.319200 V DC P1: -0.319300 V DC P1: -0.319300 V DC
2012-10-30 12:11:27 +00:00
extern SR_PRIV struct sr_dev_driver voltcraft_vc820_driver_info;
uni-t-dmm: Add support for the Voltcraft VC-830.
2013-06-22 14:53:13 +00:00
extern SR_PRIV struct sr_dev_driver voltcraft_vc830_driver_info;
uni-t-dmm: Add support for the Voltcraft VC-840. This DMM is already supported via the serial-dmm driver when using the RS232 cable. The uni-t-dmm support makes it usable with the USB/HID cable too.
2013-04-30 18:27:04 +00:00
extern SR_PRIV struct sr_dev_driver voltcraft_vc840_driver_info;
uni-t-dmm: Add support for the Tenma 72-7745. This is a rebadged UNI-T UT60E.
2013-11-23 11:50:33 +00:00
extern SR_PRIV struct sr_dev_driver tenma_72_7745_driver_info;
Add support for the Tenma 72-7750 (UNI-T UT60G rebadge).
2014-01-06 16:20:35 +00:00
extern SR_PRIV struct sr_dev_driver tenma_72_7750_driver_info;
Initial support for UNI-T DMMs. This is not yet fully finished, but works for most use-cases. Tested with a UNI-T UT61D using the UT-D04 USB/HID cable (new version).
2012-10-27 20:41:50 +00:00
#endif
Doxygen: Mark non-public stuff for exclusion. - /** @private */ can be used for functions, and /** @cond PRIVATE */ and /** @endcond */ for variables or #defines. - Document the above in HACKING.
2012-10-19 08:07:22 +00:00
/** @endcond */
initial version of alsa plugin. It does NOT work yet.
2011-01-22 02:57:27 +00:00
sr/cli/gtk/qt/: s/plugin/driver/.
2012-02-28 22:52:30 +00:00
static struct sr_dev_driver *drivers_list[] = {
appa-55ii: Initial driver skeleton.
2013-12-01 00:13:44 +00:00
#ifdef HAVE_HW_APPA_55II
&appa_55ii_driver_info,
#endif
atten-pps3xxx: Initial driver skeleton.
2014-01-05 12:12:01 +00:00
#ifdef HAVE_HW_ATTEN_PPS3XXX
atten-pps3xxx: Full support for the PPS3203T-3S.
2014-01-08 20:18:19 +00:00
&atten_pps3203_driver_info,
atten-pps3xxx: Initial driver skeleton.
2014-01-05 12:12:01 +00:00
#endif
brymen-bm86x: Initial driver skeleton.
2014-02-08 21:40:36 +00:00
#ifdef HAVE_HW_BRYMEN_BM86X
&brymen_bm86x_driver_info,
#endif
brymen-dmm: Initial driver skeleton.
2012-11-22 03:20:39 +00:00
#ifdef HAVE_HW_BRYMEN_DMM
brymen-dmm: Cosmetics, coding-style, consistency. Also, name the driver "brymen-bm857" in preparation to doing "subdrivers" for other Brymen models later (similar to serial-dmm).
2013-02-02 10:35:20 +00:00
&brymen_bm857_driver_info,
brymen-dmm: Initial driver skeleton.
2012-11-22 03:20:39 +00:00
#endif
cem-dt-885x: Initial driver skeleton.
2013-06-07 23:12:10 +00:00
#ifdef HAVE_HW_CEM_DT_885X
&cem_dt_885x_driver_info,
#endif
center-3xx: Initial driver skeleton.
2013-07-19 07:35:48 +00:00
#ifdef HAVE_HW_CENTER_3XX
center-3xx: Initial Center 309 / Voltcraft K204 support.
2013-07-22 17:48:15 +00:00
&center_309_driver_info,
&voltcraft_k204_driver_info,
center-3xx: Initial driver skeleton.
2013-07-19 07:35:48 +00:00
#endif
colead-slm: Initial driver skeleton.
2012-10-29 21:33:47 +00:00
#ifdef HAVE_HW_COLEAD_SLM
&colead_slm_driver_info,
#endif
conrad-digi-35-cpu: Initial driver framework.
2014-02-05 18:50:46 +00:00
#ifdef HAVE_HW_CONRAD_DIGI_35_CPU
&conrad_digi_35_cpu_driver_info,
#endif
Use consistent HW_ name prefixes everywhere. Older drivers used LA_* previously, we now use HW_* everywhere though.
2013-05-08 17:33:30 +00:00
#ifdef HAVE_HW_DEMO
sr/cli/gtk/qt/: s/plugin/driver/.
2012-02-28 22:52:30 +00:00
&demo_driver_info,
configure: Add --enable-demo option.
2011-01-11 21:17:33 +00:00
#endif
gmc_mh_1x_2x: Inital driver skeleton.
2013-11-19 16:49:23 +00:00
#ifdef HAVE_HW_GMC_MH_1X_2X
&gmc_mh_1x_2x_rs232_driver_info,
serial-dmm: Implemented support for Voltcraft M-3650CR (driver voltcraft-m3650cr).
2014-03-24 20:50:07 +00:00
&gmc_mh_2x_bd232_driver_info,
gmc_mh_1x_2x: Inital driver skeleton.
2013-11-19 16:49:23 +00:00
#endif
hameg-hmo: Initial driver skeleton.
2013-10-15 18:45:14 +00:00
#ifdef HAVE_HW_HAMEG_HMO
&hameg_hmo_driver_info,
#endif
ikalogic-scanalogic2: Initial driver skeleton.
2013-06-07 18:34:40 +00:00
#ifdef HAVE_HW_IKALOGIC_SCANALOGIC2
&ikalogic_scanalogic2_driver_info,
#endif
ikalogic-scanaplus: Initial driver skeleton.
2013-06-21 15:15:10 +00:00
#ifdef HAVE_HW_IKALOGIC_SCANAPLUS
&ikalogic_scanaplus_driver_info,
Fix build
2013-07-16 15:18:20 +00:00
#endif
kecheng-kc-330b: Initial driver skeleton.
2013-06-20 19:31:31 +00:00
#ifdef HAVE_HW_KECHENG_KC_330B
&kecheng_kc_330b_driver_info,
ikalogic-scanaplus: Initial driver skeleton.
2013-06-21 15:15:10 +00:00
#endif
lascar-el-usb: Initial driver skeleton.
2012-11-27 16:40:14 +00:00
#ifdef HAVE_HW_LASCAR_EL_USB
&lascar_el_usb_driver_info,
#endif
mic-985xx: Initial driver skeleton.
2013-01-30 15:58:01 +00:00
#ifdef HAVE_HW_MIC_985XX
mic-985xx: Add support for the MIC 98581. This device only supports temperature measurements, no humidity.
2013-02-09 15:13:03 +00:00
&mic_98581_driver_info,
Initial driver implementation for MIC 98583. This is a USB/serial (Prolific) based temperature and humidity logger.
2013-01-30 17:21:07 +00:00
&mic_98583_driver_info,
mic-985xx: Initial driver skeleton.
2013-01-30 15:58:01 +00:00
#endif
norma dmm: Initial driver skeleton.
2013-10-17 08:57:17 +00:00
#ifdef HAVE_HW_NORMA_DMM
&norma_dmm_driver_info,
#endif
Use consistent HW_ name prefixes everywhere. Older drivers used LA_* previously, we now use HW_* everywhere though.
2013-05-08 17:33:30 +00:00
#ifdef HAVE_HW_OLS
sr/cli/gtk/qt/: s/plugin/driver/.
2012-02-28 22:52:30 +00:00
&ols_driver_info,
Only build hardware plugins if requested by user. Per default all plugins will be built, though. The user can override this via the --disable-la-xxxx options.
2010-06-24 23:11:11 +00:00
#endif
Rename rigol-ds1xx2 driver to rigol-ds.
2013-10-31 17:31:39 +00:00
#ifdef HAVE_HW_RIGOL_DS
&rigol_ds_driver_info,
rigol-ds1xx2: Initial driver skeleton.
2012-12-29 21:22:10 +00:00
#endif
saleae-logic16: Initial driver skeleton.
2013-07-21 10:30:32 +00:00
#ifdef HAVE_HW_SALEAE_LOGIC16
&saleae_logic16_driver_info,
#endif
sysclk-lwla: Initial driver skeleton.
2014-01-13 21:49:55 +00:00
#ifdef HAVE_HW_SYSCLK_LWLA
&sysclk_lwla_driver_info,
#endif
teleinfo: Initial driver skeleton.
2013-09-23 20:02:02 +00:00
#ifdef HAVE_HW_TELEINFO
&teleinfo_driver_info,
#endif
tondaj-sl-814: Initial driver skeleton.
2012-11-09 02:33:05 +00:00
#ifdef HAVE_HW_TONDAJ_SL_814
&tondaj_sl_814_driver_info,
#endif
uni-t-ut32x: Initial driver skeleton.
2013-08-08 22:29:04 +00:00
#ifdef HAVE_HW_UNI_T_UT32X
&uni_t_ut32x_driver_info,
#endif
victor-dmm: Initial driver skeleton.
2012-11-02 19:47:06 +00:00
#ifdef HAVE_HW_VICTOR_DMM
&victor_dmm_driver_info,
#endif
Use consistent HW_ name prefixes everywhere. Older drivers used LA_* previously, we now use HW_* everywhere though.
2013-05-08 17:33:30 +00:00
#ifdef HAVE_HW_ZEROPLUS_LOGIC_CUBE
sr/cli/gtk/qt/: s/plugin/driver/.
2012-02-28 22:52:30 +00:00
&zeroplus_logic_cube_driver_info,
Only build hardware plugins if requested by user. Per default all plugins will be built, though. The user can override this via the --disable-la-xxxx options.
2010-06-24 23:11:11 +00:00
#endif
Use consistent HW_ name prefixes everywhere. Older drivers used LA_* previously, we now use HW_* everywhere though.
2013-05-08 17:33:30 +00:00
#ifdef HAVE_HW_ASIX_SIGMA
sr/cli/gtk/qt/: s/plugin/driver/.
2012-02-28 22:52:30 +00:00
&asix_sigma_driver_info,
Add per-LA --enable-XXXX configure options.
2010-05-31 09:34:10 +00:00
#endif
Rename 'chronovu-la8' driver to 'chronovu-la'. The driver now also supports the LA16 device (and possibly others in the future).
2014-04-01 19:47:11 +00:00
#ifdef HAVE_HW_CHRONOVU_LA
&chronovu_la_driver_info,
Add initial support for the ChronoVu LA8.
2011-04-04 17:40:30 +00:00
#endif
Use consistent HW_ name prefixes everywhere. Older drivers used LA_* previously, we now use HW_* everywhere though.
2013-05-08 17:33:30 +00:00
#ifdef HAVE_HW_LINK_MSO19
Re-enable link-mso19 and nexus-osciprime drivers.
2013-05-08 14:40:45 +00:00
&link_mso19_driver_info,
#endif
alsa: Update to latest APIs/conventions. The alsa driver was out of date wrt APIs and libsigrok conventions in general, and wasn't compiling. This fixes the compile and updates it to _basically_ work with the current state of analog support in libsigrok. This is not finished/full support for ALSA analog sampling yet, though, various TODOs remain that will be addressed later.
2012-12-17 18:39:13 +00:00
#ifdef HAVE_HW_ALSA
sr/cli/gtk/qt/: s/plugin/driver/.
2012-02-28 22:52:30 +00:00
&alsa_driver_info,
fx2lafw: Added empty hardware module for fx2lafw
2012-02-11 12:08:49 +00:00
#endif
Use consistent HW_ name prefixes everywhere. Older drivers used LA_* previously, we now use HW_* everywhere though.
2013-05-08 17:33:30 +00:00
#ifdef HAVE_HW_FX2LAFW
sr/cli/gtk/qt/: s/plugin/driver/.
2012-02-28 22:52:30 +00:00
&fx2lafw_driver_info,
sr: initial support for Hantek 2xxx/5200 USB oscilloscopes
2012-04-22 23:05:58 +00:00
#endif
#ifdef HAVE_HW_HANTEK_DSO
sr: hantek-dso: Consistency renames, constification.
2012-05-31 23:12:09 +00:00
&hantek_dso_driver_info,
initial version of alsa plugin. It does NOT work yet.
2011-01-22 02:57:27 +00:00
#endif
sr: mostly finished Agilent DMM driver
2012-09-02 13:11:52 +00:00
#ifdef HAVE_HW_AGILENT_DMM
&agdmm_driver_info,
fluke-dmm: build fixes
2012-09-15 16:28:43 +00:00
#endif
#ifdef HAVE_HW_FLUKE_DMM
&flukedmm_driver_info,
radioshack-dmm: Add support for Radioshack 22-812 DMM Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
2012-10-15 06:17:32 +00:00
#endif
Rename tekpower-dmm to serial-dmm. This is now a generic driver for multiple DMM "subdrivers" that use simple serial port protocols.
2012-12-01 18:35:19 +00:00
#ifdef HAVE_HW_SERIAL_DMM
serial-dmm: Add BBC Goerz Metrawatt M2110 DMM driver.
2013-12-18 22:37:42 +00:00
&bbcgm_m2110_driver_info,
serial-dmm: Add Digitek DT4000ZC support.
2012-12-01 18:53:05 +00:00
&digitek_dt4000zc_driver_info,
tekpower-dmm: Generalize & first-class TP4000ZC driver. Prepare the tekpower-dmm driver to be able to support various simple serial port based DMMs. Also, make a 'tekpower-tp4000zc' "first-class" driver which is currently the only user of this generic driver.
2012-12-01 18:28:36 +00:00
&tekpower_tp4000zc_driver_info,
serial-dmm: Add Metex ME-31 support.
2012-12-02 13:22:15 +00:00
&metex_me31_driver_info,
serial-dmm: Add PeakTech 3410 support.
2012-12-01 21:45:45 +00:00
&peaktech_3410_driver_info,
serial-dmm: Add MASTECH MAS345 support.
2012-12-01 22:04:00 +00:00
&mastech_mas345_driver_info,
serial-dmm: Add V&A VA18B support.
2012-12-01 22:32:39 +00:00
&va_va18b_driver_info,
Add initial support for the V&A VA40B multimeter.
2014-01-02 00:34:21 +00:00
&va_va40b_driver_info,
serial-dmm: Add Metex M-3640D support.
2012-12-01 23:40:15 +00:00
&metex_m3640d_driver_info,
Add support for the Metex M-4650CR. (the Voltcraft M-4650CR is a rebadged Metex M-4650CR)
2013-10-29 19:31:24 +00:00
&metex_m4650cr_driver_info,
serial-dmm: Add PeakTech 4370 support.
2012-12-02 00:02:16 +00:00
&peaktech_4370_driver_info,
serial-dmm: Add PCE PCE-DM32 support.
2012-12-02 00:32:57 +00:00
&pce_pce_dm32_driver_info,
serial-dmm: Add RadioShack 22-168 support. Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
2012-12-02 15:17:46 +00:00
&radioshack_22_168_driver_info,
serial-dmm: Add support for RadioShack 22-805 Protocol-wise, this is identical to the 22-168, except that it communicates at 600 baud instead of 1200 baud.
2013-03-21 01:36:56 +00:00
&radioshack_22_805_driver_info,
radioshack-dmm: Integrate into serial-dmm Use the infrastructure of serial-dmm to handle the RadioShack 22-812, and completely remove radioshack-dmm. Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
2012-12-02 19:15:21 +00:00
&radioshack_22_812_driver_info,
serial-dmm: Add Tecpel DMM-8061 support.
2013-05-01 01:13:15 +00:00
&tecpel_dmm_8061_ser_driver_info,
serial-dmm: Implemented support for Voltcraft M-3650CR (driver voltcraft-m3650cr).
2014-03-24 20:50:07 +00:00
&voltcraft_m3650cr_driver_info,
added Voltcraft M-3650D Multimeter
2013-06-11 18:35:57 +00:00
&voltcraft_m3650d_driver_info,
Add support for the Voltcraft M-4650CR.
2013-10-29 17:10:10 +00:00
&voltcraft_m4650cr_driver_info,
serial-dmm: Implemented support for Voltcraft ME-42 (driver voltcraft-me42).
2014-03-24 16:42:52 +00:00
&voltcraft_me42_driver_info,
serial-dmm: Add Voltcraft VC-820 (UT-D02) support. This works with the UNI-T UT-D02 (RS232) cable. For the USB/HID based cable (UNI-T UT-D04), the uni-t-dmm driver must be used.
2012-12-16 21:03:28 +00:00
&voltcraft_vc820_ser_driver_info,
serial-dmm: Add support for the Voltcraft VC-830.
2013-06-22 14:48:00 +00:00
&voltcraft_vc830_ser_driver_info,
serial-dmm: Add Voltcraft VC-840 (UT-D02) support. This works with the UNI-T UT-D02 (RS232) cable. For the USB/HID based cable (UNI-T UT-D04), the uni-t-dmm driver must be used. Note: This is untested, but should work just fine for all settings, with the possible exception of temperature (testers needed!)
2012-12-16 21:17:48 +00:00
&voltcraft_vc840_ser_driver_info,
Support for UNI-T UT60A/E multimeters via RS232 or USB
2013-07-05 12:02:50 +00:00
&uni_t_ut60a_ser_driver_info,
&uni_t_ut60e_ser_driver_info,
Add initial support for the UNI-T UT60G.
2014-01-03 21:32:16 +00:00
&uni_t_ut60g_ser_driver_info,
Add support for the UNI-T UT61B multimeter.
2014-01-01 14:25:39 +00:00
&uni_t_ut61b_ser_driver_info,
Add support for the UNI-T UT61C multimeter.
2013-12-29 16:35:51 +00:00
&uni_t_ut61c_ser_driver_info,
serial-dmm: Add support for the UNI-T UT61D. This DMM is already supported via the uni-t-dmm driver when using the USB/HID cable. The serial-dmm support makes it usable with the RS232 cable too.
2013-04-29 18:15:02 +00:00
&uni_t_ut61d_ser_driver_info,
serial-dmm: Add UNI-T UT61E support (UT-D02 cable).
2012-12-26 00:53:50 +00:00
&uni_t_ut61e_ser_driver_info,
ISO-TECH IDM103N: remove the useless -ser postfix
2013-10-10 23:36:52 +00:00
&iso_tech_idm103n_driver_info,
Add support for the Tenma 72-7750 (UNI-T UT60G rebadge).
2014-01-06 16:20:35 +00:00
&tenma_72_7745_ser_driver_info,
&tenma_72_7750_ser_driver_info,
Initial support for UNI-T DMMs. This is not yet fully finished, but works for most use-cases. Tested with a UNI-T UT61D using the UT-D04 USB/HID cable (new version).
2012-10-27 20:41:50 +00:00
#endif
#ifdef HAVE_HW_UNI_T_DMM
uni-t-dmm: Add Tecpel DMM-8061 support.
2013-05-01 01:00:08 +00:00
&tecpel_dmm_8061_driver_info,
Support for UNI-T UT60A/E multimeters via RS232 or USB
2013-07-05 12:02:50 +00:00
&uni_t_ut60a_driver_info,
&uni_t_ut60e_driver_info,
Add initial support for the UNI-T UT60G.
2014-01-03 21:32:16 +00:00
&uni_t_ut60g_driver_info,
Add support for the UNI-T UT61B multimeter.
2014-01-01 14:25:39 +00:00
&uni_t_ut61b_driver_info,
Add support for the UNI-T UT61C multimeter.
2013-12-29 16:35:51 +00:00
&uni_t_ut61c_driver_info,
Draft: Make UT61D and VC-820 "first-class" drivers. The 'uni-t-dmm' driver/directory will not appear as a "driver" to frontends anymore, it's just an internal thing. The frontends will see a uni-t-ut61d and voltcraft-vc820 driver now, with the correct names and parsers etc. attached to them. This is not fully finished yet, but it's a start (and works mostly): $ sigrok-cli -D The following devices were found: UNI-T UT61D with 1 probe: P1 Voltcraft VC-820 with 1 probe: P1 $ sigrok-cli --driver voltcraft-vc820 -D The following devices were found: Voltcraft VC-820 with 1 probe: P1 $ sigrok-cli --driver uni-t-ut61d -D The following devices were found: UNI-T UT61D with 1 probe: P1 # Now attaching a UNI-T UT61D device via USB. $ sigrok-cli --driver uni-t-ut61d --samples 3 -O analog P1: -0.017800 V DC P1: -0.017600 V DC P1: -0.017700 V DC # Now attaching a Voltcraft VC-820 device via USB instead. $ sigrok-cli --driver voltcraft-vc820 --samples 3 -O analog P1: -0.319200 V DC P1: -0.319300 V DC P1: -0.319300 V DC
2012-10-30 12:11:27 +00:00
&uni_t_ut61d_driver_info,
uni-t-dmm: Add support for the UNI-T UT61E. This DMM is already supported via the serial-dmm driver when using the RS232 cable. The uni-t-dmm support makes it usable with the USB/HID cable too.
2013-04-29 18:23:21 +00:00
&uni_t_ut61e_driver_info,
Draft: Make UT61D and VC-820 "first-class" drivers. The 'uni-t-dmm' driver/directory will not appear as a "driver" to frontends anymore, it's just an internal thing. The frontends will see a uni-t-ut61d and voltcraft-vc820 driver now, with the correct names and parsers etc. attached to them. This is not fully finished yet, but it's a start (and works mostly): $ sigrok-cli -D The following devices were found: UNI-T UT61D with 1 probe: P1 Voltcraft VC-820 with 1 probe: P1 $ sigrok-cli --driver voltcraft-vc820 -D The following devices were found: Voltcraft VC-820 with 1 probe: P1 $ sigrok-cli --driver uni-t-ut61d -D The following devices were found: UNI-T UT61D with 1 probe: P1 # Now attaching a UNI-T UT61D device via USB. $ sigrok-cli --driver uni-t-ut61d --samples 3 -O analog P1: -0.017800 V DC P1: -0.017600 V DC P1: -0.017700 V DC # Now attaching a Voltcraft VC-820 device via USB instead. $ sigrok-cli --driver voltcraft-vc820 --samples 3 -O analog P1: -0.319200 V DC P1: -0.319300 V DC P1: -0.319300 V DC
2012-10-30 12:11:27 +00:00
&voltcraft_vc820_driver_info,
uni-t-dmm: Add support for the Voltcraft VC-830.
2013-06-22 14:53:13 +00:00
&voltcraft_vc830_driver_info,
uni-t-dmm: Add support for the Voltcraft VC-840. This DMM is already supported via the serial-dmm driver when using the RS232 cable. The uni-t-dmm support makes it usable with the USB/HID cable too.
2013-04-30 18:27:04 +00:00
&voltcraft_vc840_driver_info,
uni-t-dmm: Add support for the Tenma 72-7745. This is a rebadged UNI-T UT60E.
2013-11-23 11:50:33 +00:00
&tenma_72_7745_driver_info,
Add support for the Tenma 72-7750 (UNI-T UT60G rebadge).
2014-01-06 16:20:35 +00:00
&tenma_72_7750_driver_info,
sr: Unfinished Mastech VA18B (DMM) support.
2012-06-20 17:56:54 +00:00
#endif
sr: No need for dynamic hardware driver registration. We don't need or allow run-time registration of hardware drivers/plugins, they're added at compile-time.
2012-02-22 20:48:30 +00:00
NULL,
};
Start of code base layout restructuring.
2010-04-02 18:18:27 +00:00
sr: more API cleanup and documentation
2012-02-13 02:36:32 +00:00
/**
sr/cli/gtk/qt: s/hw/driver/ in some places.
2012-02-29 18:56:15 +00:00
* Return the list of supported hardware drivers.
sr: more API cleanup and documentation
2012-02-13 02:36:32 +00:00
*
sr/cli/gtk/qt/: s/plugin/driver/.
2012-02-28 22:52:30 +00:00
* @return Pointer to the NULL-terminated list of hardware driver pointers.
sr: more API cleanup and documentation
2012-02-13 02:36:32 +00:00
*/
sr/cli/gtk/qt: s/hw/driver/ in some places.
2012-02-29 18:56:15 +00:00
SR_API struct sr_dev_driver **sr_driver_list(void)
Start of code base layout restructuring.
2010-04-02 18:18:27 +00:00
{
sr: split driver init into init() and scan() init() now only does whatever administrative stuff it needs (typically not much), and returns an error code. scan() can be called multiple times during the life of an application, and returns a GSList of struct sr_dev_inst * of devices found during that scan. The instances are a copy of the ones stored in the driver's own instance list, to be freed by the caller with g_slist_free() only. The scan() call can be passed a GSList of struct sr_hwopt *, to direct the scanning.
2012-07-08 14:25:23 +00:00
sr/cli/gtk/qt/: s/plugin/driver/.
2012-02-28 22:52:30 +00:00
return drivers_list;
Start of code base layout restructuring.
2010-04-02 18:18:27 +00:00
}
sr: more API cleanup and documentation
2012-02-13 02:36:32 +00:00
/**
sr/cli/gtk/qt/: s/plugin/driver/.
2012-02-28 22:52:30 +00:00
* Initialize a hardware driver.
sr: more API cleanup and documentation
2012-02-13 02:36:32 +00:00
*
sr_driver_init(): Improve checks. Check the relevant arguments for != NULL before calling the actual driver-specific function, so that the driver can safely assume those arguments are non-NULL. This removes the need to duplicate these checks in every driver. Also, change one SR_ERR to the more correct SR_ERR_MALLOC, and assign sr_ctx in the rigol-ds1xx2's hw_init() function, like all the other drivers do.
2013-01-28 18:36:16 +00:00
* This usually involves memory allocations and variable initializations
* within the driver, but _not_ scanning for attached devices.
* The API call sr_driver_scan() is used for that.
*
Add a struct sr_context * parameter to sr_driver_init() Since the public API is changed, this commit also bumps the libtool version component SR_LIB_VERSION_CURRENT in configure.ac.
2012-12-03 01:42:57 +00:00
* @param ctx A libsigrok context object allocated by a previous call to
sr_driver_init(): Improve checks. Check the relevant arguments for != NULL before calling the actual driver-specific function, so that the driver can safely assume those arguments are non-NULL. This removes the need to duplicate these checks in every driver. Also, change one SR_ERR to the more correct SR_ERR_MALLOC, and assign sr_ctx in the rigol-ds1xx2's hw_init() function, like all the other drivers do.
2013-01-28 18:36:16 +00:00
* sr_init(). Must not be NULL.
* @param driver The driver to initialize. This must be a pointer to one of
* the entries returned by sr_driver_list(). Must not be NULL.
sr: more API cleanup and documentation
2012-02-13 02:36:32 +00:00
*
hwdriver.c: Update/extend some Doxygen comments.
2014-02-05 13:46:10 +00:00
* @retval SR_OK Success
* @retval SR_ERR_ARG Invalid parameter(s).
* @retval SR_ERR_BUG Internal errors.
* @retval other Another negative error code upon other errors.
sr: more API cleanup and documentation
2012-02-13 02:36:32 +00:00
*/
Add a struct sr_context * parameter to sr_driver_init() Since the public API is changed, this commit also bumps the libtool version component SR_LIB_VERSION_CURRENT in configure.ac.
2012-12-03 01:42:57 +00:00
SR_API int sr_driver_init(struct sr_context *ctx, struct sr_dev_driver *driver)
better cleanup of device/plugin resources
2011-04-04 03:13:29 +00:00
{
sr_driver_init(): Improve checks. Check the relevant arguments for != NULL before calling the actual driver-specific function, so that the driver can safely assume those arguments are non-NULL. This removes the need to duplicate these checks in every driver. Also, change one SR_ERR to the more correct SR_ERR_MALLOC, and assign sr_ctx in the rigol-ds1xx2's hw_init() function, like all the other drivers do.
2013-01-28 18:36:16 +00:00
int ret;
if (!ctx) {
sr_err("Invalid libsigrok context, can't initialize.");
return SR_ERR_ARG;
}
if (!driver) {
sr_err("Invalid driver, can't initialize.");
return SR_ERR_ARG;
}
better cleanup of device/plugin resources
2011-04-04 03:13:29 +00:00
sr_driver_init(): Improve checks. Check the relevant arguments for != NULL before calling the actual driver-specific function, so that the driver can safely assume those arguments are non-NULL. This removes the need to duplicate these checks in every driver. Also, change one SR_ERR to the more correct SR_ERR_MALLOC, and assign sr_ctx in the rigol-ds1xx2's hw_init() function, like all the other drivers do.
2013-01-28 18:36:16 +00:00
sr_spew("Initializing driver '%s'.", driver->name);
if ((ret = driver->init(ctx)) < 0)
sr_err("Failed to initialize the driver: %d.", ret);
sr: split driver init into init() and scan() init() now only does whatever administrative stuff it needs (typically not much), and returns an error code. scan() can be called multiple times during the life of an application, and returns a GSList of struct sr_dev_inst * of devices found during that scan. The instances are a copy of the ones stored in the driver's own instance list, to be freed by the caller with g_slist_free() only. The scan() call can be passed a GSList of struct sr_hwopt *, to direct the scanning.
2012-07-08 14:25:23 +00:00
sr_driver_init(): Improve checks. Check the relevant arguments for != NULL before calling the actual driver-specific function, so that the driver can safely assume those arguments are non-NULL. This removes the need to duplicate these checks in every driver. Also, change one SR_ERR to the more correct SR_ERR_MALLOC, and assign sr_ctx in the rigol-ds1xx2's hw_init() function, like all the other drivers do.
2013-01-28 18:36:16 +00:00
return ret;
sr: split driver init into init() and scan() init() now only does whatever administrative stuff it needs (typically not much), and returns an error code. scan() can be called multiple times during the life of an application, and returns a GSList of struct sr_dev_inst * of devices found during that scan. The instances are a copy of the ones stored in the driver's own instance list, to be freed by the caller with g_slist_free() only. The scan() call can be passed a GSList of struct sr_hwopt *, to direct the scanning.
2012-07-08 14:25:23 +00:00
}
/**
* Tell a hardware driver to scan for devices.
*
sr: comments/docs
2012-07-22 18:06:13 +00:00
* In addition to the detection, the devices that are found are also
* initialized automatically. On some devices, this involves a firmware upload,
* or other such measures.
*
* The order in which the system is scanned for devices is not specified. The
* caller should not assume or rely on any specific order.
*
sr_driver_scan(): Improve checks. Check the relevant arguments for != NULL before calling the actual driver-specific function, so that the driver can safely assume those arguments are non-NULL. This removes the need to duplicate these checks in every driver. Also, do some minor whitespace and consistency improvements.
2013-01-28 19:00:54 +00:00
* Before calling sr_driver_scan(), the user must have previously initialized
* the driver by calling sr_driver_init().
sr: split driver init into init() and scan() init() now only does whatever administrative stuff it needs (typically not much), and returns an error code. scan() can be called multiple times during the life of an application, and returns a GSList of struct sr_dev_inst * of devices found during that scan. The instances are a copy of the ones stored in the driver's own instance list, to be freed by the caller with g_slist_free() only. The scan() call can be passed a GSList of struct sr_hwopt *, to direct the scanning.
2012-07-08 14:25:23 +00:00
*
sr_driver_scan(): Improve checks. Check the relevant arguments for != NULL before calling the actual driver-specific function, so that the driver can safely assume those arguments are non-NULL. This removes the need to duplicate these checks in every driver. Also, do some minor whitespace and consistency improvements.
2013-01-28 19:00:54 +00:00
* @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 (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: split driver init into init() and scan() init() now only does whatever administrative stuff it needs (typically not much), and returns an error code. scan() can be called multiple times during the life of an application, and returns a GSList of struct sr_dev_inst * of devices found during that scan. The instances are a copy of the ones stored in the driver's own instance list, to be freed by the caller with g_slist_free() only. The scan() call can be passed a GSList of struct sr_hwopt *, to direct the scanning.
2012-07-08 14:25:23 +00:00
*/
SR_API GSList *sr_driver_scan(struct sr_dev_driver *driver, GSList *options)
{
sr_driver_scan(): Improve checks. Check the relevant arguments for != NULL before calling the actual driver-specific function, so that the driver can safely assume those arguments are non-NULL. This removes the need to duplicate these checks in every driver. Also, do some minor whitespace and consistency improvements.
2013-01-28 19:00:54 +00:00
GSList *l;
if (!driver) {
sr_err("Invalid driver, can't scan for devices.");
return NULL;
}
if (!driver->priv) {
sr_err("Driver not initialized, can't scan for devices.");
return NULL;
}
l = driver->scan(options);
sr: split driver init into init() and scan() init() now only does whatever administrative stuff it needs (typically not much), and returns an error code. scan() can be called multiple times during the life of an application, and returns a GSList of struct sr_dev_inst * of devices found during that scan. The instances are a copy of the ones stored in the driver's own instance list, to be freed by the caller with g_slist_free() only. The scan() call can be passed a GSList of struct sr_hwopt *, to direct the scanning.
2012-07-08 14:25:23 +00:00
sr_driver_scan(): Improve checks. Check the relevant arguments for != NULL before calling the actual driver-specific function, so that the driver can safely assume those arguments are non-NULL. This removes the need to duplicate these checks in every driver. Also, do some minor whitespace and consistency improvements.
2013-01-28 19:00:54 +00:00
sr_spew("Scan of '%s' found %d devices.", driver->name,
g_slist_length(l));
sr: split driver init into init() and scan() init() now only does whatever administrative stuff it needs (typically not much), and returns an error code. scan() can be called multiple times during the life of an application, and returns a GSList of struct sr_dev_inst * of devices found during that scan. The instances are a copy of the ones stored in the driver's own instance list, to be freed by the caller with g_slist_free() only. The scan() call can be passed a GSList of struct sr_hwopt *, to direct the scanning.
2012-07-08 14:25:23 +00:00
sr_driver_scan(): Improve checks. Check the relevant arguments for != NULL before calling the actual driver-specific function, so that the driver can safely assume those arguments are non-NULL. This removes the need to duplicate these checks in every driver. Also, do some minor whitespace and consistency improvements.
2013-01-28 19:00:54 +00:00
return l;
better cleanup of device/plugin resources
2011-04-04 03:13:29 +00:00
}
hwdriver.c: Update/extend some Doxygen comments.
2014-02-05 13:46:10 +00:00
/** Call driver cleanup function for all drivers.
* @private */
sr: rename all sr_hwplugin(s)_* functions to sr_hw_*
2012-02-15 02:18:48 +00:00
SR_PRIV void sr_hw_cleanup_all(void)
better cleanup of device/plugin resources
2011-04-04 03:13:29 +00:00
{
sr: No need for dynamic hardware driver registration. We don't need or allow run-time registration of hardware drivers/plugins, they're added at compile-time.
2012-02-22 20:48:30 +00:00
int i;
sr/cli/gtk/qt/: s/plugin/driver/.
2012-02-28 22:52:30 +00:00
struct sr_dev_driver **drivers;
better cleanup of device/plugin resources
2011-04-04 03:13:29 +00:00
sr/cli/gtk/qt: s/hw/driver/ in some places.
2012-02-29 18:56:15 +00:00
drivers = sr_driver_list();
sr/cli/gtk/qt/: s/plugin/driver/.
2012-02-28 22:52:30 +00:00
for (i = 0; drivers[i]; i++) {
if (drivers[i]->cleanup)
drivers[i]->cleanup();
better cleanup of device/plugin resources
2011-04-04 03:13:29 +00:00
}
}
hwdriver.c: Update/extend some Doxygen comments.
2014-02-05 13:46:10 +00:00
/** Allocate struct sr_config.
* A floating reference can be passed in for data.
* @private
*/
Use GVariant for sr_config_*() functions sr_config_get() provides a GVariant owned by the caller, so it must be released with g_variant_unref() when done. sr_config_set() takes a GVariant from the caller which may be floating; it will be properly sunk and release after use by this function. Thus the output of g_variant_new_*() may be used as an argument. sr_config_list() also provides a GVariant owned by the caller, to be unreferenced when done. sr_config_make() can take a floating reference.
2013-03-25 14:38:44 +00:00
SR_PRIV struct sr_config *sr_config_new(int key, GVariant *data)
Add small helper for creating struct sr_config
2013-01-20 15:34:38 +00:00
{
struct sr_config *src;
if (!(src = g_try_malloc(sizeof(struct sr_config))))
return NULL;
src->key = key;
Use GVariant for sr_config_*() functions sr_config_get() provides a GVariant owned by the caller, so it must be released with g_variant_unref() when done. sr_config_set() takes a GVariant from the caller which may be floating; it will be properly sunk and release after use by this function. Thus the output of g_variant_new_*() may be used as an argument. sr_config_list() also provides a GVariant owned by the caller, to be unreferenced when done. sr_config_make() can take a floating reference.
2013-03-25 14:38:44 +00:00
src->data = g_variant_ref_sink(data);
Add small helper for creating struct sr_config
2013-01-20 15:34:38 +00:00
return src;
}
hwdriver.c: Update/extend some Doxygen comments.
2014-02-05 13:46:10 +00:00
/** Free struct sr_config.
* @private
*/
Add sr_config_free() Due to struct sr_config now containing a GVariant, this needs to be cleaned up after use properly. This is a helper function for that.
2013-03-25 19:23:13 +00:00
SR_PRIV void sr_config_free(struct sr_config *src)
{
if (!src || !src->data) {
sr_err("%s: invalid data!", __func__);
return;
}
g_variant_unref(src->data);
g_free(src);
}
sr: new sr_info_get() API call, wrapper for driver info_get() This will replace sr_dev_info_get(), the wrapper for driver dev_info_get()
2012-07-12 20:41:57 +00:00
/**
hwdriver.c: Update/extend some Doxygen comments.
2014-02-05 13:46:10 +00:00
* Query value of a configuration key at the given driver or device instance.
sr: new sr_info_get() API call, wrapper for driver info_get() This will replace sr_dev_info_get(), the wrapper for driver dev_info_get()
2012-07-12 20:41:57 +00:00
*
hwdriver.c: Update/extend some Doxygen comments.
2014-02-05 13:46:10 +00:00
* @param[in] driver The sr_dev_driver struct to query.
* @param[in] sdi (optional) If the key is specific to a device, this must
Update API documentation
2013-04-28 20:11:05 +00:00
* contain a pointer to the struct sr_dev_inst to be checked.
* Otherwise it must be NULL.
Consistently use 'cg' for channel group variables. This matches how we consistently use sdi, devc, and so on all over the code-base. This fixes parts of bug #259.
2014-03-20 20:58:01 +00:00
* @param[in] cg The channel group on the device for which to list the
Update API documentation
2013-04-28 20:11:05 +00:00
* values, or NULL.
hwdriver.c: Update/extend some Doxygen comments.
2014-02-05 13:46:10 +00:00
* @param[in] key The configuration key (SR_CONF_*).
* @param[in,out] data Pointer to a GVariant where the value will be stored.
* Must not be NULL. The caller is given ownership of the GVariant
Use GVariant for sr_config_*() functions sr_config_get() provides a GVariant owned by the caller, so it must be released with g_variant_unref() when done. sr_config_set() takes a GVariant from the caller which may be floating; it will be properly sunk and release after use by this function. Thus the output of g_variant_new_*() may be used as an argument. sr_config_list() also provides a GVariant owned by the caller, to be unreferenced when done. sr_config_make() can take a floating reference.
2013-03-25 14:38:44 +00:00
* and must thus decrease the refcount after use. However if
* this function returns an error code, the field should be
* considered unused, and should not be unreferenced.
sr: new sr_info_get() API call, wrapper for driver info_get() This will replace sr_dev_info_get(), the wrapper for driver dev_info_get()
2012-07-12 20:41:57 +00:00
*
hwdriver.c: Update/extend some Doxygen comments.
2014-02-05 13:46:10 +00:00
* @retval SR_OK Success.
* @retval SR_ERR Error.
* @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.
sr: new sr_info_get() API call, wrapper for driver info_get() This will replace sr_dev_info_get(), the wrapper for driver dev_info_get()
2012-07-12 20:41:57 +00:00
*/
probe_groups: API changes required to implement probe groups.
2013-04-20 00:00:49 +00:00
SR_API int sr_config_get(const struct sr_dev_driver *driver,
const struct sr_dev_inst *sdi,
Consistently use 'cg' for channel group variables. This matches how we consistently use sdi, devc, and so on all over the code-base. This fixes parts of bug #259.
2014-03-20 20:58:01 +00:00
const struct sr_channel_group *cg,
probe_groups: API changes required to implement probe groups.
2013-04-20 00:00:49 +00:00
int key, GVariant **data)
sr: new sr_info_get() API call, wrapper for driver info_get() This will replace sr_dev_info_get(), the wrapper for driver dev_info_get()
2012-07-12 20:41:57 +00:00
{
int ret;
Code cleanup.
2013-01-26 00:18:19 +00:00
if (!driver || !data)
sr: new sr_info_get() API call, wrapper for driver info_get() This will replace sr_dev_info_get(), the wrapper for driver dev_info_get()
2012-07-12 20:41:57 +00:00
return SR_ERR;
return SR_ERR_ARG if a driver doesn't implement sr_config_*()
2013-04-07 19:50:42 +00:00
if (!driver->config_get)
return SR_ERR_ARG;
Consistently use 'cg' for channel group variables. This matches how we consistently use sdi, devc, and so on all over the code-base. This fixes parts of bug #259.
2014-03-20 20:58:01 +00:00
if ((ret = driver->config_get(key, data, sdi, cg)) == SR_OK) {
Use GVariant for sr_config_*() functions sr_config_get() provides a GVariant owned by the caller, so it must be released with g_variant_unref() when done. sr_config_set() takes a GVariant from the caller which may be floating; it will be properly sunk and release after use by this function. Thus the output of g_variant_new_*() may be used as an argument. sr_config_list() also provides a GVariant owned by the caller, to be unreferenced when done. sr_config_make() can take a floating reference.
2013-03-25 14:38:44 +00:00
/* Got a floating reference from the driver. Sink it here,
* caller will need to unref when done with it. */
g_variant_ref_sink(*data);
}
sr: new sr_info_get() API call, wrapper for driver info_get() This will replace sr_dev_info_get(), the wrapper for driver dev_info_get()
2012-07-12 20:41:57 +00:00
return ret;
}
Code cleanup.
2013-01-26 00:18:19 +00:00
/**
hwdriver.c: Update/extend some Doxygen comments.
2014-02-05 13:46:10 +00:00
* Set value of a configuration key in a device instance.
Code cleanup.
2013-01-26 00:18:19 +00:00
*
hwdriver.c: Update/extend some Doxygen comments.
2014-02-05 13:46:10 +00:00
* @param[in] sdi The device instance.
Consistently use 'cg' for channel group variables. This matches how we consistently use sdi, devc, and so on all over the code-base. This fixes parts of bug #259.
2014-03-20 20:58:01 +00:00
* @param[in] cg The channel group on the device for which to list the
Update API documentation
2013-04-28 20:11:05 +00:00
* values, or NULL.
hwdriver.c: Update/extend some Doxygen comments.
2014-02-05 13:46:10 +00:00
* @param[in] key The configuration key (SR_CONF_*).
Use GVariant for sr_config_*() functions sr_config_get() provides a GVariant owned by the caller, so it must be released with g_variant_unref() when done. sr_config_set() takes a GVariant from the caller which may be floating; it will be properly sunk and release after use by this function. Thus the output of g_variant_new_*() may be used as an argument. sr_config_list() also provides a GVariant owned by the caller, to be unreferenced when done. sr_config_make() can take a floating reference.
2013-03-25 14:38:44 +00:00
* @param data The new value for the key, as a GVariant with GVariantType
* appropriate to that key. A floating reference can be passed
* in; its refcount will be sunk and unreferenced after use.
Code cleanup.
2013-01-26 00:18:19 +00:00
*
hwdriver.c: Update/extend some Doxygen comments.
2014-02-05 13:46:10 +00:00
* @retval SR_OK Success.
* @retval SR_ERR Error.
* @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.
Code cleanup.
2013-01-26 00:18:19 +00:00
*/
probe_groups: API changes required to implement probe groups.
2013-04-20 00:00:49 +00:00
SR_API int sr_config_set(const struct sr_dev_inst *sdi,
Consistently use 'cg' for channel group variables. This matches how we consistently use sdi, devc, and so on all over the code-base. This fixes parts of bug #259.
2014-03-20 20:58:01 +00:00
const struct sr_channel_group *cg,
probe_groups: API changes required to implement probe groups.
2013-04-20 00:00:49 +00:00
int key, GVariant *data)
Code cleanup.
2013-01-26 00:18:19 +00:00
{
int ret;
Use GVariant for sr_config_*() functions sr_config_get() provides a GVariant owned by the caller, so it must be released with g_variant_unref() when done. sr_config_set() takes a GVariant from the caller which may be floating; it will be properly sunk and release after use by this function. Thus the output of g_variant_new_*() may be used as an argument. sr_config_list() also provides a GVariant owned by the caller, to be unreferenced when done. sr_config_make() can take a floating reference.
2013-03-25 14:38:44 +00:00
g_variant_ref_sink(data);
Code cleanup.
2013-01-26 00:18:19 +00:00
Use GVariant for sr_config_*() functions sr_config_get() provides a GVariant owned by the caller, so it must be released with g_variant_unref() when done. sr_config_set() takes a GVariant from the caller which may be floating; it will be properly sunk and release after use by this function. Thus the output of g_variant_new_*() may be used as an argument. sr_config_list() also provides a GVariant owned by the caller, to be unreferenced when done. sr_config_make() can take a floating reference.
2013-03-25 14:38:44 +00:00
if (!sdi || !sdi->driver || !data)
ret = SR_ERR;
else if (!sdi->driver->config_set)
ret = SR_ERR_ARG;
else
Consistently use 'cg' for channel group variables. This matches how we consistently use sdi, devc, and so on all over the code-base. This fixes parts of bug #259.
2014-03-20 20:58:01 +00:00
ret = sdi->driver->config_set(key, data, sdi, cg);
Code cleanup.
2013-01-26 00:18:19 +00:00
Use GVariant for sr_config_*() functions sr_config_get() provides a GVariant owned by the caller, so it must be released with g_variant_unref() when done. sr_config_set() takes a GVariant from the caller which may be floating; it will be properly sunk and release after use by this function. Thus the output of g_variant_new_*() may be used as an argument. sr_config_list() also provides a GVariant owned by the caller, to be unreferenced when done. sr_config_make() can take a floating reference.
2013-03-25 14:38:44 +00:00
g_variant_unref(data);
Code cleanup.
2013-01-26 00:18:19 +00:00
return ret;
}
hwdriver: Introduce sr_config_commit() API call. (sr_dev_driver.config_probe_set): New optional callback enabling drivers to be notified upon changes to probe settings. (sr_dev_probe_enable, sr_dev_trigger_set): Invoke new driver callback on changes. (sr_dev_driver.config_commit): New optional callback allowing drivers to defer application of configuration settings until an explicit call to config_commit(). (sr_config_commit): New public wrapper function.
2014-01-19 19:39:11 +00:00
/**
* Apply configuration settings to the device hardware.
*
* @param sdi The device instance.
*
* @return SR_OK upon success or SR_ERR in case of error.
*/
SR_API int sr_config_commit(const struct sr_dev_inst *sdi)
{
int ret;
if (!sdi || !sdi->driver)
ret = SR_ERR;
else if (!sdi->driver->config_commit)
ret = SR_OK;
else
ret = sdi->driver->config_commit(sdi);
return ret;
}
Code cleanup.
2013-01-26 00:18:19 +00:00
/**
* List all possible values for a configuration key.
*
hwdriver.c: Update/extend some Doxygen comments.
2014-02-05 13:46:10 +00:00
* @param[in] driver The sr_dev_driver struct to query.
* @param[in] sdi (optional) If the key is specific to a device, this must
Update API documentation
2013-04-28 20:11:05 +00:00
* contain a pointer to the struct sr_dev_inst to be checked.
Consistently use 'cg' for channel group variables. This matches how we consistently use sdi, devc, and so on all over the code-base. This fixes parts of bug #259.
2014-03-20 20:58:01 +00:00
* @param[in] cg The channel group on the device for which to list the
Update API documentation
2013-04-28 20:11:05 +00:00
* values, or NULL.
hwdriver.c: Update/extend some Doxygen comments.
2014-02-05 13:46:10 +00:00
* @param[in] key The configuration key (SR_CONF_*).
* @param[in,out] data A pointer to a GVariant where the list will be stored.
* The caller is given ownership of the GVariant and must thus
Use GVariant for sr_config_*() functions sr_config_get() provides a GVariant owned by the caller, so it must be released with g_variant_unref() when done. sr_config_set() takes a GVariant from the caller which may be floating; it will be properly sunk and release after use by this function. Thus the output of g_variant_new_*() may be used as an argument. sr_config_list() also provides a GVariant owned by the caller, to be unreferenced when done. sr_config_make() can take a floating reference.
2013-03-25 14:38:44 +00:00
* unref the GVariant after use. However if this function
* returns an error code, the field should be considered
* unused, and should not be unreferenced.
Code cleanup.
2013-01-26 00:18:19 +00:00
*
hwdriver.c: Update/extend some Doxygen comments.
2014-02-05 13:46:10 +00:00
* @retval SR_OK Success.
* @retval SR_ERR Error.
* @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.
Code cleanup.
2013-01-26 00:18:19 +00:00
*/
probe_groups: API changes required to implement probe groups.
2013-04-20 00:00:49 +00:00
SR_API int sr_config_list(const struct sr_dev_driver *driver,
const struct sr_dev_inst *sdi,
Consistently use 'cg' for channel group variables. This matches how we consistently use sdi, devc, and so on all over the code-base. This fixes parts of bug #259.
2014-03-20 20:58:01 +00:00
const struct sr_channel_group *cg,
probe_groups: API changes required to implement probe groups.
2013-04-20 00:00:49 +00:00
int key, GVariant **data)
New driver API function: config_list() This takes an sr_config key and returns a list of possible values for that key to be submitted with config_set(). The format of the list and its contents is dependent on the key. This will replace the SR_DI_* keys that returned such a list before, such as SR_DI_SAMPLERATES.
2013-01-25 00:24:42 +00:00
{
int ret;
return SR_ERR_ARG if a driver doesn't implement sr_config_*()
2013-04-07 19:50:42 +00:00
if (!driver || !data)
Use GVariant for sr_config_*() functions sr_config_get() provides a GVariant owned by the caller, so it must be released with g_variant_unref() when done. sr_config_set() takes a GVariant from the caller which may be floating; it will be properly sunk and release after use by this function. Thus the output of g_variant_new_*() may be used as an argument. sr_config_list() also provides a GVariant owned by the caller, to be unreferenced when done. sr_config_make() can take a floating reference.
2013-03-25 14:38:44 +00:00
ret = SR_ERR;
use driver callbacks directly
2013-04-07 20:51:45 +00:00
else if (!driver->config_list)
return SR_ERR_ARG if a driver doesn't implement sr_config_*()
2013-04-07 19:50:42 +00:00
ret = SR_ERR_ARG;
Consistently use 'cg' for channel group variables. This matches how we consistently use sdi, devc, and so on all over the code-base. This fixes parts of bug #259.
2014-03-20 20:58:01 +00:00
else if ((ret = driver->config_list(key, data, sdi, cg)) == SR_OK)
Use GVariant for sr_config_*() functions sr_config_get() provides a GVariant owned by the caller, so it must be released with g_variant_unref() when done. sr_config_set() takes a GVariant from the caller which may be floating; it will be properly sunk and release after use by this function. Thus the output of g_variant_new_*() may be used as an argument. sr_config_list() also provides a GVariant owned by the caller, to be unreferenced when done. sr_config_make() can take a floating reference.
2013-03-25 14:38:44 +00:00
g_variant_ref_sink(*data);
New driver API function: config_list() This takes an sr_config key and returns a list of possible values for that key to be submitted with config_set(). The format of the list and its contents is dependent on the key. This will replace the SR_DI_* keys that returned such a list before, such as SR_DI_SAMPLERATES.
2013-01-25 00:24:42 +00:00
return ret;
}
sr: split driver options into separate list
2012-07-12 18:54:45 +00:00
/**
hwdriver.c: Update/extend some Doxygen comments.
2014-02-05 13:46:10 +00:00
* Get information about a configuration key, by key.
sr: more API cleanup and documentation
2012-02-13 02:36:32 +00:00
*
hwdriver.c: Update/extend some Doxygen comments.
2014-02-05 13:46:10 +00:00
* @param[in] key The configuration key.
sr: replace published static option data with API calls To find a driver or device option by name, the sr_drvopt_name_get() and sr_devopt_name_get() calls are now available. This was the only reason the driver and device struct sr_hwcap_option arrays were published.
2012-08-05 01:18:07 +00:00
*
Unify all SR_HWOPT_* and SR_HWCAP_* enums. Only two functions remain for accessing meta info on the keys: sr_config_info_get() and sr_config_info_name_get().
2013-01-21 20:58:19 +00:00
* @return A pointer to a struct sr_config_info, or NULL if the key
sr: replace published static option data with API calls To find a driver or device option by name, the sr_drvopt_name_get() and sr_devopt_name_get() calls are now available. This was the only reason the driver and device struct sr_hwcap_option arrays were published.
2012-08-05 01:18:07 +00:00
* was not found.
*/
Unify all SR_HWOPT_* and SR_HWCAP_* enums. Only two functions remain for accessing meta info on the keys: sr_config_info_get() and sr_config_info_name_get().
2013-01-21 20:58:19 +00:00
SR_API const struct sr_config_info *sr_config_info_get(int key)
sr: replace published static option data with API calls To find a driver or device option by name, the sr_drvopt_name_get() and sr_devopt_name_get() calls are now available. This was the only reason the driver and device struct sr_hwcap_option arrays were published.
2012-08-05 01:18:07 +00:00
{
int i;
Unify all SR_HWOPT_* and SR_HWCAP_* enums. Only two functions remain for accessing meta info on the keys: sr_config_info_get() and sr_config_info_name_get().
2013-01-21 20:58:19 +00:00
for (i = 0; sr_config_info_data[i].key; i++) {
if (sr_config_info_data[i].key == key)
return &sr_config_info_data[i];
sr: replace published static option data with API calls To find a driver or device option by name, the sr_drvopt_name_get() and sr_devopt_name_get() calls are now available. This was the only reason the driver and device struct sr_hwcap_option arrays were published.
2012-08-05 01:18:07 +00:00
}
return NULL;
}
/**
hwdriver.c: Update/extend some Doxygen comments.
2014-02-05 13:46:10 +00:00
* Get information about a configuration key, by name.
sr: replace published static option data with API calls To find a driver or device option by name, the sr_drvopt_name_get() and sr_devopt_name_get() calls are now available. This was the only reason the driver and device struct sr_hwcap_option arrays were published.
2012-08-05 01:18:07 +00:00
*
hwdriver.c: Update/extend some Doxygen comments.
2014-02-05 13:46:10 +00:00
* @param[in] optname The configuration key.
sr: more API cleanup and documentation
2012-02-13 02:36:32 +00:00
*
Unify all SR_HWOPT_* and SR_HWCAP_* enums. Only two functions remain for accessing meta info on the keys: sr_config_info_get() and sr_config_info_name_get().
2013-01-21 20:58:19 +00:00
* @return A pointer to a struct sr_config_info, or NULL if the key
sr: replace published static option data with API calls To find a driver or device option by name, the sr_drvopt_name_get() and sr_devopt_name_get() calls are now available. This was the only reason the driver and device struct sr_hwcap_option arrays were published.
2012-08-05 01:18:07 +00:00
* was not found.
sr: more API cleanup and documentation
2012-02-13 02:36:32 +00:00
*/
Unify all SR_HWOPT_* and SR_HWCAP_* enums. Only two functions remain for accessing meta info on the keys: sr_config_info_get() and sr_config_info_name_get().
2013-01-21 20:58:19 +00:00
SR_API const struct sr_config_info *sr_config_info_name_get(const char *optname)
Start of code base layout restructuring.
2010-04-02 18:18:27 +00:00
{
int i;
Unify all SR_HWOPT_* and SR_HWCAP_* enums. Only two functions remain for accessing meta info on the keys: sr_config_info_get() and sr_config_info_name_get().
2013-01-21 20:58:19 +00:00
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];
Start of code base layout restructuring.
2010-04-02 18:18:27 +00:00
}
Simplifications and small fixes.
2010-05-18 22:38:14 +00:00
return NULL;
Start of code base layout restructuring.
2010-04-02 18:18:27 +00:00
}
sr: Make wrappers honor return values.
2012-03-28 16:52:17 +00:00
/* Unnecessary level of indirection follows. */
move session main loop stuff into libsigrok (session_run)
2011-01-30 01:40:55 +00:00
hwdriver.c: Update/extend some Doxygen comments.
2014-02-05 13:46:10 +00:00
/** @private
* @see sr_session_source_remove()
*/
sr: Make wrappers honor return values.
2012-03-28 16:52:17 +00:00
SR_PRIV int sr_source_remove(int fd)
Start of code base layout restructuring.
2010-04-02 18:18:27 +00:00
{
sr: Make wrappers honor return values.
2012-03-28 16:52:17 +00:00
return sr_session_source_remove(fd);
Start of code base layout restructuring.
2010-04-02 18:18:27 +00:00
}
hwdriver.c: Update/extend some Doxygen comments.
2014-02-05 13:46:10 +00:00
/** @private
* @see sr_session_source_add()
*/
sr: Make wrappers honor return values.
2012-03-28 16:52:17 +00:00
SR_PRIV int sr_source_add(int fd, int events, int timeout,
sr_receive_data_callback_t cb, void *cb_data)
Start of code base layout restructuring.
2010-04-02 18:18:27 +00:00
{
sr: Make wrappers honor return values.
2012-03-28 16:52:17 +00:00
return sr_session_source_add(fd, events, timeout, cb, cb_data);
Start of code base layout restructuring.
2010-04-02 18:18:27 +00:00
}
Doxygen: Initial groups and topic short descriptions.
2012-10-21 14:13:36 +00:00
/** @} */