* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "sigrok-cli.h"
-#include "config.h"
+#include <config.h>
#include <glib.h>
#include <string.h>
-
-extern struct sr_context *sr_ctx;
+#include "sigrok-cli.h"
static void free_drvopts(struct sr_config *src)
{
int i;
if (opt_drv) {
+ /* Caller specified driver. Use it. Only this one. */
if (!parse_driver(opt_drv, &driver, &drvopts))
return NULL;
devices = sr_driver_scan(driver, drvopts);
g_slist_free_full(drvopts, (GDestroyNotify)free_drvopts);
+ } else if (opt_dont_scan) {
+ /* No -d choice, and -D "don't scan" requested. Do nothing. */
+ devices = NULL;
} else {
- /* No driver specified, let them all scan on their own. */
+ /* No driver specified. Scan all available drivers. */
devices = NULL;
- drivers = sr_driver_list();
+ drivers = sr_driver_list(sr_ctx);
for (i = 0; drivers[i]; i++) {
driver = drivers[i];
if (sr_driver_init(sr_ctx, driver) != SR_OK) {
struct sr_channel_group *select_channel_group(struct sr_dev_inst *sdi)
{
struct sr_channel_group *cg;
- GSList *l;
+ GSList *l, *channel_groups;
if (!opt_channel_group)
return NULL;
- if (!sdi->channel_groups) {
+ channel_groups = sr_dev_inst_channel_groups_get(sdi);
+
+ if (!channel_groups) {
g_critical("This device does not have any channel groups.");
return NULL;
}
- for (l = sdi->channel_groups; l; l = l->next) {
+ for (l = channel_groups; l; l = l->next) {
cg = l->data;
- if (!strcasecmp(opt_channel_group, cg->name)) {
+ if (!g_ascii_strcasecmp(opt_channel_group, cg->name)) {
return cg;
}
}
return NULL;
}
-