X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=sigrok-internal.h;h=1a297f9988a2ceccd546943881fbecb58fee513a;hb=47671b0f26cc6b3e7cf16257f458eadefe623d9f;hp=a233a28fe2dfe3017335be3ebfc2f16f9f9ee613;hpb=c73d2ea421c2b425c3f0ae33bce2bfd0c448ca5f;p=libsigrok.git

diff --git a/sigrok-internal.h b/sigrok-internal.h
index a233a28f..1a297f99 100644
--- a/sigrok-internal.h
+++ b/sigrok-internal.h
@@ -41,30 +41,29 @@
 #define DATASTORE_CHUNKSIZE (512 * 1024)
 
 #ifdef HAVE_LIBUSB_1_0
-struct sr_usb_device_instance {
+struct sr_usb_dev_inst {
 	uint8_t bus;
 	uint8_t address;
 	struct libusb_device_handle *devhdl;
 };
 #endif
 
-struct sr_serial_device_instance {
+struct sr_serial_dev_inst {
 	char *port;
 	int fd;
 };
 
 #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_dev_inst *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_dev_inst *usb);
 #endif
 
 /* Serial-specific instances */
-SR_PRIV struct sr_serial_device_instance *sr_serial_device_instance_new(
+SR_PRIV struct sr_serial_dev_inst *sr_serial_dev_inst_new(
 					const char *port, int fd);
-SR_PRIV void sr_serial_device_instance_free(
-		struct sr_serial_device_instance *serial);
+SR_PRIV void sr_serial_dev_inst_free(struct sr_serial_dev_inst *serial);
 
 /*--- log.c -----------------------------------------------------------------*/
 
@@ -77,24 +76,23 @@ SR_PRIV int sr_err(const char *format, ...);
 
 /*--- hwplugin.c ------------------------------------------------------------*/
 
-SR_PRIV int load_hwplugins(void);
-SR_PRIV void sr_cleanup_hwplugins(void);
+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);
+SR_PRIV int sr_session_bus(struct sr_dev *dev,
+			   struct sr_datafeed_packet *packet);
 
 /* 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 struct sr_dev_inst *sr_dev_inst_new(int index, int status,
+		const char *vendor, const char *model, const char *version);
+SR_PRIV struct sr_dev_inst *sr_dev_inst_get(GSList *dev_insts, int dev_index);
+SR_PRIV void sr_dev_inst_free(struct sr_dev_inst *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);
+			   sr_receive_data_callback rcv_cb, void *user_data);
 
 /*--- hardware/common/serial.c ----------------------------------------------*/
 
@@ -122,10 +120,10 @@ SR_PRIV int ezusb_upload_firmware(libusb_device *dev, int configuration,
 /*--- hardware/common/misc.c ------------------------------------------------*/
 
 #ifdef HAVE_LIBUSB_1_0
-SR_PRIV int opendev2(int device_index, struct sr_device_instance **sdi,
+SR_PRIV int opendev2(int dev_index, struct sr_dev_inst **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,
+SR_PRIV int opendev3(struct sr_dev_inst **sdi, libusb_device *dev,
 		     struct libusb_device_descriptor *des,
 		     uint16_t vid, uint16_t pid, int interface);
 #endif