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

sr: clean up public/private split in headers

This commit is contained in:
Bert Vermeulen 2012-02-13 02:13:51 +01:00
parent 18beaeff94
commit 996b0c7234
3 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
session.c
View File

@ -389,7 +389,7 @@ SR_API int sr_session_stop(void)
/** /**
* @brief debug helper * @brief debug helper
* *
* @param packet TODO. * @param packet The packet to show debugging information for.
* *
*/ */
static void datafeed_dump(struct sr_datafeed_packet *packet) static void datafeed_dump(struct sr_datafeed_packet *packet)

20
sigrok-internal.h
View File

@ -40,10 +40,6 @@
/* Size of a datastore chunk in units */ /* Size of a datastore chunk in units */
#define DATASTORE_CHUNKSIZE (512 * 1024) #define DATASTORE_CHUNKSIZE (512 * 1024)
/*--- hwplugin.c ------------------------------------------------------------*/
SR_PRIV int load_hwplugins(void);
#ifdef HAVE_LIBUSB_1_0 #ifdef HAVE_LIBUSB_1_0
struct sr_usb_device_instance { struct sr_usb_device_instance {
uint8_t bus; uint8_t bus;
@ -79,6 +75,22 @@ SR_PRIV int sr_info(const char *format, ...);
SR_PRIV int sr_warn(const char *format, ...); SR_PRIV int sr_warn(const char *format, ...);
SR_PRIV int sr_err(const char *format, ...); SR_PRIV int sr_err(const char *format, ...);
/*--- hwplugin.c ------------------------------------------------------------*/
SR_PRIV int load_hwplugins(void);
SR_PRIV void sr_cleanup_hwplugins(void);
/* Generic device instances */
SR_PRIV struct sr_device_instance *sr_device_instance_new(int index,
int status, const char *vendor, const char *model, const char *version);
SR_PRIV struct sr_device_instance *sr_get_device_instance(
GSList *device_instances, int device_index);
SR_PRIV void sr_device_instance_free(struct sr_device_instance *sdi);
SR_PRIV void sr_source_remove(int fd);
SR_PRIV void sr_source_add(int fd, int events, int timeout,
sr_receive_data_callback rcv_cb, void *user_data);
/*--- hardware/common/serial.c ----------------------------------------------*/ /*--- hardware/common/serial.c ----------------------------------------------*/
SR_PRIV GSList *list_serial_ports(void); SR_PRIV GSList *list_serial_ports(void);

14
sigrok-proto.h
View File

@ -74,20 +74,8 @@ 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_PRIV void sr_cleanup_hwplugins(void);
/* Generic device instances */
SR_PRIV struct sr_device_instance *sr_device_instance_new(int index,
int status, const char *vendor, const char *model, const char *version);
SR_PRIV struct sr_device_instance *sr_get_device_instance(
GSList *device_instances, int device_index);
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_PRIV void sr_source_remove(int fd);
SR_PRIV void sr_source_add(int fd, int events, int timeout,
sr_receive_data_callback rcv_cb, void *user_data);
/*--- session.c -------------------------------------------------------------*/ /*--- session.c -------------------------------------------------------------*/
@ -125,7 +113,7 @@ SR_API struct sr_input_format **sr_input_list(void);
SR_API struct sr_output_format **sr_output_list(void); SR_API struct sr_output_format **sr_output_list(void);
/*--- output/common.c -------------------------------------------------------*/ /*--- strutil.c -------------------------------------------------------*/
SR_API char *sr_samplerate_string(uint64_t samplerate); SR_API char *sr_samplerate_string(uint64_t samplerate);
SR_API char *sr_period_string(uint64_t frequency); SR_API char *sr_period_string(uint64_t frequency);