X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=inline;f=sigrok-internal.h;h=63b45a309dc654b25cc4c8454fd028b2092a1845;hb=040ae8be943b499b5e786e4861ed1109ae4ebcce;hp=d385340357c551d6323105443d49970fd975beee;hpb=b08024a8363c7a019bebc05a25e2689e774326e8;p=libsigrok.git

diff --git a/sigrok-internal.h b/sigrok-internal.h
index d3853403..63b45a30 100644
--- a/sigrok-internal.h
+++ b/sigrok-internal.h
@@ -17,10 +17,15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SIGROK_SIGROK_INTERNAL_H
-#define SIGROK_SIGROK_INTERNAL_H
+#ifndef LIBSIGROK_SIGROK_INTERNAL_H
+#define LIBSIGROK_SIGROK_INTERNAL_H
 
 #include <stdarg.h>
+#include <glib.h>
+#include "config.h" /* Needed for HAVE_LIBUSB_1_0 and others. */
+#ifdef HAVE_LIBUSB_1_0
+#include <libusb.h>
+#endif
 
 /*--- Macros ----------------------------------------------------------------*/
 
@@ -33,58 +38,79 @@
 #endif
 
 /* Size of a datastore chunk in units */
-#define DATASTORE_CHUNKSIZE 512000
+#define DATASTORE_CHUNKSIZE (512 * 1024)
 
 /*--- hwplugin.c ------------------------------------------------------------*/
 
-int load_hwplugins(void);
+SR_PRIV int load_hwplugins(void);
 
-/*--- log.c -----------------------------------------------------------------*/
+#ifdef HAVE_LIBUSB_1_0
+struct sr_usb_device_instance {
+	uint8_t bus;
+	uint8_t address;
+	struct libusb_device_handle *devhdl;
+};
+#endif
+
+struct sr_serial_device_instance {
+	char *port;
+	int fd;
+};
 
-/* Log levels for sr_log() and friends. */
-#define SR_LOG_NONE	0
-#define SR_LOG_DBG	1
-#define SR_LOG_INFO	2
-#define SR_LOG_WARN	3
-#define SR_LOG_ERR	4
+#ifdef HAVE_LIBUSB_1_0
+/* USB-specific instances */
+SR_PRIV struct sr_usb_device_instance *sr_usb_device_instance_new(uint8_t bus,
+		uint8_t address, struct libusb_device_handle *hdl);
+SR_PRIV void sr_usb_device_instance_free(struct sr_usb_device_instance *usb);
+#endif
+
+/* Serial-specific instances */
+SR_PRIV struct sr_serial_device_instance *sr_serial_device_instance_new(
+					const char *port, int fd);
+SR_PRIV void sr_serial_device_instance_free(
+		struct sr_serial_device_instance *serial);
+
+/*--- log.c -----------------------------------------------------------------*/
 
-int sr_log(int loglevel, const char *format, ...);
-int sr_dbg(const char *format, ...);
-int sr_info(const char *format, ...);
-int sr_warn(const char *format, ...);
-int sr_err(const char *format, ...);
+SR_PRIV int sr_log(int loglevel, const char *format, ...);
+SR_PRIV int sr_spew(const char *format, ...);
+SR_PRIV int sr_dbg(const char *format, ...);
+SR_PRIV int sr_info(const char *format, ...);
+SR_PRIV int sr_warn(const char *format, ...);
+SR_PRIV int sr_err(const char *format, ...);
 
 /*--- hardware/common/serial.c ----------------------------------------------*/
 
-GSList *list_serial_ports(void);
-int serial_open(const char *pathname, int flags);
-int serial_close(int fd);
-int serial_flush(int fd);
-int serial_write(int fd, const void *buf, size_t count);
-int serial_read(int fd, void *buf, size_t count);
-void *serial_backup_params(int fd);
-void serial_restore_params(int fd, void *backup);
-int serial_set_params(int fd, int speed, int bits, int parity, int stopbits,
-		      int flowcontrol);
+SR_PRIV GSList *list_serial_ports(void);
+SR_PRIV int serial_open(const char *pathname, int flags);
+SR_PRIV int serial_close(int fd);
+SR_PRIV int serial_flush(int fd);
+SR_PRIV int serial_write(int fd, const void *buf, size_t count);
+SR_PRIV int serial_read(int fd, void *buf, size_t count);
+SR_PRIV void *serial_backup_params(int fd);
+SR_PRIV void serial_restore_params(int fd, void *backup);
+SR_PRIV int serial_set_params(int fd, int speed, int bits, int parity,
+			      int stopbits, int flowcontrol);
 
 /*--- hardware/common/ezusb.c -----------------------------------------------*/
 
 #ifdef HAVE_LIBUSB_1_0
-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);
+SR_PRIV int ezusb_reset(struct libusb_device_handle *hdl, int set_clear);
+SR_PRIV int ezusb_install_firmware(libusb_device_handle *hdl,
+				   const char *filename);
+SR_PRIV int ezusb_upload_firmware(libusb_device *dev, int configuration,
+				  const char *filename);
 #endif
 
 /*--- hardware/common/misc.c ------------------------------------------------*/
 
 #ifdef HAVE_LIBUSB_1_0
-int opendev2(int device_index, struct sr_device_instance **sdi,
-	     libusb_device *dev, struct libusb_device_descriptor *des,
-	     int *skip, uint16_t vid, uint16_t pid, int interface);
-int opendev3(struct sr_device_instance **sdi, libusb_device *dev,
-	     struct libusb_device_descriptor *des,
-	     uint16_t vid, uint16_t pid, int interface);
+SR_PRIV int opendev2(int device_index, struct sr_device_instance **sdi,
+		     libusb_device *dev, struct libusb_device_descriptor *des,
+		     int *skip, uint16_t vid, uint16_t pid, int interface);
+SR_PRIV int opendev3(struct sr_device_instance **sdi, libusb_device *dev,
+		     struct libusb_device_descriptor *des,
+		     uint16_t vid, uint16_t pid, int interface);
 #endif
 
 #endif