/*
* This file is part of the sigrok project.
*
- * Copyright (C) 2010 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
#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 SR_OK;
}
-SR_API GSList *sr_list_hwplugins(void)
+/**
+ * Returns the list of loaded hardware plugins.
+ *
+ * The list of plugins is initialized from sr_init(), and can only be reset
+ * by calling sr_exit().
+ *
+ * @return A GSList of pointers to loaded plugins.
+ */
+SR_API GSList *sr_hw_list(void)
{
+
return plugins;
}
-SR_API int sr_init_hwplugins(struct sr_device_plugin *plugin)
+/**
+ * Initialize a hardware plugin.
+ *
+ * The specified plugin is initialized, and all devices discovered by the
+ * plugin are instantiated.
+ *
+ * @param plugin The plugin to initialize.
+ *
+ * @return The number of devices found and instantiated by the plugin.
+ */
+SR_API int sr_hw_init(struct sr_device_plugin *plugin)
{
int num_devices, num_probes, i, j;
int num_initialized_devices = 0;
continue;
}
- device = sr_device_new(plugin, i);
+ device = sr_dev_new(plugin, i);
for (j = 0; j < num_probes; j++)
- sr_device_probe_add(device, probe_names[j]);
+ sr_dev_probe_add(device, probe_names[j]);
num_initialized_devices++;
}
return num_initialized_devices;
}
-SR_API void sr_cleanup_hwplugins(void)
+SR_PRIV void sr_hw_cleanup_all(void)
{
struct sr_device_plugin *plugin;
GSList *l;
}
}
-SR_API 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;
- if (!(sdi = g_malloc(sizeof(struct sr_device_instance))))
+ if (!(sdi = g_try_malloc(sizeof(struct sr_device_instance)))) {
+ sr_err("hwplugin: %s: sdi malloc failed", __func__);
return NULL;
+ }
sdi->index = index;
sdi->status = status;
return sdi;
}
-SR_API 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_API 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;
- if (!(udi = malloc(sizeof(struct sr_usb_device_instance))))
+ if (!(udi = g_try_malloc(sizeof(struct sr_usb_device_instance)))) {
+ sr_err("hwplugin: %s: udi malloc failed", __func__);
return NULL;
+ }
udi->bus = bus;
udi->address = address;
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;
- if (!(serial = malloc(sizeof(struct sr_serial_device_instance))))
+ if (!(serial = g_try_malloc(sizeof(struct sr_serial_device_instance)))) {
+ sr_err("hwplugin: %s: serial malloc failed", __func__);
return NULL;
+ }
- serial->port = strdup(port);
+ serial->port = g_strdup(port);
serial->fd = fd;
return serial;
}
-SR_PRIV void sr_serial_device_instance_free(
+SR_PRIV void sr_serial_dev_inst_free(
struct sr_serial_device_instance *serial)
{
- free(serial->port);
+ g_free(serial->port);
}
-SR_API int sr_find_hwcap(int *capabilities, int hwcap)
+/**
+ * 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 TRUE if found, FALSE otherwise.
+ */
+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;
return FALSE;
}
-SR_API struct sr_hwcap_option *sr_find_hwcap_option(int hwcap)
+/**
+ * Get a hardware plugin capability option.
+ *
+ * @param hwcap The capability to get.
+ *
+ * @return A struct with information about the parameter, or NULL
+ * if not found.
+ */
+SR_API struct sr_hwcap_option *sr_hw_hwcap_get(int hwcap)
{
int i;
/* unnecessary level of indirection follows. */
-void sr_source_remove(int fd)
+SR_PRIV void sr_source_remove(int fd)
{
sr_session_source_remove(fd);
}
-void sr_source_add(int fd, int events, int timeout,
+SR_PRIV void sr_source_add(int fd, int events, int timeout,
sr_receive_data_callback rcv_cb, void *user_data)
{
sr_session_source_add(fd, events, timeout, rcv_cb, user_data);
projects / libsigrok.git / blobdiff