Hello community, here is the log from the commit of package hwinfo checked in at Mon Mar 3 18:08:17 CET 2008. -------- --- hwinfo/hwinfo.changes 2008-03-03 11:58:22.000000000 +0100 +++ hwinfo/hwinfo.changes 2008-03-03 18:00:58.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Mar 3 18:00:53 CET 2008 - snwint@suse.de + +- hal: info.bus -> info.subsystem +- detect virtualbox mouse (bnc #358460) + +------------------------------------------------------------------- Old: ---- hwinfo-14.2.tar.bz2 New: ---- hwinfo-14.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hwinfo.spec ++++++ --- /var/tmp/diff_new_pack.U11941/_old 2008-03-03 18:07:54.000000000 +0100 +++ /var/tmp/diff_new_pack.U11941/_new 2008-03-03 18:07:54.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package hwinfo (Version 14.2) +# spec file for package hwinfo (Version 14.3) # # 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.2 +Version: 14.3 Release: 1 -Source: hwinfo-14.2.tar.bz2 +Source: hwinfo-14.3.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -94,6 +94,9 @@ %doc doc/libhd/html %changelog +* Mon Mar 03 2008 snwint@suse.de +- hal: info.bus -> info.subsystem +- detect virtualbox mouse (bnc #358460) * Fri Feb 29 2008 snwint@suse.de - adjust mouse detection to work with mice that do not use /dev/input/mice but work via event dev (bnc #266002) ++++++ hwinfo-14.2.tar.bz2 -> hwinfo-14.3.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hwinfo-14.2/Changelog new/hwinfo-14.3/Changelog --- old/hwinfo-14.2/Changelog 2008-02-29 18:23:18.000000000 +0100 +++ new/hwinfo-14.3/Changelog 2008-03-03 17:59:58.000000000 +0100 @@ -1,3 +1,7 @@ +3/3/2008: v14.3 + - hal: info.bus -> info.subsystem + - detect virtualbox mouse (bnc #358460) + 29/2/2008: v14.2 - adjust mouse detection to work with mice that do not use /dev/input/mice but work via event dev (#266002) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hwinfo-14.2/src/hd/bios.c new/hwinfo-14.3/src/hd/bios.c --- old/hwinfo-14.2/src/hd/bios.c 2007-01-31 14:27:04.000000000 +0100 +++ new/hwinfo-14.3/src/hd/bios.c 2008-03-03 17:36:22.000000000 +0100 @@ -92,6 +92,7 @@ static void add_panel_info(hd_data_t *hd_data, bios_info_t *bt); #endif static void add_mouse_info(hd_data_t *hd_data, bios_info_t *bt); +static void chk_vbox(hd_data_t *hd_data); static unsigned char crc(unsigned char *mem, unsigned len); static int get_smp_info(hd_data_t *hd_data, memory_range_t *mem, smp_info_t *smp); static unsigned parse_mpconfig_len(hd_data_t *hd_data, memory_range_t *mem); @@ -355,6 +356,7 @@ add_panel_info(hd_data, bt); #endif add_mouse_info(hd_data, bt); + chk_vbox(hd_data); } PROGRESS(3, 0, "smp"); @@ -938,6 +940,21 @@ } +void chk_vbox(hd_data_t *hd_data) +{ + hd_smbios_t *sm; + + for(sm = hd_data->smbios; sm; sm = sm->next) { + if( + sm->any.type == sm_sysinfo && + !strcmp(sm->sysinfo.product, "VirtualBox") + ) { + hd_data->flags.vbox = 1; + } + } +} + + int get_smp_info(hd_data_t *hd_data, memory_range_t *mem, smp_info_t *smp) { #ifndef __ia64__ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hwinfo-14.2/src/hd/hal.c new/hwinfo-14.3/src/hd/hal.c --- old/hwinfo-14.2/src/hd/hal.c 2006-10-19 12:21:33.000000000 +0200 +++ new/hwinfo-14.3/src/hd/hal.c 2008-03-03 15:23:47.000000000 +0100 @@ -348,7 +348,7 @@ for(dev = hd_data->hal ; dev; dev = dev->next) { if(dev->used) continue; - if(!hal_match_str(dev->prop, "info.bus", "pci")) continue; + if(!hal_match_str(dev->prop, "info.subsystem", "pci")) continue; dev->used = 1; hd = add_hd_entry(hd_data, __LINE__, 0); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hwinfo-14.2/src/hd/hd.h new/hwinfo-14.3/src/hd/hd.h --- old/hwinfo-14.2/src/hd/hd.h 2008-02-29 17:17:02.000000000 +0100 +++ new/hwinfo-14.3/src/hd/hd.h 2008-03-03 17:30:25.000000000 +0100 @@ -2602,6 +2602,7 @@ unsigned biosvram:1; /**< internal: map Video BIOS RAM (128k at 0xa0000) */ 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 */ } flags; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hwinfo-14.2/src/hd/int.c new/hwinfo-14.3/src/hd/int.c --- old/hwinfo-14.2/src/hd/int.c 2008-02-29 14:14:42.000000000 +0100 +++ new/hwinfo-14.3/src/hd/int.c 2008-03-03 17:46:22.000000000 +0100 @@ -715,6 +715,24 @@ } #endif + if(hd_data->flags.vbox) { + 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.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); + } + } + } + for(hd = hd_data->hd; hd; hd = hd->next) { if( hd->detail && diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hwinfo-14.2/src/ids/src/special new/hwinfo-14.3/src/ids/src/special --- old/hwinfo-14.2/src/ids/src/special 2007-08-23 11:38:45.000000000 +0200 +++ new/hwinfo-14.3/src/ids/src/special 2008-03-03 17:45:37.000000000 +0100 @@ -668,6 +668,13 @@ +driver.module.modprobe usbscanner +driver.module.modprobe microtek +# VirtualBox things + vendor.id special 0x80ee ++vendor.name VirtualBox + + vendor.id special 0x80ee +&device.id special 0x0100 ++device.name Mouse # internal: special notebook packages # see int.c::int_system() diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hwinfo-14.2/VERSION new/hwinfo-14.3/VERSION --- old/hwinfo-14.2/VERSION 2008-02-29 17:17:00.000000000 +0100 +++ new/hwinfo-14.3/VERSION 2008-03-03 18:00:45.000000000 +0100 @@ -1 +1 @@ -14.2 +14.3 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org