SR_CONF_OSCILLOSCOPE,
SR_CONF_LOGIC_ANALYZER,
SR_CONF_SAMPLERATE,
+ SR_CONF_TRIGGER_TYPE,
SR_CONF_TRIGGER_SLOPE,
SR_CONF_HORIZ_TRIGGERPOS,
// SR_CONF_CAPTURE_RATIO,
*
* See also: http://www.linkinstruments.com/images/mso19_1113.gif
*/
-SR_PRIV const char *mso19_channel_names[NUM_PROBES + 1] = {
+SR_PRIV const char *mso19_channel_names[NUM_CHANNELS + 1] = {
/* Note: DSO needs to be first. */
"DSO", "0", "1", "2", "3", "4", "5", "6", "7", NULL,
};
GSList *l;
struct sr_config *src;
struct udev *udev;
- int ptype;
+ int chtype;
for (l = options; l; l = l->next) {
src = l->data;
sdi->driver = di;
sdi->priv = devc;
- for (i = 0; i < NUM_PROBES; i++) {
+ for (i = 0; i < NUM_CHANNELS; i++) {
struct sr_channel *ch;
- ptype = (i == 0) ? SR_PROBE_ANALOG : SR_PROBE_LOGIC;
- if (!(ch = sr_probe_new(i, ptype, TRUE,
+ chtype = (i == 0) ? SR_CHANNEL_ANALOG : SR_CHANNEL_LOGIC;
+ if (!(ch = sr_channel_new(i, chtype, TRUE,
mso19_channel_names[i])))
return 0;
sdi->channels = g_slist_append(sdi->channels, ch);