sr: clean up public/private split in headers

diff --git a/session.c b/session.c
index 06c265a9afd3fbce5f79cd416245fc39d3092330..b33baa5c57f32a990d62dba28ce3e0816dc87d2d 100644 (file)
--- a/session.c
+++ b/session.c
@@ -389,7 +389,7 @@ SR_API int sr_session_stop(void)
 /**
  * @brief debug helper
  *
- * @param packet TODO.
+ * @param packet The packet to show debugging information for.
  *
  */
 static void datafeed_dump(struct sr_datafeed_packet *packet)

diff --git a/sigrok-internal.h b/sigrok-internal.h
index 63b45a309dc654b25cc4c8454fd028b2092a1845..f115c530ba28c3f5aea011ab98d74c83377665d5 100644 (file)
--- a/sigrok-internal.h
+++ b/sigrok-internal.h
@@ -40,10 +40,6 @@
 /* Size of a datastore chunk in units */
 #define DATASTORE_CHUNKSIZE (512 * 1024)
 
-/*--- hwplugin.c ------------------------------------------------------------*/
-
-SR_PRIV int load_hwplugins(void);
-
 #ifdef HAVE_LIBUSB_1_0
 struct sr_usb_device_instance {
        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_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 ----------------------------------------------*/
 
 SR_PRIV GSList *list_serial_ports(void);

diff --git a/sigrok-proto.h b/sigrok-proto.h
index 600decbe1e892ee3f8d7c68792615e94d1bb53fd..209ff963010987e862bf47a77cd2c81a54a938f7 100644 (file)
--- a/sigrok-proto.h
+++ b/sigrok-proto.h
@@ -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 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 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 -------------------------------------------------------------*/
 
@@ -125,7 +113,7 @@ SR_API struct sr_input_format **sr_input_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_period_string(uint64_t frequency);