Hello community, here is the log from the commit of package sax2 checked in at Thu Mar 6 02:08:05 CET 2008. -------- --- sax2/sax2.changes 2008-03-03 18:02:24.000000000 +0100 +++ sax2/sax2.changes 2008-03-04 11:41:22.000687000 +0100 @@ -1,0 +2,6 @@ +Tue Mar 4 09:41:27 CET 2008 - ms@suse.de + +- added vboxmouse profile on 0x80ee/0x0100 (bnc #358460) +- added vmware mouse profile on 0x15ad/0x0100 (bnc #358460) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sax2.spec ++++++ --- /var/tmp/diff_new_pack.mRc821/_old 2008-03-06 02:07:30.000000000 +0100 +++ /var/tmp/diff_new_pack.mRc821/_new 2008-03-06 02:07:30.000000000 +0100 @@ -40,7 +40,7 @@ PreReq: /bin/rm /bin/mkdir /usr/bin/chroot %fillup_prereq %insserv_prereq Summary: SuSE advanced X Window System-configuration Version: 8.1 -Release: 368 +Release: 370 Group: System/X11/Utilities License: GPL v2 or later Source: sax2.tar.bz2 @@ -454,6 +454,9 @@ %endif %changelog +* Tue Mar 04 2008 ms@suse.de +- added vboxmouse profile on 0x80ee/0x0100 (bnc #358460) +- added vmware mouse profile on 0x15ad/0x0100 (bnc #358460) * Mon Mar 03 2008 ms@suse.de - update hwinfo source * Mon Mar 03 2008 ms@suse.de ++++++ sax2.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sax/profile/automatic/input/vbox-mouse new/sax/profile/automatic/input/vbox-mouse --- old/sax/profile/automatic/input/vbox-mouse 1970-01-01 01:00:00.000000000 +0100 +++ new/sax/profile/automatic/input/vbox-mouse 2008-03-04 09:31:48.000000000 +0100 @@ -0,0 +1,5 @@ +# Virtual box mouse +InputDevice -> [X] -> Identifier = Mouse[[X]] +InputDevice -> [X] -> Driver = vboxmouse +InputDevice -> [X] -> Option -> InputFashion = Mouse +InputDevice -> [X] -> Option -> Name = Virtual Box Pointer diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sax/profile/automatic/input/vmware-mouse new/sax/profile/automatic/input/vmware-mouse --- old/sax/profile/automatic/input/vmware-mouse 1970-01-01 01:00:00.000000000 +0100 +++ new/sax/profile/automatic/input/vmware-mouse 2008-03-04 11:26:19.000000000 +0100 @@ -0,0 +1,5 @@ +# VMware mouse +InputDevice -> [X] -> Identifier = Mouse[[X]] +InputDevice -> [X] -> Driver = vmmouse +InputDevice -> [X] -> Option -> InputFashion = Mouse +InputDevice -> [X] -> Option -> Name = VMware Pointer diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sax/svnbuild new/sax/svnbuild --- old/sax/svnbuild 2008-03-03 18:02:31.000000000 +0100 +++ new/sax/svnbuild 2008-03-04 11:41:46.000000000 +0100 @@ -1 +1 @@ -1534 +1536 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sax/sysp/lib/libhd/hd/bios.c new/sax/sysp/lib/libhd/hd/bios.c --- old/sax/sysp/lib/libhd/hd/bios.c 2007-02-09 16:50:43.000000000 +0100 +++ new/sax/sysp/lib/libhd/hd/bios.c 2008-03-04 09:31:47.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/sax/sysp/lib/libhd/hd/hal.c new/sax/sysp/lib/libhd/hd/hal.c --- old/sax/sysp/lib/libhd/hd/hal.c 2006-10-20 13:53:08.000000000 +0200 +++ new/sax/sysp/lib/libhd/hd/hal.c 2008-03-04 09:31: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/sax/sysp/lib/libhd/hd/hd.h new/sax/sysp/lib/libhd/hd/hd.h --- old/sax/sysp/lib/libhd/hd/hd.h 2008-02-05 17:41:32.000000000 +0100 +++ new/sax/sysp/lib/libhd/hd/hd.h 2008-03-04 09:31:47.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/sax/sysp/lib/libhd/hd/int.c new/sax/sysp/lib/libhd/hd/int.c --- old/sax/sysp/lib/libhd/hd/int.c 2008-03-03 17:46:46.000000000 +0100 +++ new/sax/sysp/lib/libhd/hd/int.c 2008-03-04 09:31:47.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/sax/sysp/lib/libhd/ids/src/special new/sax/sysp/lib/libhd/ids/src/special --- old/sax/sysp/lib/libhd/ids/src/special 2008-02-05 17:39:56.000000000 +0100 +++ new/sax/sysp/lib/libhd/ids/src/special 2008-03-04 09:31:46.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/sax/sysp/lib/libhd/VERSION new/sax/sysp/lib/libhd/VERSION --- old/sax/sysp/lib/libhd/VERSION 2008-03-03 17:46:47.000000000 +0100 +++ new/sax/sysp/lib/libhd/VERSION 2008-03-04 09:31:47.000000000 +0100 @@ -1 +1 @@ -14.2 +14.3 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sax/sysp/maps/Input.map new/sax/sysp/maps/Input.map --- old/sax/sysp/maps/Input.map 2008-02-15 14:45:39.000000000 +0100 +++ new/sax/sysp/maps/Input.map 2008-03-04 11:26:19.000000000 +0100 @@ -20,6 +20,8 @@ 0x1943 : 0x5000 : fujitsu 0x0210 : 0x0018 : xen-mouse 0x03f0 : 0x1126 : hp-mouse +0x80ee : 0x0100 : vbox-mouse +0x15ad : 0x0100 : vmware-mouse # Keyboards # Microsoft Natural Ergonomic Keyboard 4000 # ---> is profile: microsoft-natural ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org