diff options
| author | Matthew Allum <mallum@openedhand.com> | 2006-08-31 16:05:30 +0000 |
|---|---|---|
| committer | Matthew Allum <mallum@openedhand.com> | 2006-08-31 16:05:30 +0000 |
| commit | ce8c8e09f1fe75d39d98f3a413af6ce889533ea9 (patch) | |
| tree | 3bec222d9aacf76d6d327beca344961639d06457 | |
| parent | 1e09fe19b86fea4c9e61dd79649e7986ecea6e36 (diff) | |
| download | openembedded-core-ce8c8e09f1fe75d39d98f3a413af6ce889533ea9.tar.gz openembedded-core-ce8c8e09f1fe75d39d98f3a413af6ce889533ea9.tar.bz2 openembedded-core-ce8c8e09f1fe75d39d98f3a413af6ce889533ea9.tar.xz openembedded-core-ce8c8e09f1fe75d39d98f3a413af6ce889533ea9.zip | |
Add correct patch
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@688 311d38ba-8fff-0310-9ca6-ca027cbcb966
| -rw-r--r-- | meta/packages/xorg-xserver/xserver-kdrive/xfbdev-fb-opt.patch | 19 |
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 9a73b4de7..89a56719d 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 @@ 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 +++ b/hw/kdrive/fbdev/fbdev.c -@@ -38,11 +38,14 @@ fbdevInitialize (KdCardInfo *card, Fbdev +@@ -38,11 +38,17 @@ fbdevInitialize (KdCardInfo *card, Fbdev { int k; unsigned long off; @@ -12,6 +12,9 @@ index 86384f0..e27240f 100644 - return FALSE; - } + ++ if (fbdevDevicePath == NULL) ++ fbdevDevicePath = "/dev/fb0"; ++ + if ((priv->fd = open(fbdevDevicePath, O_RDWR)) < 0) + { + ErrorF("Error opening framebuffer %s: %s\n", @@ -35,10 +38,10 @@ index d37b995..b7951db 100644 Bool fbdevInitialize (KdCardInfo *card, FbdevPriv *priv); 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 +++ 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 ddxUseMsg (void) { @@ -53,6 +56,8 @@ index ba9d1c6..b7852a8 100644 ddxProcessArgument (int argc, char **argv, int i) { - return KdProcessArgument (argc, argv, i); +-} +- + if (!strcmp (argv[i], "-fb")) + { + if (i+1 < argc) @@ -63,11 +68,11 @@ index ba9d1c6..b7852a8 100644 + UseMsg(); + exit(1); + } + + return KdProcessArgument (argc, argv, i); - } ++} -- +char *fbdevDevicePath = NULL; - KdCardFuncs fbdevFuncs = { fbdevCardInit, /* cardinit */ + fbdevScreenInit, /* scrinit */ |