sr: rename all sr_hwplugin(s)_* functions to sr_hw_*

[libsigrok.git] / sigrok-internal.h

diff --git a/sigrok-internal.h b/sigrok-internal.h
index f6a35624a645883d654c9bb07519afb0d7a7fb21..8b9392016a92c8df6e49ef7457b6411f3582bf58 100644 (file)
--- 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
@@ -55,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 -----------------------------------------------------------------*/
@@ -77,8 +77,8 @@ 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 -------------------------------------------------------------*/
 
@@ -86,11 +86,11 @@ 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_device_instance_new(int index,
+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_get_device_instance(
+SR_PRIV struct sr_device_instance *sr_dev_inst_get(
                        GSList *device_instances, int device_index);
-SR_PRIV void sr_device_instance_free(struct sr_device_instance *sdi);
+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,