From: Uwe Hermann Date: Wed, 22 Feb 2012 20:48:30 +0000 (+0100) Subject: sr: No need for dynamic hardware driver registration. X-Git-Tag: libsigrok-0.1.0~102 X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=commitdiff_plain;h=050e9219d6bca0d6f986dca07fc2c501295c5bde sr: No need for dynamic hardware driver registration. We don't need or allow run-time registration of hardware drivers/plugins, they're added at compile-time. --- diff --git a/backend.c b/backend.c index b60bce8b..e67f4824 100644 --- a/backend.c +++ b/backend.c @@ -28,7 +28,7 @@ */ SR_API int sr_init(void) { - return sr_hw_load_all(); + return SR_OK; } /** diff --git a/device.c b/device.c index 9cc3b680..eb2e2b4c 100644 --- a/device.c +++ b/device.c @@ -59,10 +59,11 @@ static GSList *devs = NULL; */ SR_API int sr_dev_scan(void) { - GSList *plugins, *l; - struct sr_dev_plugin *plugin; + int i; + struct sr_dev_plugin **plugins; - if (!(plugins = sr_hw_list())) { + plugins = sr_hw_list(); + if (!plugins[0]) { sr_err("dev: %s: no supported devices/hwplugins", __func__); return SR_ERR; /* TODO: More specific error? */ } @@ -72,11 +73,8 @@ SR_API int sr_dev_scan(void) * a firmware upload and associated delay, we may as well get all * of these out of the way first. */ - for (l = plugins; l; l = l->next) { - plugin = l->data; - /* TODO: Handle 'plugin' being NULL. */ - sr_hw_init(plugin); - } + for (i = 0; plugins[i]; i++) + sr_hw_init(plugins[i]); return SR_OK; } diff --git a/hwplugin.c b/hwplugin.c index b924f0d6..37d98e5d 100644 --- a/hwplugin.c +++ b/hwplugin.c @@ -26,9 +26,6 @@ #include "sigrok.h" #include "sigrok-internal.h" -/* The list of loaded plugins lives here. */ -static GSList *plugins; - /* * This enumerates which plugin capabilities correspond to user-settable * options. @@ -43,62 +40,57 @@ SR_API struct sr_hwcap_option sr_hwcap_options[] = { }; #ifdef HAVE_LA_DEMO -extern struct sr_dev_plugin demo_plugin_info; +extern SR_PRIV struct sr_dev_plugin demo_plugin_info; #endif #ifdef HAVE_LA_SALEAE_LOGIC -extern struct sr_dev_plugin saleae_logic_plugin_info; +extern SR_PRIV struct sr_dev_plugin saleae_logic_plugin_info; #endif #ifdef HAVE_LA_OLS -extern struct sr_dev_plugin ols_plugin_info; +extern SR_PRIV struct sr_dev_plugin ols_plugin_info; #endif #ifdef HAVE_LA_ZEROPLUS_LOGIC_CUBE -extern struct sr_dev_plugin zeroplus_logic_cube_plugin_info; +extern SR_PRIV struct sr_dev_plugin zeroplus_logic_cube_plugin_info; #endif #ifdef HAVE_LA_ASIX_SIGMA -extern struct sr_dev_plugin asix_sigma_plugin_info; +extern SR_PRIV struct sr_dev_plugin asix_sigma_plugin_info; #endif #ifdef HAVE_LA_CHRONOVU_LA8 -extern SR_PRIV struct dev_plugin chronovu_la8_plugin_info; +extern SR_PRIV struct sr_dev_plugin chronovu_la8_plugin_info; #endif #ifdef HAVE_LA_LINK_MSO19 -extern struct sr_dev_plugin link_mso19_plugin_info; +extern SR_PRIV struct sr_dev_plugin link_mso19_plugin_info; #endif #ifdef HAVE_LA_ALSA -extern struct sr_dev_plugin alsa_plugin_info; +extern SR_PRIV struct sr_dev_plugin alsa_plugin_info; #endif -/* TODO: No linked list needed, this can be a simple array. */ -SR_PRIV int sr_hw_load_all(void) -{ +static struct sr_dev_plugin *plugins_list[] = { #ifdef HAVE_LA_DEMO - plugins = g_slist_append(plugins, (gpointer *)&demo_plugin_info); + &demo_plugin_info, #endif #ifdef HAVE_LA_SALEAE_LOGIC - plugins = - g_slist_append(plugins, (gpointer *)&saleae_logic_plugin_info); + &saleae_logic_plugin_info, #endif #ifdef HAVE_LA_OLS - plugins = g_slist_append(plugins, (gpointer *)&ols_plugin_info); + &ols_plugin_info, #endif #ifdef HAVE_LA_ZEROPLUS_LOGIC_CUBE - plugins = g_slist_append(plugins, - (gpointer *)&zeroplus_logic_cube_plugin_info); + &zeroplus_logic_cube_plugin_info, #endif #ifdef HAVE_LA_ASIX_SIGMA - plugins = g_slist_append(plugins, (gpointer *)&asix_sigma_plugin_info); + &asix_sigma_plugin_info, #endif #ifdef HAVE_LA_CHRONOVU_LA8 - plugins = g_slist_append(plugins, (gpointer *)&chronovu_la8_plugin_info); + &chronovu_la8_plugin_info, #endif #ifdef HAVE_LA_LINK_MSO19 - plugins = g_slist_append(plugins, (gpointer *)&link_mso19_plugin_info); + &link_mso19_plugin_info, #endif #ifdef HAVE_LA_ALSA - plugins = g_slist_append(plugins, (gpointer *)&alsa_plugin_info); + &alsa_plugin_info, #endif - - return SR_OK; -} + NULL, +}; /** * Return the list of loaded hardware plugins. @@ -106,11 +98,11 @@ SR_PRIV int sr_hw_load_all(void) * 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. + * @return Pointer to the NULL-terminated list of hardware plugin pointers. */ -SR_API GSList *sr_hw_list(void) +SR_API struct sr_dev_plugin **sr_hw_list(void) { - return plugins; + return plugins_list; } /** @@ -155,13 +147,13 @@ SR_API int sr_hw_init(struct sr_dev_plugin *plugin) SR_PRIV void sr_hw_cleanup_all(void) { - struct sr_dev_plugin *plugin; - GSList *l; + int i; + struct sr_dev_plugin **plugins; - for (l = plugins; l; l = l->next) { - plugin = l->data; - if (plugin->cleanup) - plugin->cleanup(); + plugins = sr_hw_list(); + for (i = 0; plugins[i]; i++) { + if (plugins[i]->cleanup) + plugins[i]->cleanup(); } } diff --git a/sigrok-internal.h b/sigrok-internal.h index 1a297f99..f0032e98 100644 --- a/sigrok-internal.h +++ b/sigrok-internal.h @@ -76,7 +76,6 @@ SR_PRIV int sr_err(const char *format, ...); /*--- hwplugin.c ------------------------------------------------------------*/ -SR_PRIV int sr_hw_load_all(void); SR_PRIV void sr_hw_cleanup_all(void); /*--- session.c -------------------------------------------------------------*/ diff --git a/sigrok-proto.h b/sigrok-proto.h index 4c96d30d..d5f1c0cd 100644 --- a/sigrok-proto.h +++ b/sigrok-proto.h @@ -71,7 +71,7 @@ SR_API int sr_filter_probes(int in_unitsize, int out_unitsize, /*--- hwplugin.c ------------------------------------------------------------*/ -SR_API GSList *sr_hw_list(void); +SR_API struct sr_dev_plugin **sr_hw_list(void); SR_API int sr_hw_init(struct sr_dev_plugin *plugin); SR_API gboolean sr_hw_has_hwcap(struct sr_dev_plugin *plugin, int hwcap); SR_API struct sr_hwcap_option *sr_hw_hwcap_get(int hwcap);