diff options
author | Saul Wold <Saul.Wold@intel.com> | 2010-06-04 15:23:37 -0700 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-06-07 16:13:00 +0100 |
commit | cab1009b08012cc292d9740cf6e3b0f09a29d74f (patch) | |
tree | be68010bdb2d7ac7bbdd94387ce648b51c16e38d /meta/packages/xorg-xserver/xserver-xf86-config | |
parent | bf59d217a8c6376f90832927ad3254fbbbbf48f3 (diff) | |
download | poky-cab1009b08012cc292d9740cf6e3b0f09a29d74f.tar.gz |
Fixes for Qemu to use VGA and Touch Screen
Added usb tablet options to poky-qemu-internal script, and adjusted the
xorg.conf script for x86 to use VGA screen and tablet input device
Signed-off-by: Saul Wold <saul.wold@intel.com>
Diffstat (limited to 'meta/packages/xorg-xserver/xserver-xf86-config')
-rw-r--r-- | meta/packages/xorg-xserver/xserver-xf86-config/qemux86/xorg.conf | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/meta/packages/xorg-xserver/xserver-xf86-config/qemux86/xorg.conf b/meta/packages/xorg-xserver/xserver-xf86-config/qemux86/xorg.conf index 50fd7b4797..7f5bfa70ea 100644 --- a/meta/packages/xorg-xserver/xserver-xf86-config/qemux86/xorg.conf +++ b/meta/packages/xorg-xserver/xserver-xf86-config/qemux86/xorg.conf | |||
@@ -21,6 +21,14 @@ Section "InputDevice" | |||
21 | Option "Emulate3Buttons" "true" | 21 | Option "Emulate3Buttons" "true" |
22 | EndSection | 22 | EndSection |
23 | 23 | ||
24 | Section "InputDevice" | ||
25 | Identifier "Qemu Tablet" | ||
26 | Driver "evdev" | ||
27 | Option "CorePointer" | ||
28 | Option "Device" "/dev/input/touchscreen0" | ||
29 | Option "USB" "on" | ||
30 | EndSection | ||
31 | |||
24 | Section "Device" | 32 | Section "Device" |
25 | Identifier "Graphics Controller" | 33 | Identifier "Graphics Controller" |
26 | Driver "vmware" | 34 | Driver "vmware" |
@@ -31,6 +39,14 @@ Section "Monitor" | |||
31 | Option "DPMS" | 39 | Option "DPMS" |
32 | # 1024x600 59.85 Hz (CVT) hsync: 37.35 kHz; pclk: 49.00 MHz | 40 | # 1024x600 59.85 Hz (CVT) hsync: 37.35 kHz; pclk: 49.00 MHz |
33 | Modeline "1024x600_60.00" 49.00 1024 1072 1168 1312 600 603 613 624 -hsync +vsync | 41 | Modeline "1024x600_60.00" 49.00 1024 1072 1168 1312 600 603 613 624 -hsync +vsync |
42 | # 640x480 @ 60Hz (Industry standard) hsync: 31.5kHz | ||
43 | ModeLine "640x480" 25.2 640 656 752 800 480 490 492 525 -hsync -vsync | ||
44 | # 640x480 @ 72Hz (VESA) hsync: 37.9kHz | ||
45 | ModeLine "640x480" 31.5 640 664 704 832 480 489 491 520 -hsync -vsync | ||
46 | # 640x480 @ 75Hz (VESA) hsync: 37.5kHz | ||
47 | ModeLine "640x480" 31.5 640 656 720 840 480 481 484 500 -hsync -vsync | ||
48 | # 640x480 @ 85Hz (VESA) hsync: 43.3kHz | ||
49 | ModeLine "640x480" 36.0 640 696 752 832 480 481 484 509 -hsync -vsync | ||
34 | EndSection | 50 | EndSection |
35 | 51 | ||
36 | Section "Screen" | 52 | Section "Screen" |
@@ -39,7 +55,7 @@ Section "Screen" | |||
39 | Monitor "Generic Monitor" | 55 | Monitor "Generic Monitor" |
40 | DefaultDepth 24 | 56 | DefaultDepth 24 |
41 | SubSection "Display" | 57 | SubSection "Display" |
42 | Modes "1024x600_60.00" | 58 | Modes "640x480" |
43 | EndSubSection | 59 | EndSubSection |
44 | EndSection | 60 | EndSection |
45 | 61 | ||
@@ -47,7 +63,7 @@ Section "ServerLayout" | |||
47 | Identifier "Default Layout" | 63 | Identifier "Default Layout" |
48 | Screen "Default Screen" | 64 | Screen "Default Screen" |
49 | InputDevice "Generic Keyboard" | 65 | InputDevice "Generic Keyboard" |
50 | InputDevice "Configured Mouse" | 66 | # InputDevice "Configured Mouse" |
67 | InputDevice "QEMU Tablet" | ||
51 | Option "AllowEmptyInput" "no" | 68 | Option "AllowEmptyInput" "no" |
52 | EndSection | 69 | EndSection |
53 | |||