mirror of
https://git.yoctoproject.org/poky
synced 2026-06-04 14:09:47 +00:00
Sync up.. all the deb/dpkg changes which I have locally are now in svn.
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@728 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
@@ -1,8 +1,18 @@
|
||||
diff --git a/hw/kdrive/fbdev/fbdev.c b/hw/kdrive/fbdev/fbdev.c
|
||||
index 86384f0..904d5f3 100644
|
||||
--- a/hw/kdrive/fbdev/fbdev.c
|
||||
+++ b/hw/kdrive/fbdev/fbdev.c
|
||||
@@ -38,11 +38,17 @@ fbdevInitialize (KdCardInfo *card, Fbdev
|
||||
---
|
||||
hw/kdrive/fbdev/fbdev.c | 17 ++++++++++++-----
|
||||
hw/kdrive/fbdev/fbdev.h | 1 +
|
||||
hw/kdrive/fbdev/fbinit.c | 20 ++++++++++++++++----
|
||||
3 files changed, 29 insertions(+), 9 deletions(-)
|
||||
|
||||
--- xorg-server-X11R7.1-1.1.0.orig/hw/kdrive/fbdev/fbdev.c
|
||||
+++ xorg-server-X11R7.1-1.1.0/hw/kdrive/fbdev/fbdev.c
|
||||
@@ -33,16 +33,23 @@
|
||||
|
||||
extern int KdTsPhyScreen;
|
||||
|
||||
+char *fbdevDevicePath = NULL;
|
||||
Bool
|
||||
fbdevInitialize (KdCardInfo *card, FbdevPriv *priv)
|
||||
{
|
||||
int k;
|
||||
unsigned long off;
|
||||
@@ -25,10 +35,8 @@ index 86384f0..904d5f3 100644
|
||||
/* quiet valgrind */
|
||||
memset (&priv->fix, '\0', sizeof (priv->fix));
|
||||
if ((k=ioctl(priv->fd, FBIOGET_FSCREENINFO, &priv->fix)) < 0) {
|
||||
diff --git a/hw/kdrive/fbdev/fbdev.h b/hw/kdrive/fbdev/fbdev.h
|
||||
index d37b995..b7951db 100644
|
||||
--- a/hw/kdrive/fbdev/fbdev.h
|
||||
+++ b/hw/kdrive/fbdev/fbdev.h
|
||||
--- xorg-server-X11R7.1-1.1.0.orig/hw/kdrive/fbdev/fbdev.h
|
||||
+++ xorg-server-X11R7.1-1.1.0/hw/kdrive/fbdev/fbdev.h
|
||||
@@ -53,6 +53,7 @@ typedef struct _fbdevScrPriv {
|
||||
} FbdevScrPriv;
|
||||
|
||||
@@ -37,11 +45,9 @@ 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..1a7e4bf 100644
|
||||
--- a/hw/kdrive/fbdev/fbinit.c
|
||||
+++ b/hw/kdrive/fbdev/fbinit.c
|
||||
@@ -54,17 +54,30 @@ InitInput (int argc, char **argv)
|
||||
--- xorg-server-X11R7.1-1.1.0.orig/hw/kdrive/fbdev/fbinit.c
|
||||
+++ xorg-server-X11R7.1-1.1.0/hw/kdrive/fbdev/fbinit.c
|
||||
@@ -59,16 +59,28 @@ InitInput (int argc, char **argv)
|
||||
void
|
||||
ddxUseMsg (void)
|
||||
{
|
||||
@@ -72,7 +78,5 @@ index ba9d1c6..1a7e4bf 100644
|
||||
+ return KdProcessArgument (argc, argv, i);
|
||||
+}
|
||||
|
||||
+char *fbdevDevicePath = NULL;
|
||||
KdCardFuncs fbdevFuncs = {
|
||||
fbdevCardInit, /* cardinit */
|
||||
fbdevScreenInit, /* scrinit */
|
||||
|
||||
Reference in New Issue
Block a user