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

Add sr_ prefix for hwcap structs/functions.

This commit is contained in:
Uwe Hermann 2011-02-15 19:24:52 +01:00
parent a46d35febf
commit a65de0309b
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
hwplugin.c
View File

@ -33,7 +33,8 @@ GSList *plugins;
* This enumerates which plugin capabilities correspond to user-settable * This enumerates which plugin capabilities correspond to user-settable
* options. * options.
*/ */
struct hwcap_option hwcap_options[] = { /* TODO: This shouldn't be a global. */
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"},
@ -203,7 +204,7 @@ void sr_serial_device_instance_free(struct sr_serial_device_instance *serial)
free(serial->port); free(serial->port);
} }
int find_hwcap(int *capabilities, int hwcap) int sr_find_hwcap(int *capabilities, int hwcap)
{ {
int i; int i;
@ -215,13 +216,13 @@ int find_hwcap(int *capabilities, int hwcap)
return FALSE; return FALSE;
} }
struct hwcap_option *find_hwcap_option(int hwcap) struct sr_hwcap_option *sr_find_hwcap_option(int hwcap)
{ {
int i; int i;
for (i = 0; hwcap_options[i].capability; i++) { for (i = 0; sr_hwcap_options[i].capability; i++) {
if (hwcap_options[i].capability == hwcap) if (sr_hwcap_options[i].capability == hwcap)
return &hwcap_options[i]; return &sr_hwcap_options[i];
} }
return NULL; return NULL;

4
sigrok-proto.h
View File

@ -83,8 +83,8 @@ struct sr_serial_device_instance *sr_serial_device_instance_new(
const char *port, int fd); const char *port, int fd);
void sr_serial_device_instance_free(struct sr_serial_device_instance *serial); void sr_serial_device_instance_free(struct sr_serial_device_instance *serial);
int find_hwcap(int *capabilities, int hwcap); int sr_find_hwcap(int *capabilities, int hwcap);
struct hwcap_option *find_hwcap_option(int hwcap); struct sr_hwcap_option *sr_find_hwcap_option(int hwcap);
void source_remove(int fd); void source_remove(int fd);
void source_add(int fd, int events, int timeout, receive_data_callback rcv_cb, void source_add(int fd, int events, int timeout, receive_data_callback rcv_cb,
void *user_data); void *user_data);

2
sigrok.h
View File

@ -237,7 +237,7 @@ enum {
SR_HWCAP_CONTINUOUS, SR_HWCAP_CONTINUOUS,
}; };
struct hwcap_option { struct sr_hwcap_option {
int capability; int capability;
int type; int type;
char *description; char *description;