X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hwplugin.c;h=4e13ed1f04ae06ef10265332cee3035b9af3edde;hb=ca070ed9a0237e5cea10e5dd974e06da62de890d;hp=60a121c9a5dc5a67612b87a4034ab22bcf1209d4;hpb=b7f09cf86dd57a59dc1bdece2cac9e4a176900b1;p=libsigrok.git
diff --git a/hwplugin.c b/hwplugin.c
index 60a121c9..4e13ed1f 100644
--- a/hwplugin.c
+++ b/hwplugin.c
@@ -17,7 +17,6 @@
* along with this program. If not, see .
*/
-#include "config.h"
#include
#include
#include
@@ -35,7 +34,7 @@ static GSList *plugins;
* options.
*/
/* TODO: This shouldn't be a global. */
-struct sr_hwcap_option sr_hwcap_options[] = {
+SR_API struct sr_hwcap_option sr_hwcap_options[] = {
{SR_HWCAP_SAMPLERATE, SR_T_UINT64, "Sample rate", "samplerate"},
{SR_HWCAP_CAPTURE_RATIO, SR_T_UINT64, "Pre-trigger capture ratio", "captureratio"},
{SR_HWCAP_PATTERN_MODE, SR_T_CHAR, "Pattern generator mode", "patternmode"},
@@ -59,7 +58,7 @@ extern struct sr_device_plugin zeroplus_logic_cube_plugin_info;
extern struct sr_device_plugin asix_sigma_plugin_info;
#endif
#ifdef HAVE_LA_CHRONOVU_LA8
-extern struct device_plugin chronovu_la8_plugin_info;
+extern SR_PRIV struct device_plugin chronovu_la8_plugin_info;
#endif
#ifdef HAVE_LA_LINK_MSO19
extern struct sr_device_plugin link_mso19_plugin_info;
@@ -69,7 +68,7 @@ extern struct sr_device_plugin alsa_plugin_info;
#endif
/* TODO: No linked list needed, this can be a simple array. */
-int load_hwplugins(void)
+SR_PRIV int load_hwplugins(void)
{
#ifdef HAVE_LA_DEMO
plugins = g_slist_append(plugins, (gpointer *)&demo_plugin_info);
@@ -101,27 +100,42 @@ int load_hwplugins(void)
return SR_OK;
}
-GSList *sr_list_hwplugins(void)
+SR_API GSList *sr_list_hwplugins(void)
{
return plugins;
}
-int sr_init_hwplugins(struct sr_device_plugin *plugin)
+SR_API int sr_init_hwplugins(struct sr_device_plugin *plugin)
{
- int num_devices, num_probes, i;
+ int num_devices, num_probes, i, j;
+ int num_initialized_devices = 0;
+ struct sr_device *device;
+ char **probe_names;
- g_message("initializing %s plugin", plugin->name);
+ sr_dbg("initializing %s plugin", plugin->name);
num_devices = plugin->init(NULL);
for (i = 0; i < num_devices; i++) {
num_probes = GPOINTER_TO_INT(
plugin->get_device_info(i, SR_DI_NUM_PROBES));
- sr_device_new(plugin, i, num_probes);
+ probe_names = (char **)plugin->get_device_info(i,
+ SR_DI_PROBE_NAMES);
+
+ if (!probe_names) {
+ sr_warn("hwplugin: %s: plugin %s does not return a "
+ "list of probe names", __func__, plugin->name);
+ continue;
+ }
+
+ device = sr_device_new(plugin, i);
+ for (j = 0; j < num_probes; j++)
+ sr_device_probe_add(device, probe_names[j]);
+ num_initialized_devices++;
}
- return num_devices;
+ return num_initialized_devices;
}
-void sr_cleanup_hwplugins(void)
+SR_API void sr_cleanup_hwplugins(void)
{
struct sr_device_plugin *plugin;
GSList *l;
@@ -133,7 +147,7 @@ void sr_cleanup_hwplugins(void)
}
}
-struct sr_device_instance *sr_device_instance_new(int index, int status,
+SR_API struct sr_device_instance *sr_device_instance_new(int index, int status,
const char *vendor, const char *model, const char *version)
{
struct sr_device_instance *sdi;
@@ -148,13 +162,12 @@ struct sr_device_instance *sr_device_instance_new(int index, int status,
sdi->model = model ? g_strdup(model) : NULL;
sdi->version = version ? g_strdup(version) : NULL;
sdi->priv = NULL;
- sdi->usb = NULL;
return sdi;
}
-struct sr_device_instance *sr_get_device_instance(GSList *device_instances,
- int device_index)
+SR_API struct sr_device_instance *sr_get_device_instance(
+ GSList *device_instances, int device_index)
{
struct sr_device_instance *sdi;
GSList *l;
@@ -169,25 +182,9 @@ struct sr_device_instance *sr_get_device_instance(GSList *device_instances,
return NULL;
}
-void sr_device_instance_free(struct sr_device_instance *sdi)
+SR_API void sr_device_instance_free(struct sr_device_instance *sdi)
{
- switch (sdi->instance_type) {
-#ifdef HAVE_LIBUSB_1_0
- case SR_USB_INSTANCE:
- sr_usb_device_instance_free(sdi->usb);
- break;
-#endif
- case SR_SERIAL_INSTANCE:
- sr_serial_device_instance_free(sdi->serial);
- break;
- default:
- /* No specific type, nothing extra to free. */
- break;
- }
-
- if (sdi->priv)
- g_free(sdi->priv);
-
+ g_free(sdi->priv);
g_free(sdi->vendor);
g_free(sdi->model);
g_free(sdi->version);
@@ -196,7 +193,7 @@ void sr_device_instance_free(struct sr_device_instance *sdi)
#ifdef HAVE_LIBUSB_1_0
-struct sr_usb_device_instance *sr_usb_device_instance_new(uint8_t bus,
+SR_PRIV struct sr_usb_device_instance *sr_usb_device_instance_new(uint8_t bus,
uint8_t address, struct libusb_device_handle *hdl)
{
struct sr_usb_device_instance *udi;
@@ -211,7 +208,7 @@ struct sr_usb_device_instance *sr_usb_device_instance_new(uint8_t bus,
return udi;
}
-void sr_usb_device_instance_free(struct sr_usb_device_instance *usb)
+SR_PRIV void sr_usb_device_instance_free(struct sr_usb_device_instance *usb)
{
/* Avoid compiler warnings. */
(void)usb;
@@ -221,7 +218,7 @@ void sr_usb_device_instance_free(struct sr_usb_device_instance *usb)
#endif
-struct sr_serial_device_instance *sr_serial_device_instance_new(
+SR_PRIV struct sr_serial_device_instance *sr_serial_device_instance_new(
const char *port, int fd)
{
struct sr_serial_device_instance *serial;
@@ -235,12 +232,13 @@ struct sr_serial_device_instance *sr_serial_device_instance_new(
return serial;
}
-void sr_serial_device_instance_free(struct sr_serial_device_instance *serial)
+SR_PRIV void sr_serial_device_instance_free(
+ struct sr_serial_device_instance *serial)
{
free(serial->port);
}
-int sr_find_hwcap(int *capabilities, int hwcap)
+SR_API int sr_find_hwcap(int *capabilities, int hwcap)
{
int i;
@@ -252,7 +250,7 @@ int sr_find_hwcap(int *capabilities, int hwcap)
return FALSE;
}
-struct sr_hwcap_option *sr_find_hwcap_option(int hwcap)
+SR_API struct sr_hwcap_option *sr_find_hwcap_option(int hwcap)
{
int i;