aboutsummaryrefslogtreecommitdiff
path: root/modules/devices
diff options
context:
space:
mode:
authorBurt P <pburt0@gmail.com>2017-09-10 12:10:19 -0500
committerLeandro A. F. Pereira <leandro@hardinfo.org>2018-03-12 09:20:16 -0700
commit6f0a3e0f85fd439fabfc1b8f64b01d93151cff3c (patch)
treee2156c1d91d77edd37a721545e910b91c6a8d4cf /modules/devices
parentfdb1a05b6b5c84b67e3df107288f5046b763647e (diff)
usb: requested changes
Signed-off-by: Burt P <pburt0@gmail.com>
Diffstat (limited to 'modules/devices')
-rw-r--r--modules/devices/usb.c16
1 files changed, 7 insertions, 9 deletions
diff --git a/modules/devices/usb.c b/modules/devices/usb.c
index 27b3c13e..cad52fd4 100644
--- a/modules/devices/usb.c
+++ b/modules/devices/usb.c
@@ -28,7 +28,7 @@
gchar *usb_list = NULL;
-void __scan_usb_sysfs_add_device(gchar * endpoint, int n)
+static void __scan_usb_sysfs_add_device(gchar * endpoint, int n)
{
gchar *manufacturer, *product, *mxpwr, *tmp, *strhash;
gint bus, classid, vendor, prodid;
@@ -100,7 +100,7 @@ void __scan_usb_sysfs_add_device(gchar * endpoint, int n)
g_free(mxpwr);
}
-gboolean __scan_usb_sysfs(void)
+static gboolean __scan_usb_sysfs(void)
{
GDir *sysfs;
gchar *filename;
@@ -136,7 +136,7 @@ gboolean __scan_usb_sysfs(void)
return usb_device_number > 0;
}
-gboolean __scan_usb_procfs(void)
+static gboolean __scan_usb_procfs(void)
{
FILE *dev;
gchar buffer[128];
@@ -260,7 +260,7 @@ gboolean __scan_usb_procfs(void)
}
-void __scan_usb_lsusb_add_device(char *buffer, int bufsize, FILE * lsusb, int usb_device_number)
+static void __scan_usb_lsusb_add_device(char *buffer, int bufsize, FILE * lsusb, int usb_device_number)
{
gint bus, device, vendor_id, product_id;
gchar *version = NULL, *product = NULL, *vendor = NULL, *dev_class = NULL, *int_class = NULL;
@@ -367,7 +367,7 @@ void __scan_usb_lsusb_add_device(char *buffer, int bufsize, FILE * lsusb, int us
g_free(name);
}
-gboolean __scan_usb_lsusb(void)
+static gboolean __scan_usb_lsusb(void)
{
static gchar *lsusb_path = NULL;
int usb_device_number = 0;
@@ -429,7 +429,7 @@ gboolean __scan_usb_lsusb(void)
#define UNKIFNULL_AC(f) (f != NULL) ? f : _("(Unknown)");
-void _usb_dev(const usbd *u) {
+static void _usb_dev(const usbd *u) {
gchar *name, *key, *v_str, *str;
gchar *product, *vendor, *dev_class_str, *dev_subclass_str; /* don't free */
@@ -482,7 +482,7 @@ void _usb_dev(const usbd *u) {
g_free(key);
}
-gboolean __scan_usb_util(void) {
+static gboolean __scan_usb_util(void) {
usbd *list = usb_get_device_list();
usbd *curr = list;
@@ -496,8 +496,6 @@ gboolean __scan_usb_util(void) {
usb_list = g_strdup_printf("[%s]\n", _("USB Devices"));
while(curr) {
- //printf("USB: Bus %03d Dev %03d Ven %04x Prod %04x %s %s\n",
- // curr->bus, curr->dev, curr->vendor_id, curr->product_id, curr->vendor, curr->product);
_usb_dev(curr);
c++;
curr=curr->next;