Hello community, here is the log from the commit of package hwinfo checked in at Fri Mar 14 17:45:51 CET 2008. -------- --- hwinfo/hwinfo.changes 2008-03-06 12:25:34.000000000 +0100 +++ /mounts/work_src_done/STABLE/hwinfo/hwinfo.changes 2008-03-14 14:32:11.000000000 +0100 @@ -1,0 +2,8 @@ +Fri Mar 14 14:32:04 CET 2008 - snwint@suse.de + +- wlan detection sometimes missed network cards (bnc #368442) +- ide-cd module name changed +- make hwprobe=+udev work again +- support MS virtual network devs (bnc #359261) + +------------------------------------------------------------------- Old: ---- hwinfo-14.6.tar.bz2 New: ---- hwinfo-14.8.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hwinfo.spec ++++++ --- /var/tmp/diff_new_pack.EP5603/_old 2008-03-14 17:45:15.000000000 +0100 +++ /var/tmp/diff_new_pack.EP5603/_new 2008-03-14 17:45:15.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package hwinfo (Version 14.6) +# spec file for package hwinfo (Version 14.8) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -21,9 +21,9 @@ PreReq: /sbin/ldconfig %insserv_prereq %fillup_prereq AutoReqProv: on Summary: Hardware Library -Version: 14.6 +Version: 14.8 Release: 1 -Source: hwinfo-14.6.tar.bz2 +Source: hwinfo-14.8.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -94,6 +94,11 @@ %doc doc/libhd/html %changelog +* Fri Mar 14 2008 snwint@suse.de +- wlan detection sometimes missed network cards (bnc #368442) +- ide-cd module name changed +- make hwprobe=+udev work again +- support MS virtual network devs (bnc #359261) * Thu Mar 06 2008 snwint@suse.de - fix compilation on x86_64 * Thu Mar 06 2008 snwint@suse.de ++++++ hwinfo-14.6.tar.bz2 -> hwinfo-14.8.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hwinfo-14.6/Changelog new/hwinfo-14.8/Changelog --- old/hwinfo-14.6/Changelog 2008-03-06 11:51:10.000000000 +0100 +++ new/hwinfo-14.8/Changelog 2008-03-12 13:57:02.000000000 +0100 @@ -1,3 +1,11 @@ +11/3/2008: v14.8 + - ide-cd module name changed + - make hwprobe=+udev work again + - support MS virtual network devs (bnc #359261) + +10/3/2008: v14.7 + - wlan detection sometimes missed network cards (bnc #368442) + 6/3/2008: v14.6 - fix compilation on x86_64 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hwinfo-14.6/src/hd/block.c new/hwinfo-14.8/src/hd/block.c --- old/hwinfo-14.6/src/hd/block.c 2008-03-04 11:12:44.000000000 +0100 +++ new/hwinfo-14.8/src/hd/block.c 2008-03-11 12:26:22.000000000 +0100 @@ -54,7 +54,8 @@ if(hd_probe_feature(hd_data, pr_block_mods)) { PROGRESS(1, 0, "block modules"); - load_module(hd_data, "ide-cd"); + // load_module(hd_data, "ide-cd"); + load_module(hd_data, "ide-cd_mod"); load_module(hd_data, "ide-disk"); load_module(hd_data, "sr_mod"); load_module(hd_data, "sd_mod"); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hwinfo-14.6/src/hd/int.c new/hwinfo-14.8/src/hd/int.c --- old/hwinfo-14.6/src/hd/int.c 2008-03-04 11:16:41.000000000 +0100 +++ new/hwinfo-14.8/src/hd/int.c 2008-03-11 17:37:50.000000000 +0100 @@ -957,7 +957,7 @@ } } - if(!hd->unix_dev_name) { + if(!hd->unix_dev_name || hd_data->flags.udev) { sl = hd->unix_dev_names; if(hd_data->flags.udev) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hwinfo-14.6/src/hd/pci.c new/hwinfo-14.8/src/hd/pci.c --- old/hwinfo-14.6/src/hd/pci.c 2007-09-25 12:51:45.000000000 +0200 +++ new/hwinfo-14.8/src/hd/pci.c 2008-03-12 13:55:31.000000000 +0100 @@ -51,6 +51,7 @@ static void hd_read_vio(hd_data_t *hd_data); static void hd_read_xen(hd_data_t *hd_data); static void hd_read_ps3_system_bus(hd_data_t *hd_data); +static void hd_read_vm(hd_data_t *hd_data); static void add_mv643xx_eth(hd_data_t *hd_data, char *platform_type); static void hd_read_platform(hd_data_t *hd_data); static void hd_read_of_platform(hd_data_t *hd_data); @@ -79,18 +80,15 @@ add_pci_data(hd_data); PROGRESS(3, 0, "macio"); - hd_read_macio(hd_data); PROGRESS(4, 0, "vio"); - hd_read_vio(hd_data); PROGRESS(5, 0, "xen"); - hd_read_xen(hd_data); - PROGRESS(6, 0, "ps3"); + PROGRESS(6, 0, "ps3"); hd_read_ps3_system_bus(hd_data); PROGRESS(7, 0, "platform"); @@ -98,6 +96,9 @@ PROGRESS(8, 0, "of_platform"); hd_read_of_platform(hd_data); + + PROGRESS(9, 0, "vm"); + hd_read_vm(hd_data); } @@ -1191,5 +1192,68 @@ } +/* + * Get microsoft vm (network) data from sysfs. + */ +void hd_read_vm(hd_data_t *hd_data) +{ + int eth_cnt = 0; + hd_t *hd; + str_list_t *sf_bus, *sf_bus_e; + char *sf_dev, *drv, *drv_name; + + sf_bus = reverse_str_list(read_dir("/sys/bus/vmbus/devices", 'l')); + + if(!sf_bus) { + ADD2LOG("sysfs: no such bus: vm\n"); + return; + } + + for(sf_bus_e = sf_bus; sf_bus_e; sf_bus_e = sf_bus_e->next) { + sf_dev = new_str(hd_read_sysfs_link("/sys/bus/vmbus/devices", sf_bus_e->str)); + + ADD2LOG( + " vm device: name = %s\n path = %s\n", + sf_bus_e->str, + hd_sysfs_id(sf_dev) + ); + + drv_name = NULL; + drv = new_str(hd_read_sysfs_link(sf_dev, "driver")); + if(drv) { + drv_name = strrchr(drv, '/'); + if(drv_name) drv_name++; + } + + ADD2LOG(" driver = \"%s\"\n", drv_name); + + if( + drv_name && + !strcmp(drv_name, "netvsc") + ) { + hd = add_hd_entry(hd_data, __LINE__, 0); + hd->bus.id = bus_none; + + hd->vendor.id = MAKE_ID(TAG_SPECIAL, 0x6013); /* virtual */ + + hd->base_class.id = bc_network; + hd->sub_class.id = 0; /* ethernet */ + hd->slot = eth_cnt++; + hd->device.id = MAKE_ID(TAG_SPECIAL, 1); + str_printf(&hd->device.name, 0, "Virtual Ethernet Card %d", hd->slot); + + hd->sysfs_id = new_str(hd_sysfs_id(sf_dev)); + hd->sysfs_bus_id = new_str(sf_bus_e->str); + if(drv_name) add_str_list(&hd->drivers, drv_name); + } + + free_mem(sf_dev); + free_mem(drv); + } + + free_str_list(sf_bus); +} + + /** @} */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hwinfo-14.6/src/hd/wlan.c new/hwinfo-14.8/src/hd/wlan.c --- old/hwinfo-14.6/src/hd/wlan.c 2007-08-28 16:10:07.000000000 +0200 +++ new/hwinfo-14.8/src/hd/wlan.c 2008-03-10 12:40:59.000000000 +0100 @@ -139,8 +139,12 @@ for(hd = hd_data->hd; hd; hd = hd->next) { if( - hd->base_class.id == bc_network && - hd->unix_dev_name ) { + ( + hd_is_hw_class(hd, hw_network_ctrl) || + hd->base_class.id == bc_network + ) && + hd->unix_dev_name + ) { /* Get list of frequencies / channels */ if(iw_get_range_info(skfd, hd->unix_dev_name, &range) < 0) { /* this failed, maybe device does not support wireless extensions */ @@ -149,6 +153,7 @@ ADD2LOG("*** device %s is wireless ***\n", hd->unix_dev_name); hd->is.wlan = 1; + hd->base_class.id = bc_network; hd->sub_class.id = 0x82; /* wlan */ res = new_mem(sizeof *res); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hwinfo-14.6/src/ids/src/special new/hwinfo-14.8/src/ids/src/special --- old/hwinfo-14.6/src/ids/src/special 2008-03-04 11:18:45.000000000 +0100 +++ new/hwinfo-14.8/src/ids/src/special 2008-03-12 14:17:43.000000000 +0100 @@ -662,6 +662,14 @@ &device.id special 0x0001 +driver.module.modprobe kveth2 +# vm network & storage + vendor.id special 0x6013 ++vendor.name Virtual + + vendor.id special 0x6013 +&device.id special 0x0001 ++driver.module.modprobe netvsc + # internal: usb scanner driver list vendor.id special 0xf000 &device.id special 0x0001 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hwinfo-14.6/VERSION new/hwinfo-14.8/VERSION --- old/hwinfo-14.6/VERSION 2008-03-06 11:50:42.000000000 +0100 +++ new/hwinfo-14.8/VERSION 2008-03-14 14:31:50.000000000 +0100 @@ -1 +1 @@ -14.6 +14.8 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org