summaryrefslogtreecommitdiff
authorAlan Coopersmith <alan.coopersmith@sun.com>2009-01-31 05:44:08 (GMT)
committer Alan Coopersmith <alan.coopersmith@sun.com>2009-01-31 05:45:12 (GMT)
commit60bcdd687040db76490851d4b459284ce37020e0 (patch) (side-by-side diff)
tree77d482bd14bc2c98be9d8e419a31a25e2a181318
parent4de5705545792d77c9990bbec3e263a517757a2a (diff)
downloadxserver-60bcdd687040db76490851d4b459284ce37020e0.zip
xserver-60bcdd687040db76490851d4b459284ce37020e0.tar.gz
x11-input.fdi: Add options needed to handle adding USB devices on Solaris
Diffstat (more/less context) (ignore whitespace changes)
-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 af14781..9e629cb 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>