Hello community, here is the log from the commit of package hwinfo checked in at Thu Mar 6 01:22:17 CET 2008. -------- --- hwinfo/hwinfo.changes 2008-03-03 18:00:58.000000000 +0100 +++ hwinfo/hwinfo.changes 2008-03-04 11:32:12.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Mar 4 11:32:06 CET 2008 - snwint@suse.de + +- detect vmware mouse (bnc #358460) + +------------------------------------------------------------------- Old: ---- hwinfo-14.3.tar.bz2 New: ---- hwinfo-14.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hwinfo.spec ++++++ --- /var/tmp/diff_new_pack.s29627/_old 2008-03-06 01:21:35.000000000 +0100 +++ /var/tmp/diff_new_pack.s29627/_new 2008-03-06 01:21:35.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package hwinfo (Version 14.3) +# spec file for package hwinfo (Version 14.4) # # 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.3 +Version: 14.4 Release: 1 -Source: hwinfo-14.3.tar.bz2 +Source: hwinfo-14.4.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -94,6 +94,8 @@ %doc doc/libhd/html %changelog +* Tue Mar 04 2008 snwint@suse.de +- detect vmware mouse (bnc #358460) * Mon Mar 03 2008 snwint@suse.de - hal: info.bus -> info.subsystem - detect virtualbox mouse (bnc #358460) ++++++ hwinfo-14.3.tar.bz2 -> hwinfo-14.4.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hwinfo-14.3/Changelog new/hwinfo-14.4/Changelog --- old/hwinfo-14.3/Changelog 2008-03-03 17:59:58.000000000 +0100 +++ new/hwinfo-14.4/Changelog 2008-03-04 11:17:04.000000000 +0100 @@ -1,3 +1,6 @@ +4/3/2008: v14.4 + - detect vmware mouse (bnc #358460) + 3/3/2008: v14.3 - hal: info.bus -> info.subsystem - detect virtualbox mouse (bnc #358460) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hwinfo-14.3/src/hd/block.c new/hwinfo-14.4/src/hd/block.c --- old/hwinfo-14.3/src/hd/block.c 2007-09-04 16:30:10.000000000 +0200 +++ new/hwinfo-14.4/src/hd/block.c 2008-03-04 11:12:44.000000000 +0100 @@ -823,7 +823,7 @@ hd_report_this(hd_data, hd) && hd->unix_dev_name && hd->sub_class.id == sc_sdev_cdrom && - hd_data->in_vmware != 1 /* VMWare doesn't like it */ + !hd_data->flags.vmware /* VMWare doesn't like it */ ) { PROGRESS(5, 0, hd->unix_dev_name); fd = open(hd->unix_dev_name, O_RDONLY | O_NONBLOCK); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hwinfo-14.3/src/hd/hd.h new/hwinfo-14.4/src/hd/hd.h --- old/hwinfo-14.3/src/hd/hd.h 2008-03-03 17:30:25.000000000 +0100 +++ new/hwinfo-14.4/src/hd/hd.h 2008-03-04 11:13:22.000000000 +0100 @@ -2603,6 +2603,7 @@ unsigned nowpa:1; /**< no longer used */ unsigned pata:1; /**< use new libata modules instead of classical ide modules */ unsigned vbox:1; /**< running in virtual box */ + unsigned vmware:1; /**< running in vmware */ } flags; @@ -2651,7 +2652,6 @@ str_list_t *xtra_hd; /**< (Internal) fake hd entries (for testing) */ devtree_t *devtree; /**< (Internal) prom device tree on ppc */ unsigned kernel_version; /**< (Internal) kernel version */ - int in_vmware; /**< (Internal) running in vmware */ hd_t *manual; /**< (Internal) hardware config info */ str_list_t *disks; /**< (Internal) disks according to /proc/partitions */ str_list_t *partitions; /**< (Internal) dto, partitions */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hwinfo-14.3/src/hd/int.c new/hwinfo-14.4/src/hd/int.c --- old/hwinfo-14.3/src/hd/int.c 2008-03-03 17:46:22.000000000 +0100 +++ new/hwinfo-14.4/src/hd/int.c 2008-03-04 11:16:41.000000000 +0100 @@ -715,20 +715,27 @@ } #endif - if(hd_data->flags.vbox) { + if(hd_data->flags.vbox || hd_data->flags.vmware) { for(hd = hd_data->hd; hd; hd = hd->next) { if( hd->base_class.id == bc_mouse && hd->sub_class.id == sc_mou_ps2 && - hd->vendor.id == 2 && - hd->device.id == 6 + hd->vendor.id == 2 ) { - hd->vendor.name = free_mem(hd->vendor.name); - hd->device.name = free_mem(hd->device.name); - hd->vendor.id = MAKE_ID(TAG_SPECIAL, 0x80ee); - hd->device.id = MAKE_ID(TAG_SPECIAL, 0x0100); - - new_id(hd_data, hd); + if(hd_data->flags.vbox && hd->device.id == 6) { + hd->vendor.name = free_mem(hd->vendor.name); + hd->device.name = free_mem(hd->device.name); + hd->vendor.id = MAKE_ID(TAG_SPECIAL, 0x80ee); + hd->device.id = MAKE_ID(TAG_SPECIAL, 0x0100); + new_id(hd_data, hd); + } + else if(hd_data->flags.vmware && hd->device.id == 5) { + hd->vendor.name = free_mem(hd->vendor.name); + hd->device.name = free_mem(hd->device.name); + hd->vendor.id = MAKE_ID(TAG_SPECIAL, 0x15ad); + hd->device.id = MAKE_ID(TAG_SPECIAL, 0x0100); + new_id(hd_data, hd); + } } } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hwinfo-14.3/src/hd/sys.c new/hwinfo-14.4/src/hd/sys.c --- old/hwinfo-14.3/src/hd/sys.c 2006-08-29 16:15:38.000000000 +0200 +++ new/hwinfo-14.4/src/hd/sys.c 2008-03-04 11:25:42.000000000 +0100 @@ -21,7 +21,7 @@ * @{ */ -#if defined(__i386__) +#if defined(__i386__) || defined(__x86_64__) static void sigsegv_handler(int signum); static void chk_vmware(hd_data_t *hd_data, sys_info_t *st); #endif @@ -113,7 +113,7 @@ chk_vaio(hd_data, st); #endif -#if defined(__i386__) +#if defined(__i386__) || defined(__x86_64__) chk_vmware(hd_data, st); #endif @@ -126,7 +126,7 @@ } } -#if defined(__i386__) +#if defined(__i386__) || defined(__x86_64__) void sigsegv_handler(int signum) { _exit(77); } void chk_vmware(hd_data_t *hd_data, sys_info_t *st) @@ -174,10 +174,10 @@ st->model = new_str("VMWare"); } - hd_data->in_vmware = is_vmware; + hd_data->flags.vmware = is_vmware; } -#endif /* __i386__ */ +#endif /* __i386__ || __x86_64__ */ #if defined(__i386__) || defined(__x86_64__) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hwinfo-14.3/src/ids/src/special new/hwinfo-14.4/src/ids/src/special --- old/hwinfo-14.3/src/ids/src/special 2008-03-03 17:45:37.000000000 +0100 +++ new/hwinfo-14.4/src/ids/src/special 2008-03-04 11:18:45.000000000 +0100 @@ -676,6 +676,14 @@ &device.id special 0x0100 +device.name Mouse +# VMware things + vendor.id special 0x15ad ++vendor.name VMware + + vendor.id special 0x15ad +&device.id special 0x0100 ++device.name Mouse + # internal: special notebook packages # see int.c::int_system() vendor.id special 0xf001 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hwinfo-14.3/VERSION new/hwinfo-14.4/VERSION --- old/hwinfo-14.3/VERSION 2008-03-03 18:00:45.000000000 +0100 +++ new/hwinfo-14.4/VERSION 2008-03-04 11:10:27.000000000 +0100 @@ -1 +1 @@ -14.3 +14.4 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org