Hello community, here is the log from the commit of package hwinfo for openSUSE:Factory checked in at 2018-04-26 13:33:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hwinfo (Old) and /work/SRC/openSUSE:Factory/.hwinfo.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "hwinfo" Thu Apr 26 13:33:16 2018 rev:159 rq:599222 version:21.53 Changes: -------- --- /work/SRC/openSUSE:Factory/hwinfo/hwinfo.changes 2018-02-13 10:24:26.087834904 +0100 +++ /work/SRC/openSUSE:Factory/.hwinfo.new/hwinfo.changes 2018-04-26 13:33:17.698494132 +0200 @@ -1,0 +2,8 @@ +Fri Apr 20 09:55:58 UTC 2018 - [email protected] + +- merge gh#openSUSE/hwinfo#60 +- detect usb controller in ARM platform device (bsc#1072450) +- add xhci interface constant +- 21.53 + +-------------------------------------------------------------------- Old: ---- hwinfo-21.52.tar.xz New: ---- hwinfo-21.53.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hwinfo.spec ++++++ --- /var/tmp/diff_new_pack.Xv3NAs/_old 2018-04-26 13:33:18.186476253 +0200 +++ /var/tmp/diff_new_pack.Xv3NAs/_new 2018-04-26 13:33:18.190476107 +0200 @@ -36,7 +36,7 @@ License: GPL-2.0+ Group: Hardware/Other Url: http://gitorious.org/opensuse/hwinfo -Version: 21.52 +Version: 21.53 Release: 0 Source: %{name}-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ hwinfo-21.52.tar.xz -> hwinfo-21.53.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-21.52/VERSION new/hwinfo-21.53/VERSION --- old/hwinfo-21.52/VERSION 2018-02-09 13:16:10.000000000 +0100 +++ new/hwinfo-21.53/VERSION 2018-04-20 11:55:58.000000000 +0200 @@ -1 +1 @@ -21.52 +21.53 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-21.52/changelog new/hwinfo-21.53/changelog --- old/hwinfo-21.52/changelog 2018-02-09 13:16:10.000000000 +0100 +++ new/hwinfo-21.53/changelog 2018-04-20 11:55:58.000000000 +0200 @@ -1,3 +1,7 @@ +2018-04-11: 21.53 + - add xhci interface constant + - detect usb controller in ARM platform device (bsc #1072450) + 2018-02-09: 21.52 - add another sanity check on scsi serial id (bsc #1078511) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-21.52/src/hd/hd.h new/hwinfo-21.53/src/hd/hd.h --- old/hwinfo-21.52/src/hd/hd.h 2018-02-09 13:16:10.000000000 +0100 +++ new/hwinfo-21.53/src/hd/hd.h 2018-04-20 11:55:58.000000000 +0200 @@ -20,7 +20,7 @@ /** Interface version */ #define HD_VERSION 21 -#define HD_MINOR_VERSION 52 +#define HD_MINOR_VERSION 53 #define HD_FULL_VERSION (HD_VERSION * 1000 + HD_MINOR_VERSION) /** @@ -278,7 +278,7 @@ /** prog_if's of sc_ser_usb */ typedef enum pif_usb_e { - pif_usb_uhci = 0, pif_usb_ohci = 0x10, pif_usb_ehci = 0x20, + pif_usb_uhci = 0, pif_usb_ohci = 0x10, pif_usb_ehci = 0x20, pif_usb_xhci = 0x30, pif_usb_other = 0x80, pif_usb_device = 0xfe } hd_pif_usb_t; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-21.52/src/hd/pci.c new/hwinfo-21.53/src/hd/pci.c --- old/hwinfo-21.52/src/hd/pci.c 2018-02-09 13:16:10.000000000 +0100 +++ new/hwinfo-21.53/src/hd/pci.c 2018-04-20 11:55:58.000000000 +0200 @@ -934,7 +934,7 @@ str_list_t *sf_bus, *sf_bus_e, *sf_eth_dev = NULL; char *sf_dev, *sf_eth_net; int mv643xx_eth_seen = 0; - int is_net, is_storage, is_usb; + int is_net, is_storage, is_usb, is_xhci; hd_t *hd; sf_bus = read_dir("/sys/bus/platform/devices", 'l'); @@ -971,9 +971,11 @@ is_net = sf_eth_net && sf_eth_dev; is_storage = device_type && !strcmp(device_type, "sata"); is_usb = device_type && (!strcmp(device_type, "usb") || !strcmp(device_type, "dwusb")); + is_xhci = platform_type && strstr(platform_type, ":xhci-hcd"); if(is_net) ADD2LOG(" is net: sf_eth_net = %s\n", sf_eth_net); if(is_storage) ADD2LOG(" is storage\n"); if(is_usb) ADD2LOG(" is usb\n"); + if(is_xhci) ADD2LOG(" is xhci\n"); free_mem(sf_eth_net); free_str_list(sf_eth_dev); if( @@ -1006,12 +1008,18 @@ s = hd_sysfs_find_driver(hd_data, hd->sysfs_id, 1); if(s) add_str_list(&hd->drivers, s); } - else if(is_usb) { + else if(is_usb || is_xhci) { hd = add_hd_entry(hd_data, __LINE__, 0); hd->base_class.id = bc_serial; hd->sub_class.id = sc_ser_usb; - str_printf(&hd->device.name, 0, "ARM USB %d", hd->slot); + if(is_xhci) { + hd->prog_if.id = pif_usb_xhci; + str_printf(&hd->device.name, 0, "ARM USB XHCI Controller"); + } + else { + str_printf(&hd->device.name, 0, "ARM USB %d", hd->slot); + } hd->modalias = new_str(platform_type); hd->sysfs_id = new_str(hd_sysfs_id(sf_dev)); hd->sysfs_bus_id = new_str(sf_bus_e->str);
