diff options
| author | Bdale Garbee <bdale@gag.com> | 2015-07-15 16:43:50 -0600 | 
|---|---|---|
| committer | Bdale Garbee <bdale@gag.com> | 2015-07-15 16:43:50 -0600 | 
| commit | 643c2fb03833d658320f476ef731bbb06fe3cc31 (patch) | |
| tree | 878c9df5dbd9bab9169becea4e06e8bae3529541 /ao-tools/lib/cc-usbdev.c | |
| parent | e41786fb384892961a6547e17812a24314ce9623 (diff) | |
| parent | 271f56a41c7e785b0fab7e572325df842d104277 (diff) | |
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
Diffstat (limited to 'ao-tools/lib/cc-usbdev.c')
| -rw-r--r-- | ao-tools/lib/cc-usbdev.c | 6 | 
1 files changed, 3 insertions, 3 deletions
diff --git a/ao-tools/lib/cc-usbdev.c b/ao-tools/lib/cc-usbdev.c index 95bfa244..6c3ba591 100644 --- a/ao-tools/lib/cc-usbdev.c +++ b/ao-tools/lib/cc-usbdev.c @@ -219,7 +219,7 @@ is_am(int idVendor, int idProduct) {  }  struct cc_usbdevs * -cc_usbdevs_scan(void) +cc_usbdevs_scan(int non_tty)  {  	int			e;  	struct dirent		**ents; @@ -241,7 +241,7 @@ cc_usbdevs_scan(void)  		dir = cc_fullname(USB_DEVICES, ents[e]->d_name);  		dev = usb_scan_device(dir);  		free(dir); -		if (is_am(dev->idVendor, dev->idProduct) && dev->tty) { +		if (is_am(dev->idVendor, dev->idProduct) && (non_tty || dev->tty)) {  			if (devs->dev)  				devs->dev = realloc(devs->dev,  						    (devs->ndev + 1) * sizeof (struct usbdev *)); @@ -274,7 +274,7 @@ match_dev(char *product, int serial)  	int			i;  	char			*tty = NULL; -	devs = cc_usbdevs_scan(); +	devs = cc_usbdevs_scan(FALSE);  	if (!devs)  		return NULL;  	for (i = 0; i < devs->ndev; i++) {  | 
