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

Changed SR_T_NULL to SR_T_BOOL and adjusted RLE option.

This commit is contained in:
Gareth McMullin 2011-11-19 13:41:41 +13:00
parent 6bb5c5fadf
commit 4d436e71ba
5 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hardware/openbench-logic-sniffer/ols.c
View File

@ -618,7 +618,7 @@ static int hw_set_configuration(int device_index, int capability, void *value)
ret = SR_OK; ret = SR_OK;
break; break;
case SR_HWCAP_RLE: case SR_HWCAP_RLE:
if (!strcmp(value, "on")) { if (GPOINTER_TO_INT(value)) {
sr_info("ols: enabling RLE"); sr_info("ols: enabling RLE");
ols->flag_reg |= FLAG_RLE; ols->flag_reg |= FLAG_RLE;
} }

5
hwplugin.c
View File

@ -39,7 +39,7 @@ struct sr_hwcap_option sr_hwcap_options[] = {
{SR_HWCAP_SAMPLERATE, SR_T_UINT64, "Sample rate", "samplerate"}, {SR_HWCAP_SAMPLERATE, SR_T_UINT64, "Sample rate", "samplerate"},
{SR_HWCAP_CAPTURE_RATIO, SR_T_UINT64, "Pre-trigger capture ratio", "captureratio"}, {SR_HWCAP_CAPTURE_RATIO, SR_T_UINT64, "Pre-trigger capture ratio", "captureratio"},
{SR_HWCAP_PATTERN_MODE, SR_T_CHAR, "Pattern generator mode", "patternmode"}, {SR_HWCAP_PATTERN_MODE, SR_T_CHAR, "Pattern generator mode", "patternmode"},
{SR_HWCAP_RLE, SR_T_CHAR, "Run Length Encoding", "rle"}, {SR_HWCAP_RLE, SR_T_BOOL, "Run Length Encoding", "rle"},
{0, 0, NULL, NULL}, {0, 0, NULL, NULL},
}; };
@ -115,7 +115,8 @@ int sr_init_hwplugins(struct sr_device_plugin *plugin)
g_message("initializing %s plugin", plugin->name); g_message("initializing %s plugin", plugin->name);
num_devices = plugin->init(NULL); num_devices = plugin->init(NULL);
for (i = 0; i < num_devices; i++) { for (i = 0; i < num_devices; i++) {
num_probes = (int)plugin->get_device_info(i, SR_DI_NUM_PROBES); num_probes = GPOINTER_TO_INT(
plugin->get_device_info(i, SR_DI_NUM_PROBES));
sr_device_new(plugin, i, num_probes); sr_device_new(plugin, i, num_probes);
} }

1
sigrok-proto.h
View File

@ -144,5 +144,6 @@ char **sr_parse_triggerstring(struct sr_device *device,
const char *triggerstring); const char *triggerstring);
uint64_t sr_parse_sizestring(const char *sizestring); uint64_t sr_parse_sizestring(const char *sizestring);
uint64_t sr_parse_timestring(const char *timestring); uint64_t sr_parse_timestring(const char *timestring);
gboolean sr_parse_boolstring(const char *boolstring);
#endif #endif

2
sigrok.h.in
View File

@ -81,7 +81,7 @@ typedef int (*sr_receive_data_callback) (int fd, int revents, void *user_data);
enum { enum {
SR_T_UINT64, SR_T_UINT64,
SR_T_CHAR, SR_T_CHAR,
SR_T_NULL, SR_T_BOOL,
}; };
#if 0 #if 0

15
strutil.c
View File

@ -267,3 +267,18 @@ uint64_t sr_parse_timestring(const char *timestring)
return time_msec; return time_msec;
} }
gboolean sr_parse_boolstring(const char *boolstr)
{
if (!boolstr)
return FALSE;
if (!g_strcasecmp(boolstr, "true") ||
!g_strcasecmp(boolstr, "yes") ||
!g_strcasecmp(boolstr, "on") ||
!g_strcasecmp(boolstr, "1"))
return TRUE;
return FALSE;
}