Commit aa3ecb91 authored by Yuyang Du's avatar Yuyang Du Committed by Greg Kroah-Hartman

usb: usbip tool: Add ncontrollers in vhci_driver structure

A new field ncontrollers is added to the vhci_driver structure.
And this field is stored by scanning the vhci_hcd* dirs in the
platform udev.
Suggested-and-reviewed-by: default avatarKrzysztof Opasiak <k.opasiak@samsung.com>
Signed-off-by: default avatarYuyang Du <yuyang.du@intel.com>
Acked-by: default avatarShuah Khan <shuahkh@osg.samsung.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c3509715
......@@ -7,6 +7,7 @@
#include <limits.h>
#include <netdb.h>
#include <libudev.h>
#include <dirent.h>
#include "sysfs_utils.h"
#undef PROGNAME
......@@ -134,6 +135,33 @@ static int get_nports(void)
return (int)strtoul(attr_nports, NULL, 10);
}
static int vhci_hcd_filter(const struct dirent *dirent)
{
return strcmp(dirent->d_name, "vhci_hcd") >= 0;
}
static int get_ncontrollers(void)
{
struct dirent **namelist;
struct udev_device *platform;
int n;
platform = udev_device_get_parent(vhci_driver->hc_device);
if (platform == NULL)
return -1;
n = scandir(udev_device_get_syspath(platform), &namelist, vhci_hcd_filter, NULL);
if (n < 0)
err("scandir failed");
else {
for (int i = 0; i < n; i++)
free(namelist[i]);
free(namelist);
}
return n;
}
/*
* Read the given port's record.
*
......@@ -230,6 +258,14 @@ int usbip_vhci_driver_open(void)
goto err;
}
vhci_driver->ncontrollers = get_ncontrollers();
dbg("available controllers: %d", vhci_driver->ncontrollers);
if (vhci_driver->ncontrollers <=0) {
err("no available usb controllers");
goto err;
}
if (refresh_imported_device_list())
goto err;
......
......@@ -31,6 +31,7 @@ struct usbip_vhci_driver {
/* /sys/devices/platform/vhci_hcd */
struct udev_device *hc_device;
int ncontrollers;
int nports;
struct usbip_imported_device idev[MAXNPORT];
};
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment