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

add new HWCAP patternmode

This commit is contained in:
Bert Vermeulen 2011-01-15 05:11:40 +01:00
parent 63570167d6
commit 925dbf9f97
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hwplugin.c
View File

@ -39,6 +39,7 @@ GSList *plugins;
struct hwcap_option hwcap_options[] = { struct hwcap_option hwcap_options[] = {
{HWCAP_SAMPLERATE, T_UINT64, "Sample rate", "samplerate"}, {HWCAP_SAMPLERATE, T_UINT64, "Sample rate", "samplerate"},
{HWCAP_CAPTURE_RATIO, T_UINT64, "Pre-trigger capture ratio", "captureratio"}, {HWCAP_CAPTURE_RATIO, T_UINT64, "Pre-trigger capture ratio", "captureratio"},
{HWCAP_PATTERN_MODE, T_CHAR, "Pattern generator mode", "patternmode"},
{0, 0, NULL, NULL}, {0, 0, NULL, NULL},
}; };
@ -105,9 +106,9 @@ struct sigrok_device_instance *sigrok_device_instance_new(int index, int status,
sdi->index = index; sdi->index = index;
sdi->status = status; sdi->status = status;
sdi->instance_type = -1; sdi->instance_type = -1;
sdi->vendor = strdup(vendor); sdi->vendor = vendor ? strdup(vendor) : strdup("(unknown)");
sdi->model = strdup(model); sdi->model = model ? strdup(model) : NULL;
sdi->version = strdup(version); sdi->version = version ? strdup(version) : NULL;
sdi->priv = NULL; sdi->priv = NULL;
sdi->usb = NULL; sdi->usb = NULL;

8
sigrok.h
View File

@ -213,10 +213,16 @@ extern GSList *devices;
/* Hardware plugin capabilities */ /* Hardware plugin capabilities */
enum { enum {
HWCAP_DUMMY, /* Used to terminate lists */ HWCAP_DUMMY, /* Used to terminate lists */
/* device classes */
HWCAP_LOGIC_ANALYZER, HWCAP_LOGIC_ANALYZER,
/* device options */
HWCAP_SAMPLERATE, /* Change samplerate */ HWCAP_SAMPLERATE, /* Change samplerate */
HWCAP_PROBECONFIG, /* Configure probe mask */ HWCAP_PROBECONFIG, /* Configure probe mask */
HWCAP_CAPTURE_RATIO, /* Set pre/post-trigger capture ratio */ HWCAP_CAPTURE_RATIO, /* Set pre/post-trigger capture ratio */
HWCAP_PATTERN_MODE, /* Pattern generator mode */
/* acquisition modes */
HWCAP_LIMIT_MSEC, /* Set a time limit for sample acquisition */ HWCAP_LIMIT_MSEC, /* Set a time limit for sample acquisition */
HWCAP_LIMIT_SAMPLES, /* Set a limit on number of samples */ HWCAP_LIMIT_SAMPLES, /* Set a limit on number of samples */
HWCAP_CONTINUOUS, HWCAP_CONTINUOUS,
@ -289,6 +295,8 @@ enum {
DI_TRIGGER_TYPES, DI_TRIGGER_TYPES,
/* The currently set samplerate in Hz (uint64_t) */ /* The currently set samplerate in Hz (uint64_t) */
DI_CUR_SAMPLERATE, DI_CUR_SAMPLERATE,
/* Supported pattern generator modes */
DI_PATTERNMODES,
}; };
/* /*