sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

usb: move scanned status into core 

A command should not be interested in the internal USB core state, so
move the state handling into the core.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
Sascha Hauer 2013-06-19 23:48:32 +02:00
parent 1e60cbaf63
commit 31879ed96f
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
commands/usb.c
View File

@ -22,24 +22,20 @@
#include <usb/usb.h> #include <usb/usb.h>
#include <getopt.h> #include <getopt.h>
static int scanned;
static int do_usb(int argc, char *argv[]) static int do_usb(int argc, char *argv[])
{ {
int opt; int opt;
int force = 0;
while ((opt = getopt(argc, argv, "f")) > 0) { while ((opt = getopt(argc, argv, "f")) > 0) {
switch (opt) { switch (opt) {
case 'f': case 'f':
scanned = 0; force = 1;
break; break;
} }
} }
if (!scanned) { usb_rescan(force);
usb_rescan();
scanned = 1;
}
return 0; return 0;
} }

9
drivers/usb/core/usb.c
View File

@ -488,12 +488,19 @@ static struct usb_device *usb_alloc_new_device(void)
return usbdev; return usbdev;
} }
void usb_rescan(void) static int scanned;
void usb_rescan(int force)
{ {
struct usb_device *dev, *tmp; struct usb_device *dev, *tmp;
struct usb_host *host; struct usb_host *host;
int ret; int ret;
if (scanned && !force)
return;
scanned = 1;
list_for_each_entry_safe(dev, tmp, &usb_device_list, list) { list_for_each_entry_safe(dev, tmp, &usb_device_list, list) {
list_del(&dev->list); list_del(&dev->list);
unregister_device(&dev->dev); unregister_device(&dev->dev);

2
include/usb/usb.h
View File

@ -248,7 +248,7 @@ int usb_clear_halt(struct usb_device *dev, int pipe);
int usb_string(struct usb_device *dev, int index, char *buf, size_t size); int usb_string(struct usb_device *dev, int index, char *buf, size_t size);
int usb_set_interface(struct usb_device *dev, int interface, int alternate); int usb_set_interface(struct usb_device *dev, int interface, int alternate);
void usb_rescan(void); void usb_rescan(int force);
/* big endian -> little endian conversion */ /* big endian -> little endian conversion */
/* some CPUs are already little endian e.g. the ARM920T */ /* some CPUs are already little endian e.g. the ARM920T */