diff options
| author |   Lukas-David Gorris <lukas@htc-linux.org> | 2011-03-12 11:35:38 +0000 |
|---|---|---|
| committer |   Khem Raj <raj.khem@gmail.com> | 2011-03-12 12:24:53 -0800 |
| commit | afc7d19c2a828e6c733f04e3fee0b9a0ac4f7ef0 (patch) | |
| tree | f7fd0b4e566acbdfacf8a8da13d570a9aa52da43 /recipes/xorg-xserver | |
| parent | 73fb250314975295df4d5a559a50cc098b6a7c13 (diff) | |
| download | openembedded-afc7d19c2a828e6c733f04e3fee0b9a0ac4f7ef0.tar.gz | |
htcleo: update xorg.conf
Am Freitag, den 11.03.2011, 15:59 -0800 schrieb Khem Raj:
> On (11/03/11 11:14), Lukas-David Gorris wrote:
> > Attached patch updates xorg.conf for htcleo machine. It's needed to
> > disable tslib. Tested on the device.
> >
>
> needs a PR bump.
Thanks! Patch with added PR bump attached.
Best,
Lukas
>From fef8c5c43547b9fe83a1d76120e499596d47afcc Mon Sep 17 00:00:00 2001
From: Lukas-David Gorris <lukas.gorris@gmail.com>
Date: Sat, 12 Mar 2011 04:31:50 +0100
Subject: [PATCH] xserver-xorg-conf: Update htcleo/xorg.conf and bump PR
Thanks to Khem for the review
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'recipes/xorg-xserver')
| -rw-r--r-- | recipes/xorg-xserver/xserver-xorg-conf/htcleo/xorg.conf | 93 | ||||
| -rw-r--r-- | recipes/xorg-xserver/xserver-xorg-conf_0.1.bb | 2 |
2 files changed, 63 insertions, 32 deletions
diff --git a/recipes/xorg-xserver/xserver-xorg-conf/htcleo/xorg.conf b/recipes/xorg-xserver/xserver-xorg-conf/htcleo/xorg.conf index 4153a26281..c8198737aa 100644 --- a/recipes/xorg-xserver/xserver-xorg-conf/htcleo/xorg.conf +++ b/recipes/xorg-xserver/xserver-xorg-conf/htcleo/xorg.conf @@ -1,3 +1,11 @@ +Section "Module" + Load "extmod" + Load "dbe" + Load "freetype" + Load "type1" + Load "record" +EndSection + Section "Monitor" Identifier "Monitor0" Mode "480x800" @@ -18,17 +26,6 @@ Section "Device" EndSection -Section "Screen" - Identifier "Framebuffer" - Device "fbdev" - Monitor "Monitor" - DefaultFbBpp 16 - SubSection "Display" - Depth 16 - Modes "480x800" - EndSubSection -EndSection - Section "Screen" Identifier "480x800x16" Device "fbdev" @@ -41,33 +38,67 @@ Section "Screen" EndSection -Section "ServerLayout" - Identifier "Builtin Default Layout" - Screen "Framebuffer" - InputDevice "Touchscreen" "CorePointer" - InputDevice "Keyboard" "CoreKeyboard" -EndSection +Section "ServerLayout" + Identifier "Default Layout" + Screen "480x800x16" +# InputDevice "event0" +# InputDevice "event1" +# InputDevice "event2" + InputDevice "event3" +# InputDevice "event4" +# InputDevice "event5" + InputDevice "event6" +EndSection + + +Section "InputDevice" + Identifier "event0" + Driver "evdev" + Option "Device" "/dev/input/event0" +EndSection + +Section "InputDevice" + Identifier "event1" + Driver "evdev" + Option "Device" "/dev/input/event1" +EndSection + + +Section "InputDevice" + Identifier "event2" + Driver "evdev" + Option "Device" "/dev/input/event2" +EndSection Section "InputDevice" - Identifier "Mouse0" - Driver "mouse" - Option "Protocol" "auto" - Option "Device" "/dev/input/mice" - Option "Emulate3Buttons" "no" - Option "ZAxisMapping" "4 5" + Identifier "event3" + Driver "evdev" + Option "Device" "/dev/input/event3" +# Option "Calibration" "6713 86 262 4110" +# Option "InvertY" "1" +# Option "InvertX" "1" + +# Option "SwapAxes" "1" # unless it was already set to 1 + EndSection +Section "InputDevice" + Identifier "event4" + Driver "evdev" + Option "Device" "/dev/input/event4" +EndSection Section "InputDevice" - Identifier "Touchscreen" - Driver "tslib" - Option "Protocol" "auto" - Option "Device" "/dev/input/event0" - Option "CorePointer" "true" + Identifier "event5" + Driver "evdev" + Option "Device" "/dev/input/event5" EndSection Section "InputDevice" - Identifier "Keyboard" - Driver "kbd" - Option "XkbLayout" "en_US" + Identifier "event6" + Driver "evdev" + Option "Device" "/dev/input/event6" +# Option "InvertY" "1" + +# Option "SwapAxes" "1" # unless it was already set to 1 EndSection diff --git a/recipes/xorg-xserver/xserver-xorg-conf_0.1.bb b/recipes/xorg-xserver/xserver-xorg-conf_0.1.bb index 692df9d5b4..a549cf21c3 100644 --- a/recipes/xorg-xserver/xserver-xorg-conf_0.1.bb +++ b/recipes/xorg-xserver/xserver-xorg-conf_0.1.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Machine specific xorg.conf files" -PR = "r43" +PR = "r44" SRC_URI = "file://xorg.conf" |