Move more non-public headers to sigrok-internal.h.

diff --git a/hardware/saleae-logic/saleae-logic.c b/hardware/saleae-logic/saleae-logic.c
index ba50ee94ea3ea6af15b47360d9cf2588eaf58ec7..be4892a796cdc0f714235ed0c2914fdf61534f5a 100644 (file)
--- a/hardware/saleae-logic/saleae-logic.c
+++ b/hardware/saleae-logic/saleae-logic.c
@@ -24,6 +24,7 @@
 #include <glib.h>
 #include <libusb.h>
 #include <sigrok.h>
+#include <sigrok-internal.h>
 #include "config.h"
 
 #define USB_VENDOR                 0x0925

diff --git a/sigrok-internal.h b/sigrok-internal.h
index e8b6fc13b250a84335158d487eb17c04fd14fc6f..bf806313877f01a25f0e4889274dfbab7ba41149 100644 (file)
--- a/sigrok-internal.h
+++ b/sigrok-internal.h
@@ -20,6 +20,8 @@
 #ifndef SIGROK_SIGROK_INTERNAL_H
 #define SIGROK_SIGROK_INTERNAL_H
 
+/*--- hardware/common/serial.c ----------------------------------------------*/
+
 GSList *list_serial_ports(void);
 int serial_open(const char *pathname, int flags);
 int serial_close(int fd);
@@ -31,4 +33,20 @@ void serial_restore_params(int fd, void *backup);
 int serial_set_params(int fd, int speed, int bits, int parity, int stopbits,
                      int flowcontrol);
 
+/*--- hardware/common/ezusb.c -----------------------------------------------*/
+
+int ezusb_reset(struct libusb_device_handle *hdl, int set_clear);
+int ezusb_install_firmware(libusb_device_handle *hdl, char *filename);
+int ezusb_upload_firmware(libusb_device *dev, int configuration,
+                         const char *filename);
+
+/*--- hardware/common/misc.c ------------------------------------------------*/
+
+int opendev2(int device_index, struct sigrok_device_instance **sdi,
+            libusb_device *dev, struct libusb_device_descriptor *des,
+            int *skip, uint16_t vid, uint16_t pid, int interface);
+int opendev3(struct sigrok_device_instance **sdi, libusb_device *dev,
+            struct libusb_device_descriptor *des,
+            uint16_t vid, uint16_t pid, int interface);
+
 #endif

diff --git a/sigrok-proto.h b/sigrok-proto.h
index 3ac30dfa4a4b7869a20dd689133f83864bd175ae..1abdadd831482d90310cfa9a7b411a7426d90803 100644 (file)
--- a/sigrok-proto.h
+++ b/sigrok-proto.h
@@ -114,23 +114,6 @@ void session_bus(struct device *device, struct datafeed_packet *packet);
 void make_metadata(char *filename);
 int session_save(char *filename);
 
-/*--- hardware/common/ezusb.c -----------------------------------------------*/
-
-int ezusb_reset(struct libusb_device_handle *hdl, int set_clear);
-int ezusb_install_firmware(libusb_device_handle *hdl, char *filename);
-int ezusb_upload_firmware(libusb_device *dev, int configuration,
-                          const char *filename);
-
-/*--- hardware/common/misc.c ------------------------------------------------*/
-
-/* TODO: Should not be public. */
-int opendev2(int device_index, struct sigrok_device_instance **sdi,
-            libusb_device *dev, struct libusb_device_descriptor *des,
-            int *skip, uint16_t vid, uint16_t pid, int interface);
-int opendev3(struct sigrok_device_instance **sdi, libusb_device *dev,
-            struct libusb_device_descriptor *des,
-            uint16_t vid, uint16_t pid, int interface);
-
 /*--- input/input.c ---------------------------------------------------------*/
 
 struct input_format **input_list(void);