diff options
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | hwdb/70-mouse.hwdb | 24 | ||||
| -rw-r--r-- | src/test/test-udev.c | 17 |
3 files changed, 37 insertions, 8 deletions
diff --git a/Makefile.am b/Makefile.am index d670ae1984..c566b1f6e4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3829,9 +3829,11 @@ check_DATA += \ endif # packed sysfs test tree -test/sys: +test/sys: test/sys.tar.xz + -rm -rf test/sys $(AM_V_at)$(MKDIR_P) $(dir $@) $(AM_V_GEN)tar -C test/ -xJf $(top_srcdir)/test/sys.tar.xz + -touch test/sys test-sys-distclean: -rm -rf test/sys diff --git a/hwdb/70-mouse.hwdb b/hwdb/70-mouse.hwdb index 54ace7cbc1..9b139fea54 100644 --- a/hwdb/70-mouse.hwdb +++ b/hwdb/70-mouse.hwdb @@ -132,6 +132,14 @@ mouse:usb:v046dpc063:name:DELL DELL USB Laser Mouse: MOUSE_DPI=1000@125 ########################################## +# Dynex +######################################### + +# Dynex Wired Optical Mouse (DX-WMSE2) +mouse:usb:v0461p4d46:name:USB Optical Mouse: + MOUSE_DPI=1000@125 + +########################################## # Fujitsu Siemens ########################################## @@ -420,6 +428,14 @@ mouse:usb:v22d4p1308:name:Laview Technology Mionix Avior 7000: MOUSE_WHEEL_CLICK_ANGLE=15 ########################################## +# MODECOM +########################################## + +# MODECOM MC-WM4 Wireless Optical Mouse +mouse:usb:v0e8fp00a7:name:DaKai 2.4G RX: + MOUSE_DPI=*800@126 1600@126 + +########################################## # Oklick ########################################## @@ -443,3 +459,11 @@ mouse:usb:v1532p0042:name:Razer Razer Abyssus: mouse:usb:v1e7dp2c2e:name:ROCCAT ROCCAT Lua: MOUSE_DPI=250@125 500@125 1000@125 1250@125 1500@125 1750@125 2000@125 250@250 500@250 1000@250 1250@250 1500@250 1750@250 2000@250 250@500 500@500 1000@500 1250@500 1500@500 1750@500 2000@500 250@1000 500@1000 *1000@1000 1250@1000 1500@1000 1750@1000 2000@1000 MOUSE_WHEEL_CLICK_ANGLE=15 + +########################################## +# Sharkoon +########################################## + +# Sharkoon Shark Force Gaming Mouse +mouse:usb:v093ap2521:name:USB OPTICAL MOUSE: + MOUSE_DPI=*1000@125 1600@125 600@125 diff --git a/src/test/test-udev.c b/src/test/test-udev.c index 8522e9925c..e5f0d00b94 100644 --- a/src/test/test-udev.c +++ b/src/test/test-udev.c @@ -39,12 +39,13 @@ static int fake_filesystems(void) { const char *src; const char *target; const char *error; + bool ignore_mount_error; } fakefss[] = { - { "test/tmpfs/sys", "/sys", "failed to mount test /sys" }, - { "test/tmpfs/dev", "/dev", "failed to mount test /dev" }, - { "test/run", "/run", "failed to mount test /run" }, - { "test/run", "/etc/udev/rules.d", "failed to mount empty /etc/udev/rules.d" }, - { "test/run", UDEVLIBEXECDIR "/rules.d","failed to mount empty " UDEVLIBEXECDIR "/rules.d" }, + { "test/tmpfs/sys", "/sys", "failed to mount test /sys", false }, + { "test/tmpfs/dev", "/dev", "failed to mount test /dev", false }, + { "test/run", "/run", "failed to mount test /run", false }, + { "test/run", "/etc/udev/rules.d", "failed to mount empty /etc/udev/rules.d", true }, + { "test/run", UDEVLIBEXECDIR "/rules.d", "failed to mount empty " UDEVLIBEXECDIR "/rules.d", true }, }; unsigned int i; int err; @@ -66,8 +67,10 @@ static int fake_filesystems(void) { err = mount(fakefss[i].src, fakefss[i].target, NULL, MS_BIND, NULL); if (err < 0) { err = -errno; - fprintf(stderr, "%s %m\n", fakefss[i].error); - return err; + fprintf(stderr, "%s %m%s\n", fakefss[i].error, fakefss[i].ignore_mount_error ? ", ignoring" : ""); + if (!fakefss[i].ignore_mount_error) + return err; + err = 0; } } out: |