All of lore.kernel.org
 help / color / mirror / Atom feed
From: Lukas-David Gorris <lukas@htc-linux.org>
To: openembedded-devel@lists.openembedded.org
Subject: Re: [PATCH] htcleo: update xorg.conf
Date: Sat, 12 Mar 2011 04:35:38 +0100	[thread overview]
Message-ID: <1299900938.2785.1.camel@computer> (raw)
In-Reply-To: <20110311235903.GD5603@sakrah.homelinux.org>

[-- Attachment #1: Type: text/plain, Size: 317 bytes --]

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

[-- Attachment #2: htcleo_update-xorg-conf_bump-pr.diff --]
[-- Type: text/x-patch, Size: 4619 bytes --]

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
---
 .../xserver-xorg-conf/htcleo/xorg.conf             |   93 +++++++++++++-------
 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 4153a26..c819873 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 692df9d..a549cf2 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"
 
-- 
1.7.1


      reply	other threads:[~2011-03-12  3:37 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-03-11 10:14 [PATCH] htcleo: update xorg.conf Lukas-David Gorris
2011-03-11 23:59 ` Khem Raj
2011-03-12  3:35   ` Lukas-David Gorris [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1299900938.2785.1.camel@computer \
    --to=lukas@htc-linux.org \
    --cc=openembedded-devel@lists.openembedded.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.