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

sr: public/private API cleanup in hwplugin

This commit is contained in:
Bert Vermeulen 2012-02-12 23:57:43 +01:00
parent 6cfa474a80
commit bb08ee2e53
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hwplugin.c
View File

@ -135,7 +135,7 @@ SR_API int sr_init_hwplugins(struct sr_device_plugin *plugin)
return num_initialized_devices; return num_initialized_devices;
} }
SR_API void sr_cleanup_hwplugins(void) SR_PRIV void sr_cleanup_hwplugins(void)
{ {
struct sr_device_plugin *plugin; struct sr_device_plugin *plugin;
GSList *l; GSList *l;
@ -147,7 +147,7 @@ SR_API void sr_cleanup_hwplugins(void)
} }
} }
SR_API struct sr_device_instance *sr_device_instance_new(int index, int status, SR_PRIV struct sr_device_instance *sr_device_instance_new(int index, int status,
const char *vendor, const char *model, const char *version) const char *vendor, const char *model, const char *version)
{ {
struct sr_device_instance *sdi; struct sr_device_instance *sdi;
@ -168,7 +168,7 @@ SR_API struct sr_device_instance *sr_device_instance_new(int index, int status,
return sdi; return sdi;
} }
SR_API struct sr_device_instance *sr_get_device_instance( SR_PRIV struct sr_device_instance *sr_get_device_instance(
GSList *device_instances, int device_index) GSList *device_instances, int device_index)
{ {
struct sr_device_instance *sdi; struct sr_device_instance *sdi;
@ -184,7 +184,7 @@ SR_API struct sr_device_instance *sr_get_device_instance(
return NULL; return NULL;
} }
SR_API void sr_device_instance_free(struct sr_device_instance *sdi) SR_PRIV void sr_device_instance_free(struct sr_device_instance *sdi)
{ {
g_free(sdi->priv); g_free(sdi->priv);
g_free(sdi->vendor); g_free(sdi->vendor);
@ -270,12 +270,12 @@ SR_API struct sr_hwcap_option *sr_find_hwcap_option(int hwcap)
/* unnecessary level of indirection follows. */ /* unnecessary level of indirection follows. */
void sr_source_remove(int fd) SR_PRIV void sr_source_remove(int fd)
{ {
sr_session_source_remove(fd); sr_session_source_remove(fd);
} }
void sr_source_add(int fd, int events, int timeout, SR_PRIV void sr_source_add(int fd, int events, int timeout,
sr_receive_data_callback rcv_cb, void *user_data) sr_receive_data_callback rcv_cb, void *user_data)
{ {
sr_session_source_add(fd, events, timeout, rcv_cb, user_data); sr_session_source_add(fd, events, timeout, rcv_cb, user_data);

12
sigrok-proto.h
View File

@ -74,19 +74,19 @@ SR_API int sr_filter_probes(int in_unitsize, int out_unitsize,
SR_API GSList *sr_list_hwplugins(void); SR_API GSList *sr_list_hwplugins(void);
SR_API int sr_init_hwplugins(struct sr_device_plugin *plugin); SR_API int sr_init_hwplugins(struct sr_device_plugin *plugin);
SR_API void sr_cleanup_hwplugins(void); SR_PRIV void sr_cleanup_hwplugins(void);
/* Generic device instances */ /* Generic device instances */
SR_API struct sr_device_instance *sr_device_instance_new(int index, SR_PRIV struct sr_device_instance *sr_device_instance_new(int index,
int status, const char *vendor, const char *model, const char *version); int status, const char *vendor, const char *model, const char *version);
SR_API struct sr_device_instance *sr_get_device_instance( SR_PRIV struct sr_device_instance *sr_get_device_instance(
GSList *device_instances, int device_index); GSList *device_instances, int device_index);
SR_API void sr_device_instance_free(struct sr_device_instance *sdi); SR_PRIV void sr_device_instance_free(struct sr_device_instance *sdi);
SR_API int sr_find_hwcap(int *capabilities, int hwcap); SR_API int sr_find_hwcap(int *capabilities, int hwcap);
SR_API struct sr_hwcap_option *sr_find_hwcap_option(int hwcap); SR_API struct sr_hwcap_option *sr_find_hwcap_option(int hwcap);
SR_API void sr_source_remove(int fd); SR_PRIV void sr_source_remove(int fd);
SR_API void sr_source_add(int fd, int events, int timeout, SR_PRIV void sr_source_add(int fd, int events, int timeout,
sr_receive_data_callback rcv_cb, void *user_data); sr_receive_data_callback rcv_cb, void *user_data);
/*--- session.c -------------------------------------------------------------*/ /*--- session.c -------------------------------------------------------------*/