X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hwplugin.c;h=1ba4dbb0a623afc78fff2166130331bdd7790984;hb=c2bd92ec0867eff49ee58b557d6fb9aec2b63357;hp=741d4a381526a2e257a4068de7e86dc4421df890;hpb=62c820258238485d3352f4a68a65d299b136b792;p=libsigrok.git

diff --git a/hwplugin.c b/hwplugin.c
index 741d4a38..1ba4dbb0 100644
--- a/hwplugin.c
+++ b/hwplugin.c
@@ -23,8 +23,8 @@
 #include <dirent.h>
 #include <string.h>
 #include <glib.h>
-#include <gmodule.h>
 #include <sigrok.h>
+#include "config.h"
 
 source_callback_add source_cb_add = NULL;
 source_callback_remove source_cb_remove = NULL;
@@ -38,20 +38,54 @@ GSList *plugins;
  */
 struct hwcap_option hwcap_options[] = {
 	{HWCAP_SAMPLERATE, T_UINT64, "Sample rate", "samplerate"},
-	{0, 0, NULL, NULL}
+	{HWCAP_CAPTURE_RATIO, T_UINT64, "Pre-trigger capture ratio", "captureratio"},
+	{HWCAP_PATTERN_MODE, T_CHAR, "Pattern generator mode", "patternmode"},
+	{0, 0, NULL, NULL},
 };
 
+#ifdef HAVE_LA_DEMO
+extern struct device_plugin demo_plugin_info;
+#endif
+#ifdef HAVE_LA_SALEAE_LOGIC
 extern struct device_plugin saleae_logic_plugin_info;
+#endif
+#ifdef HAVE_LA_OLS
 extern struct device_plugin ols_plugin_info;
+#endif
+#ifdef HAVE_LA_ZEROPLUS_LOGIC_CUBE
 extern struct device_plugin zeroplus_logic_cube_plugin_info;
+#endif
+#ifdef HAVE_LA_ASIX_SIGMA
+extern struct device_plugin asix_sigma_plugin_info;
+#endif
+#ifdef HAVE_LA_LINK_MSO19
+extern struct device_plugin link_mso19_plugin_info;
+#endif
 
+
+/* TODO: No linked list needed, this can be a simple array. */
 int load_hwplugins(void)
 {
+#ifdef HAVE_LA_DEMO
+	plugins = g_slist_append(plugins, (gpointer *)&demo_plugin_info);
+#endif
+#ifdef HAVE_LA_SALEAE_LOGIC
 	plugins =
-	    g_slist_append(plugins, (gpointer *) &saleae_logic_plugin_info);
-	plugins = g_slist_append(plugins, (gpointer *) &ols_plugin_info);
+	    g_slist_append(plugins, (gpointer *)&saleae_logic_plugin_info);
+#endif
+#ifdef HAVE_LA_OLS
+	plugins = g_slist_append(plugins, (gpointer *)&ols_plugin_info);
+#endif
+#ifdef HAVE_LA_ZEROPLUS_LOGIC_CUBE
 	plugins = g_slist_append(plugins,
-			   (gpointer *) &zeroplus_logic_cube_plugin_info);
+			   (gpointer *)&zeroplus_logic_cube_plugin_info);
+#endif
+#ifdef HAVE_LA_ASIX_SIGMA
+	plugins = g_slist_append(plugins, (gpointer *)&asix_sigma_plugin_info);
+#endif
+#ifdef HAVE_LA_LINK_MSO19
+	plugins = g_slist_append(plugins, (gpointer *)&link_mso19_plugin_info);
+#endif
 
 	return SIGROK_OK;
 }
@@ -62,20 +96,20 @@ GSList *list_hwplugins(void)
 }
 
 struct sigrok_device_instance *sigrok_device_instance_new(int index, int status,
-				char *vendor, char *model, char *version)
+		const char *vendor, const char *model, const char *version)
 {
 	struct sigrok_device_instance *sdi;
 
-	sdi = malloc(sizeof(struct sigrok_device_instance));
-	if (!sdi)
+	if (!(sdi = malloc(sizeof(struct sigrok_device_instance))))
 		return NULL;
 
 	sdi->index = index;
 	sdi->status = status;
 	sdi->instance_type = -1;
-	sdi->vendor = strdup(vendor);
-	sdi->model = strdup(model);
-	sdi->version = strdup(version);
+	sdi->vendor = vendor ? strdup(vendor) : strdup("(unknown)");
+	sdi->model = model ? strdup(model) : NULL;
+	sdi->version = version ? strdup(version) : NULL;
+	sdi->priv = NULL;
 	sdi->usb = NULL;
 
 	return sdi;
@@ -87,7 +121,6 @@ struct sigrok_device_instance *get_sigrok_device_instance(
 	struct sigrok_device_instance *sdi;
 	GSList *l;
 
-	sdi = NULL;
 	for (l = device_instances; l; l = l->next) {
 		sdi = (struct sigrok_device_instance *)(l->data);
 		if (sdi->index == device_index)
@@ -107,7 +140,9 @@ void sigrok_device_instance_free(struct sigrok_device_instance *sdi)
 	case SERIAL_INSTANCE:
 		serial_device_instance_free(sdi->serial);
 		break;
+	default:
 		/* No specific type, nothing extra to free. */
+		break;
 	}
 
 	free(sdi->vendor);
@@ -121,31 +156,30 @@ struct usb_device_instance *usb_device_instance_new(uint8_t bus,
 {
 	struct usb_device_instance *udi;
 
-	udi = malloc(sizeof(struct usb_device_instance));
-	if (!udi)
+	if (!(udi = malloc(sizeof(struct usb_device_instance))))
 		return NULL;
 
 	udi->bus = bus;
 	udi->address = address;
-	udi->devhdl = hdl;
+	udi->devhdl = hdl; /* TODO: Check if this is NULL? */
 
 	return udi;
 }
 
 void usb_device_instance_free(struct usb_device_instance *usb)
 {
-	/* QUICK HACK */
+	/* Avoid compiler warnings. */
 	usb = usb;
 
 	/* Nothing to do for this device instance type. */
 }
 
-struct serial_device_instance *serial_device_instance_new(char *port, int fd)
+struct serial_device_instance *serial_device_instance_new(
+						const char *port, int fd)
 {
 	struct serial_device_instance *serial;
 
-	serial = malloc(sizeof(struct serial_device_instance));
-	if (!serial)
+	if (!(serial = malloc(sizeof(struct serial_device_instance))))
 		return NULL;
 
 	serial->port = strdup(port);
@@ -163,27 +197,24 @@ int find_hwcap(int *capabilities, int hwcap)
 {
 	int i;
 
-	for (i = 0; capabilities[i]; i++)
+	for (i = 0; capabilities[i]; i++) {
 		if (capabilities[i] == hwcap)
 			return TRUE;
+	}
 
 	return FALSE;
 }
 
 struct hwcap_option *find_hwcap_option(int hwcap)
 {
-	struct hwcap_option *hwo;
 	int i;
 
-	hwo = NULL;
 	for (i = 0; hwcap_options[i].capability; i++) {
-		if (hwcap_options[i].capability == hwcap) {
-			hwo = &hwcap_options[i];
-			break;
-		}
+		if (hwcap_options[i].capability == hwcap)
+			return &hwcap_options[i];
 	}
 
-	return hwo;
+	return NULL;
 }
 
 void source_remove(int fd)