mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-31 00:39:46 +00:00
Code Issues Projects Releases Wiki Activity

Add correct patch

Browse Source 
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@688 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
Matthew Allum
2006-08-31 16:05:30 +00:00
parent 1e09fe19b8
commit ce8c8e09f1
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/packages/xorg-xserver/xserver-kdrive/xfbdev-fb-opt.patch
+12 -7
View File
@@ -1,8 +1,8 @@
diff --git a/hw/kdrive/fbdev/fbdev.c b/hw/kdrive/fbdev/fbdev.c diff --git a/hw/kdrive/fbdev/fbdev.c b/hw/kdrive/fbdev/fbdev.c
index 86384f0..e27240f 100644 index 86384f0..904d5f3 100644
--- a/hw/kdrive/fbdev/fbdev.c --- a/hw/kdrive/fbdev/fbdev.c
+++ b/hw/kdrive/fbdev/fbdev.c +++ b/hw/kdrive/fbdev/fbdev.c
@@ -38,11 +38,14 @@ fbdevInitialize (KdCardInfo *card, Fbdev @@ -38,11 +38,17 @@ fbdevInitialize (KdCardInfo *card, Fbdev
{ {
int k; int k;
unsigned long off; unsigned long off;
@@ -12,6 +12,9 @@ index 86384f0..e27240f 100644
- return FALSE; - return FALSE;
- } - }
+ +
+ if (fbdevDevicePath == NULL)
+ fbdevDevicePath = "/dev/fb0";
+
+ if ((priv->fd = open(fbdevDevicePath, O_RDWR)) < 0) + if ((priv->fd = open(fbdevDevicePath, O_RDWR)) < 0)
+ { + {
+ ErrorF("Error opening framebuffer %s: %s\n", + ErrorF("Error opening framebuffer %s: %s\n",
@@ -35,10 +38,10 @@ index d37b995..b7951db 100644
Bool Bool
fbdevInitialize (KdCardInfo *card, FbdevPriv *priv); fbdevInitialize (KdCardInfo *card, FbdevPriv *priv);
diff --git a/hw/kdrive/fbdev/fbinit.c b/hw/kdrive/fbdev/fbinit.c diff --git a/hw/kdrive/fbdev/fbinit.c b/hw/kdrive/fbdev/fbinit.c
index ba9d1c6..b7852a8 100644 index ba9d1c6..1a7e4bf 100644
--- a/hw/kdrive/fbdev/fbinit.c --- a/hw/kdrive/fbdev/fbinit.c
+++ b/hw/kdrive/fbdev/fbinit.c +++ b/hw/kdrive/fbdev/fbinit.c
@@ -54,16 +54,29 @@ InitInput (int argc, char **argv) @@ -54,17 +54,30 @@ InitInput (int argc, char **argv)
void void
ddxUseMsg (void) ddxUseMsg (void)
{ {
@@ -53,6 +56,8 @@ index ba9d1c6..b7852a8 100644
ddxProcessArgument (int argc, char **argv, int i) ddxProcessArgument (int argc, char **argv, int i)
{ {
- return KdProcessArgument (argc, argv, i); - return KdProcessArgument (argc, argv, i);
-}
-
+ if (!strcmp (argv[i], "-fb")) + if (!strcmp (argv[i], "-fb"))
+ { + {
+ if (i+1 < argc) + if (i+1 < argc)
@@ -63,11 +68,11 @@ index ba9d1c6..b7852a8 100644
+ UseMsg(); + UseMsg();
+ exit(1); + exit(1);
+ } + }
+ return KdProcessArgument (argc, argv, i); + return KdProcessArgument (argc, argv, i);
} +}
-
+char *fbdevDevicePath = NULL; +char *fbdevDevicePath = NULL;
KdCardFuncs fbdevFuncs = { KdCardFuncs fbdevFuncs = {
fbdevCardInit, /* cardinit */ fbdevCardInit, /* cardinit */
fbdevScreenInit, /* scrinit */