Hello community, here is the log from the commit of package hwinfo checked in at Thu Nov 20 15:26:08 CET 2008. -------- --- hwinfo/hwinfo.changes 2008-11-18 11:25:43.000000000 +0100 +++ /mounts/work_src_done/STABLE/hwinfo/hwinfo.changes 2008-11-19 11:09:31.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Nov 19 11:09:24 CET 2008 - snwint@suse.de + +- only avoid mouse/modem detection on usb->serial adapter (bnc #408715) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- hwinfo-15.16.tar.bz2 New: ---- hwinfo-15.17.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hwinfo.spec ++++++ --- /var/tmp/diff_new_pack.D17011/_old 2008-11-20 15:25:16.000000000 +0100 +++ /var/tmp/diff_new_pack.D17011/_new 2008-11-20 15:25:16.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package hwinfo (Version 15.16) +# spec file for package hwinfo (Version 15.17) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -28,9 +28,9 @@ PreReq: /sbin/ldconfig %insserv_prereq %fillup_prereq AutoReqProv: on Summary: Hardware Library -Version: 15.16 +Version: 15.17 Release: 1 -Source: hwinfo-15.16.tar.bz2 +Source: hwinfo-15.17.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -102,6 +102,8 @@ %doc doc/libhd/html %changelog +* Wed Nov 19 2008 snwint@suse.de +- only avoid mouse/modem detection on usb->serial adapter (bnc #408715) * Tue Nov 18 2008 snwint@suse.de - map video memory for vbe calls (bnc #441802) * Mon Nov 17 2008 snwint@suse.de ++++++ hwinfo-15.16.tar.bz2 -> hwinfo-15.17.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hwinfo-15.16/Changelog new/hwinfo-15.17/Changelog --- old/hwinfo-15.16/Changelog 2008-11-18 11:13:39.000000000 +0100 +++ new/hwinfo-15.17/Changelog 2008-11-18 17:19:50.000000000 +0100 @@ -1,3 +1,6 @@ +18/11/2008: v15.17 + - only avoid mouse/modem detection on usb->serial adapter (bnc #408715) + 18/11/2008: v15.16 - map video memory for vbe calls (bnc #441802) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hwinfo-15.16/src/hd/braille.c new/hwinfo-15.17/src/hd/braille.c --- old/hwinfo-15.16/src/hd/braille.c 2008-05-16 14:16:05.000000000 +0200 +++ new/hwinfo-15.17/src/hd/braille.c 2008-11-18 17:17:07.000000000 +0100 @@ -49,7 +49,7 @@ hd->base_class.id == bc_comm && hd->sub_class.id == sc_com_ser && hd->unix_dev_name && - !hd->tag.ser_skip && + !hd->tag.skip_braille && !has_something_attached(hd_data, hd) ) { cnt++; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hwinfo-15.16/src/hd/hd.h new/hwinfo-15.17/src/hd/hd.h --- old/hwinfo-15.16/src/hd/hd.h 2008-11-18 11:13:53.000000000 +0100 +++ new/hwinfo-15.17/src/hd/hd.h 2008-11-18 17:20:03.000000000 +0100 @@ -2472,7 +2472,9 @@ unsigned remove:1; /**< schedule for removal */ unsigned freeit:1; /**< for internal memory management */ unsigned fixed:1; /**< fixed, do no longer modify this entry */ - unsigned ser_skip:1; /**< if serial line, don't scan for devices */ + unsigned skip_mouse:1; /**< if serial line, don't scan for mice */ + unsigned skip_modem:1; /**< if serial line, don't scan for modems */ + unsigned skip_braille:1; /**< if serial line, don't scan for braille devices */ unsigned ser_device:2; /**< if != 0: info about attached serial device; see serial.c */ } tag; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hwinfo-15.16/src/hd/hdp.c new/hwinfo-15.17/src/hd/hdp.c --- old/hwinfo-15.16/src/hd/hdp.c 2008-07-16 14:41:53.000000000 +0200 +++ new/hwinfo-15.17/src/hd/hdp.c 2008-11-18 17:15:39.000000000 +0100 @@ -506,8 +506,13 @@ #endif } - if(h->tag.ser_skip) { - dump_line_str("Tags: ser_skip\n"); + if(h->tag.skip_mouse || h->tag.skip_modem || h->tag.skip_braille) { + dump_line_str("Tags:"); + i = 0; + if(h->tag.skip_mouse) dump_line0("%s mouse", i++ ? "," : ""); + if(h->tag.skip_modem) dump_line0("%s modem", i++ ? "," : ""); + if(h->tag.skip_braille) dump_line0("%s braille", i++ ? "," : ""); + dump_line0("\n"); } if( diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hwinfo-15.16/src/hd/modem.c new/hwinfo-15.17/src/hd/modem.c --- old/hwinfo-15.16/src/hd/modem.c 2006-08-29 16:15:38.000000000 +0200 +++ new/hwinfo-15.17/src/hd/modem.c 2008-11-18 17:16:15.000000000 +0100 @@ -164,7 +164,7 @@ ( hd->base_class.id == bc_comm && hd->sub_class.id == sc_com_ser && - !hd->tag.ser_skip && + !hd->tag.skip_modem && hd->tag.ser_device != 2 && /* cf. serial.c */ !has_something_attached(hd_data, hd) ) || diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hwinfo-15.16/src/hd/mouse.c new/hwinfo-15.17/src/hd/mouse.c --- old/hwinfo-15.16/src/hd/mouse.c 2006-08-29 16:15:38.000000000 +0200 +++ new/hwinfo-15.17/src/hd/mouse.c 2008-11-18 17:16:55.000000000 +0100 @@ -391,7 +391,7 @@ hd->base_class.id == bc_comm && hd->sub_class.id == sc_com_ser && hd->unix_dev_name && - !hd->tag.ser_skip && + !hd->tag.skip_mouse && !has_something_attached(hd_data, hd) ) { if((fd = open(hd->unix_dev_name, O_RDWR | O_NONBLOCK)) >= 0) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hwinfo-15.16/src/hd/serial.c new/hwinfo-15.17/src/hd/serial.c --- old/hwinfo-15.16/src/hd/serial.c 2006-08-29 16:15:38.000000000 +0200 +++ new/hwinfo-15.17/src/hd/serial.c 2008-11-18 17:12:42.000000000 +0100 @@ -83,7 +83,7 @@ str_printf(&hd->unix_dev_name, 0, "/dev/ttyS%u", ser->line); for(i = 0; i < (int) skip_devs; i++) { if(!strcmp(skip_dev[i], hd->unix_dev_name)) { - hd->tag.ser_skip = 1; + hd->tag.skip_mouse = hd->tag.skip_modem = hd->tag.skip_braille = 1; break; } } @@ -127,7 +127,7 @@ ser->port >= res2->io.base && ser->port < res2->io.base + res2->io.range ) { - hd->tag.ser_skip = 1; + hd->tag.skip_mouse = hd->tag.skip_modem = hd->tag.skip_braille = 1; } } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hwinfo-15.16/src/hd/usb.c new/hwinfo-15.17/src/hd/usb.c --- old/hwinfo-15.16/src/hd/usb.c 2008-10-01 15:34:10.000000000 +0200 +++ new/hwinfo-15.17/src/hd/usb.c 2008-11-18 17:13:08.000000000 +0100 @@ -903,7 +903,7 @@ hd->vendor.id == MAKE_ID(TAG_USB, 0x0403) && hd->device.id == MAKE_ID(TAG_USB, 0x6001) ) { - hd->tag.ser_skip = 1; + hd->tag.skip_mouse = hd->tag.skip_modem = 1; } } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hwinfo-15.16/VERSION new/hwinfo-15.17/VERSION --- old/hwinfo-15.16/VERSION 2008-11-18 11:12:57.000000000 +0100 +++ new/hwinfo-15.17/VERSION 2008-11-18 17:17:59.000000000 +0100 @@ -1 +1 @@ -15.16 +15.17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org