Hello community, here is the log from the commit of package hwinfo checked in at Mon Nov 20 18:51:10 CET 2006. -------- --- hwinfo/hwinfo.changes 2006-11-14 15:39:46.000000000 +0100 +++ /mounts/work_src_done/STABLE/hwinfo/hwinfo.changes 2006-11-20 15:46:43.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Nov 20 15:46:36 CET 2006 - snwint@suse.de + +- sometimes usb mice were missed (#216091) + +------------------------------------------------------------------- Old: ---- hwinfo-13.14.tar.bz2 New: ---- hwinfo-13.15.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hwinfo.spec ++++++ --- /var/tmp/diff_new_pack.Wx21vL/_old 2006-11-20 18:48:05.000000000 +0100 +++ /var/tmp/diff_new_pack.Wx21vL/_new 2006-11-20 18:48:05.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package hwinfo (Version 13.14) +# spec file for package hwinfo (Version 13.15) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -20,9 +20,9 @@ PreReq: /sbin/ldconfig %insserv_prereq %fillup_prereq Autoreqprov: on Summary: Hardware Library -Version: 13.14 +Version: 13.15 Release: 1 -Source: hwinfo-13.14.tar.bz2 +Source: hwinfo-13.15.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -89,6 +89,8 @@ %doc doc/libhd/html %changelog -n hwinfo +* Mon Nov 20 2006 - snwint@suse.de +- sometimes usb mice were missed (#216091) * Tue Nov 14 2006 - snwint@suse.de - read modalias entry for macio devices (#220762) - fixed modalias matching ++++++ hwinfo-13.14.tar.bz2 -> hwinfo-13.15.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hwinfo-13.14/Changelog new/hwinfo-13.15/Changelog --- old/hwinfo-13.14/Changelog 2006-11-14 15:39:10.000000000 +0100 +++ new/hwinfo-13.15/Changelog 2006-11-20 15:29:44.000000000 +0100 @@ -1,3 +1,6 @@ +20/11/2006: v13.15 + - sometimes usb mice were missed (#216091) + 14/11/2006: v13.14 - read modalias entry for macio devices (#220762) - fixed modalias matching diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hwinfo-13.14/VERSION new/hwinfo-13.15/VERSION --- old/hwinfo-13.14/VERSION 2006-11-14 14:52:22.000000000 +0100 +++ new/hwinfo-13.15/VERSION 2006-11-20 14:35:53.000000000 +0100 @@ -1 +1 @@ -13.14 +13.15 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hwinfo-13.14/src/hd/hd.c new/hwinfo-13.15/src/hd/hd.c --- old/hwinfo-13.14/src/hd/hd.c 2006-10-19 11:57:14.000000000 +0200 +++ new/hwinfo-13.15/src/hd/hd.c 2006-11-20 15:04:50.000000000 +0100 @@ -742,6 +742,7 @@ case hw_usb: hd_set_probe_feature(hd_data, pr_usb); + hd_set_probe_feature(hd_data, pr_input); hd_set_probe_feature(hd_data, pr_isdn); // need pr_misc, too? hd_set_probe_feature(hd_data, pr_block); hd_set_probe_feature(hd_data, pr_block_mods); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hwinfo-13.14/src/hd/int.c new/hwinfo-13.15/src/hd/int.c --- old/hwinfo-13.14/src/hd/int.c 2006-10-25 12:37:46.000000000 +0200 +++ new/hwinfo-13.15/src/hd/int.c 2006-11-20 15:43:07.000000000 +0100 @@ -666,6 +666,7 @@ hd_t *hd; bios_info_t *bt = NULL; str_list_t *sl; + int is_mouse; for(hd = hd_data->hd; hd; hd = hd->next) { if( @@ -675,12 +676,26 @@ !search_str_list(hd->drivers, "usbhid") ) continue; + is_mouse = 0; + for(sl = hd->unix_dev_names; sl; sl = sl->next) { - if(strstr(sl->str, "/mice") || strstr(sl->str, "/mouse")) break; + if(strstr(sl->str, "/mice") || strstr(sl->str, "/mouse")) { + is_mouse = 1; + break; + } + } + + if(!is_mouse) { + if( + (hd->unix_dev_name && strstr(hd->unix_dev_name, "/mice")) || + (hd->unix_dev_name2 && strstr(hd->unix_dev_name2, "/mouse")) + ) { + is_mouse = 1; + } } /* not really a mouse */ - if(!sl) { + if(!is_mouse) { hd->base_class.id = 0; hd->sub_class.id = 0; hd->compat_vendor.id = 0; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hwinfo-13.14/src/hd/usb.c new/hwinfo-13.15/src/hd/usb.c --- old/hwinfo-13.14/src/hd/usb.c 2006-09-04 14:11:26.000000000 +0200 +++ new/hwinfo-13.15/src/hd/usb.c 2006-11-20 15:34:47.000000000 +0100 @@ -572,6 +572,14 @@ dev_num.minor = 63; hd->unix_dev_name = new_str(DEV_MICE); hd->unix_dev_num = dev_num; + + // make it a mouse, #216091 + if(hd->base_class.id == bc_none) { + hd->base_class.id = bc_mouse; + hd->sub_class.id = sc_mou_usb; + hd->compat_vendor.id = MAKE_ID(TAG_SPECIAL, 0x0200); + hd->compat_device.id = MAKE_ID(TAG_SPECIAL, 0x001); + } } } } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org