From 79d8b3c8b4f54e17b35cf82fc97af9d8be73d7dc Mon Sep 17 00:00:00 2001 From: Burt P Date: Fri, 27 Dec 2019 22:12:49 -0600 Subject: usb: vendor tags in list Signed-off-by: Burt P --- modules/devices/usb.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'modules/devices/usb.c') diff --git a/modules/devices/usb.c b/modules/devices/usb.c index ca4014ee..c00f3330 100644 --- a/modules/devices/usb.c +++ b/modules/devices/usb.c @@ -109,7 +109,12 @@ static void _usb_dev(const usbd *u) { manufacturer = UNKIFNULL_AC(u->manufacturer); device = UNKIFNULL_AC(u->device); - name = g_strdup_printf("%s %s", u->vendor? vendor: manufacturer, u->product? product: device); + if (u->vendors) { + gchar *ribbon = vendor_list_ribbon(u->vendors, params.fmt_opts); + name = g_strdup_printf("%s %s", ribbon, u->product? product: device); + } else { + name = g_strdup_printf("%s %s", u->vendor? vendor: manufacturer, u->product? product: device); + } key = g_strdup_printf("USB%03d:%03d:%03d", u->bus, u->dev, 0); label = g_strdup_printf("%03d:%03d", u->bus, u->dev); icon = get_usbdev_icon(u); -- cgit v1.2.3