summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@sun.com>2009-01-30 21:44:08 -0800
committerKeith Packard <keithp@keithp.com>2009-02-17 19:01:35 -0800
commitada58b69ca0a5e674cda7ae59a53061645621888 (patch)
treed6021be905a1f5ec06c06339f9974aa0c1f261b7 /config
parent516f8e2cad1311a09764e2633644188d1e3c31bb (diff)
x11-input.fdi: Add options needed to handle adding USB devices on Solaris
(cherry picked from commit 60bcdd687040db76490851d4b459284ce37020e0) Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'config')
-rw-r--r--config/x11-input.fdi14
1 files changed, 14 insertions, 0 deletions
diff --git a/config/x11-input.fdi b/config/x11-input.fdi
index af1478159..9e629cbd0 100644
--- a/config/x11-input.fdi
+++ b/config/x11-input.fdi
@@ -61,6 +61,13 @@
string="Linux">
<merge key="input.x11_driver" type="string">evdev</merge>
</match>
+ <match key="/org/freedesktop/Hal/devices/computer:system.kernel.name"
+ string="SunOS">
+ <match key="input.device" contains="usb">
+ <merge key="input.x11_options.StreamsModule" type="string">usbms</merge>
+ <merge key="input.x11_options.Protocol" type="string">VUID</merge>
+ </match>
+ </match>
</match>
<match key="info.capabilities" contains="input.keys">
@@ -75,6 +82,13 @@
<merge key="input.x11_driver" type="string">evdev</merge>
<merge key="input.x11_options.XkbModel" type="string">evdev</merge>
</match>
+ <match key="/org/freedesktop/Hal/devices/computer:system.kernel.name"
+ string="SunOS">
+ <match key="input.device" contains="usb">
+ <merge key="input.x11_options.StreamsModule" type="string">usbkbm</merge>
+ <merge key="input.x11_options.Protocol" type="string">VUID</merge>
+ </match>
+ </match>
<merge key="input.x11_options.XkbLayout" type="string">us</merge>