#endif
/* TODO: No linked list needed, this can be a simple array. */
-SR_PRIV int load_hwplugins(void)
+SR_PRIV int sr_hw_load_all(void)
{
#ifdef HAVE_LA_DEMO
plugins = g_slist_append(plugins, (gpointer *)&demo_plugin_info);
*
* @return A GSList of pointers to loaded plugins.
*/
-SR_API GSList *sr_list_hwplugins(void)
+SR_API GSList *sr_hw_list(void)
{
return plugins;
*
* @return The number of devices found and instantiated by the plugin.
*/
-SR_API int sr_init_hwplugin(struct sr_device_plugin *plugin)
+SR_API int sr_hw_init(struct sr_device_plugin *plugin)
{
int num_devices, num_probes, i, j;
int num_initialized_devices = 0;
return num_initialized_devices;
}
-SR_PRIV void sr_cleanup_hwplugins(void)
+SR_PRIV void sr_hw_cleanup_all(void)
{
struct sr_device_plugin *plugin;
GSList *l;
}
}
-SR_PRIV struct sr_device_instance *sr_device_instance_new(int index, int status,
+SR_PRIV struct sr_device_instance *sr_dev_inst_new(int index, int status,
const char *vendor, const char *model, const char *version)
{
struct sr_device_instance *sdi;
return sdi;
}
-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)
{
struct sr_device_instance *sdi;
return NULL;
}
-SR_PRIV void sr_device_instance_free(struct sr_device_instance *sdi)
+SR_PRIV void sr_dev_inst_free(struct sr_device_instance *sdi)
{
g_free(sdi->priv);
g_free(sdi->vendor);
#ifdef HAVE_LIBUSB_1_0
-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)
{
struct sr_usb_device_instance *udi;
return udi;
}
-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)
{
/* Avoid compiler warnings. */
(void)usb;
#endif
-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)
{
struct sr_serial_device_instance *serial;
return serial;
}
-SR_PRIV void sr_serial_device_instance_free(
+SR_PRIV void sr_serial_dev_inst_free(
struct sr_serial_device_instance *serial)
{
g_free(serial->port);
}
/**
- * Find out if a list of hardware plugin capabilities has a specific cap.
+ * Find out if a hardware plugin has a specific capability.
*
* @param capabilities A NULL-terminated integer array of capabilities, as
* returned by a plugin's get_capabilities() function.
* @param hwcap The capability to find in the list.
*
- * @return Returns TRUE if found, FALSE otherwise.
+ * @return TRUE if found, FALSE otherwise.
*/
-SR_API gboolean sr_has_hwcap(int *capabilities, int hwcap)
+SR_API gboolean sr_hw_has_hwcap(struct sr_device_plugin *plugin, int hwcap)
{
- int i;
+ int *capabilities, i;
+ capabilities = plugin->get_capabilities();
for (i = 0; capabilities[i]; i++) {
if (capabilities[i] == hwcap)
return TRUE;
}
/**
- * Find a hardware plugin capability option parameter structure.
+ * Get a hardware plugin capability option.
*
- * @param hwcap The capability to find
+ * @param hwcap The capability to get.
*
- * @return Returns a struct with information about the parameter, or NULL
+ * @return A struct with information about the parameter, or NULL
* if not found.
*/
-SR_API struct sr_hwcap_option *sr_find_hwcap_option(int hwcap)
+SR_API struct sr_hwcap_option *sr_hw_hwcap_get(int hwcap)
{
int i;