X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=sigrok-internal.h;h=8b9392016a92c8df6e49ef7457b6411f3582bf58;hb=7b48d6e104fd461b0c12519b70dbd1c6c72824e1;hp=63b45a309dc654b25cc4c8454fd028b2092a1845;hpb=0f8522bf74af8abfe8601e978b2e0d0e40b1a124;p=libsigrok.git

diff --git a/sigrok-internal.h b/sigrok-internal.h
index 63b45a30..8b939201 100644
--- a/sigrok-internal.h
+++ b/sigrok-internal.h
@@ -1,7 +1,7 @@
 /*
  * This file is part of the sigrok project.
  *
- * Copyright (C) 2011 Bert Vermeulen <bert@biot.com>
+ * Copyright (C) 2010-2012 Bert Vermeulen <bert@biot.com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -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;
@@ -59,15 +55,15 @@ struct sr_serial_device_instance {
 
 #ifdef HAVE_LIBUSB_1_0
 /* USB-specific instances */
-SR_PRIV struct sr_usb_device_instance *sr_usb_device_instance_new(uint8_t bus,
+SR_PRIV struct sr_usb_device_instance *sr_usb_dev_inst_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);
+SR_PRIV void sr_usb_dev_inst_free(struct sr_usb_device_instance *usb);
 #endif
 
 /* Serial-specific instances */
-SR_PRIV struct sr_serial_device_instance *sr_serial_device_instance_new(
+SR_PRIV struct sr_serial_device_instance *sr_serial_dev_inst_new(
 					const char *port, int fd);
-SR_PRIV void sr_serial_device_instance_free(
+SR_PRIV void sr_serial_dev_inst_free(
 		struct sr_serial_device_instance *serial);
 
 /*--- log.c -----------------------------------------------------------------*/
@@ -79,6 +75,27 @@ 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 sr_hw_load_all(void);
+SR_PRIV void sr_hw_cleanup_all(void);
+
+/*--- session.c -------------------------------------------------------------*/
+
+SR_PRIV int sr_session_bus(struct sr_device *device,
+			  struct sr_datafeed_packet *packet);
+
+/* Generic device instances */
+SR_PRIV struct sr_device_instance *sr_dev_inst_new(int index,
+       int status, const char *vendor, const char *model, const char *version);
+SR_PRIV struct sr_device_instance *sr_dev_inst_get(
+			GSList *device_instances, int device_index);
+SR_PRIV void sr_dev_inst_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);