summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorMatthew Allum <mallum@openedhand.com>2006-08-31 16:05:30 +0000
committerMatthew Allum <mallum@openedhand.com>2006-08-31 16:05:30 +0000
commitce8c8e09f1fe75d39d98f3a413af6ce889533ea9 (patch)
tree3bec222d9aacf76d6d327beca344961639d06457 /meta
parent1e09fe19b86fea4c9e61dd79649e7986ecea6e36 (diff)
downloadpoky-ce8c8e09f1fe75d39d98f3a413af6ce889533ea9.tar.gz
Add correct patch
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@688 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta')
-rw-r--r--meta/packages/xorg-xserver/xserver-kdrive/xfbdev-fb-opt.patch19
1 files changed, 12 insertions, 7 deletions
diff --git a/meta/packages/xorg-xserver/xserver-kdrive/xfbdev-fb-opt.patch b/meta/packages/xorg-xserver/xserver-kdrive/xfbdev-fb-opt.patch
index 9a73b4de7c..89a56719d7 100644
--- a/meta/packages/xorg-xserver/xserver-kdrive/xfbdev-fb-opt.patch
+++ b/meta/packages/xorg-xserver/xserver-kdrive/xfbdev-fb-opt.patch
@@ -1,8 +1,8 @@
1diff --git a/hw/kdrive/fbdev/fbdev.c b/hw/kdrive/fbdev/fbdev.c 1diff --git a/hw/kdrive/fbdev/fbdev.c b/hw/kdrive/fbdev/fbdev.c
2index 86384f0..e27240f 100644 2index 86384f0..904d5f3 100644
3--- a/hw/kdrive/fbdev/fbdev.c 3--- a/hw/kdrive/fbdev/fbdev.c
4+++ b/hw/kdrive/fbdev/fbdev.c 4+++ b/hw/kdrive/fbdev/fbdev.c
5@@ -38,11 +38,14 @@ fbdevInitialize (KdCardInfo *card, Fbdev 5@@ -38,11 +38,17 @@ fbdevInitialize (KdCardInfo *card, Fbdev
6 { 6 {
7 int k; 7 int k;
8 unsigned long off; 8 unsigned long off;
@@ -12,6 +12,9 @@ index 86384f0..e27240f 100644
12- return FALSE; 12- return FALSE;
13- } 13- }
14+ 14+
15+ if (fbdevDevicePath == NULL)
16+ fbdevDevicePath = "/dev/fb0";
17+
15+ if ((priv->fd = open(fbdevDevicePath, O_RDWR)) < 0) 18+ if ((priv->fd = open(fbdevDevicePath, O_RDWR)) < 0)
16+ { 19+ {
17+ ErrorF("Error opening framebuffer %s: %s\n", 20+ ErrorF("Error opening framebuffer %s: %s\n",
@@ -35,10 +38,10 @@ index d37b995..b7951db 100644
35 Bool 38 Bool
36 fbdevInitialize (KdCardInfo *card, FbdevPriv *priv); 39 fbdevInitialize (KdCardInfo *card, FbdevPriv *priv);
37diff --git a/hw/kdrive/fbdev/fbinit.c b/hw/kdrive/fbdev/fbinit.c 40diff --git a/hw/kdrive/fbdev/fbinit.c b/hw/kdrive/fbdev/fbinit.c
38index ba9d1c6..b7852a8 100644 41index ba9d1c6..1a7e4bf 100644
39--- a/hw/kdrive/fbdev/fbinit.c 42--- a/hw/kdrive/fbdev/fbinit.c
40+++ b/hw/kdrive/fbdev/fbinit.c 43+++ b/hw/kdrive/fbdev/fbinit.c
41@@ -54,16 +54,29 @@ InitInput (int argc, char **argv) 44@@ -54,17 +54,30 @@ InitInput (int argc, char **argv)
42 void 45 void
43 ddxUseMsg (void) 46 ddxUseMsg (void)
44 { 47 {
@@ -53,6 +56,8 @@ index ba9d1c6..b7852a8 100644
53 ddxProcessArgument (int argc, char **argv, int i) 56 ddxProcessArgument (int argc, char **argv, int i)
54 { 57 {
55- return KdProcessArgument (argc, argv, i); 58- return KdProcessArgument (argc, argv, i);
59-}
60-
56+ if (!strcmp (argv[i], "-fb")) 61+ if (!strcmp (argv[i], "-fb"))
57+ { 62+ {
58+ if (i+1 < argc) 63+ if (i+1 < argc)
@@ -63,11 +68,11 @@ index ba9d1c6..b7852a8 100644
63+ UseMsg(); 68+ UseMsg();
64+ exit(1); 69+ exit(1);
65+ } 70+ }
71
66+ return KdProcessArgument (argc, argv, i); 72+ return KdProcessArgument (argc, argv, i);
67 } 73+}
68 74
69-
70+char *fbdevDevicePath = NULL; 75+char *fbdevDevicePath = NULL;
71
72 KdCardFuncs fbdevFuncs = { 76 KdCardFuncs fbdevFuncs = {
73 fbdevCardInit, /* cardinit */ 77 fbdevCardInit, /* cardinit */
78 fbdevScreenInit, /* scrinit */