summaryrefslogtreecommitdiffstats
path: root/openembedded/packages/xserver/xserver-kdrive
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2005-08-31 10:45:47 +0000
committerRichard Purdie <richard@openedhand.com>2005-08-31 10:45:47 +0000
commit4b46c1f6e891b1ddd5968536440b888661fade3e (patch)
treee0ba2c1f56f61b868bf746da5c4feabb25b800b2 /openembedded/packages/xserver/xserver-kdrive
downloadpoky-4b46c1f6e891b1ddd5968536440b888661fade3e.tar.gz
Initial population
git-svn-id: https://svn.o-hand.com/repos/poky@1 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'openembedded/packages/xserver/xserver-kdrive')
-rw-r--r--openembedded/packages/xserver/xserver-kdrive/devfs.patch47
-rw-r--r--openembedded/packages/xserver/xserver-kdrive/disable-apm.patch20
-rw-r--r--openembedded/packages/xserver/xserver-kdrive/epson.patch11
-rw-r--r--openembedded/packages/xserver/xserver-kdrive/fbdev-not-fix.patch14
-rw-r--r--openembedded/packages/xserver/xserver-kdrive/kmode.patch28
-rw-r--r--openembedded/packages/xserver/xserver-kdrive/onlyfb.patch21
-rw-r--r--openembedded/packages/xserver/xserver-kdrive/xserver-kdrive-poodle.patch44
7 files changed, 185 insertions, 0 deletions
diff --git a/openembedded/packages/xserver/xserver-kdrive/devfs.patch b/openembedded/packages/xserver/xserver-kdrive/devfs.patch
new file mode 100644
index 0000000000..a6238126c0
--- /dev/null
+++ b/openembedded/packages/xserver/xserver-kdrive/devfs.patch
@@ -0,0 +1,47 @@
1
2#
3# Patch managed by http://www.holgerschurig.de/patcher.html
4#
5
6--- xserver/hw/kdrive/linux/linux.c~devfs
7+++ xserver/hw/kdrive/linux/linux.c
8@@ -82,10 +82,10 @@
9 vtno = kdVirtualTerminal;
10 else
11 {
12- if ((fd = open("/dev/tty0",O_WRONLY,0)) < 0)
13+ if ((fd = open("/dev/vc/0",O_WRONLY,0)) < 0)
14 {
15 FatalError(
16- "LinuxInit: Cannot open /dev/tty0 (%s)\n",
17+ "LinuxInit: Cannot open /dev/tty/0 (%s)\n",
18 strerror(errno));
19 }
20 if ((ioctl(fd, VT_OPENQRY, &vtno) < 0) ||
21@@ -96,7 +96,7 @@
22 }
23 close(fd);
24
25- sprintf(vtname,"/dev/tty%d",vtno); /* /dev/tty1-64 */
26+ sprintf(vtname,"/dev/vc/%d",vtno); /* /dev/tty1-64 */
27
28 if ((LinuxConsoleFd = open(vtname, O_RDWR|O_NDELAY, 0)) < 0)
29 {
30@@ -113,7 +113,7 @@
31 *
32 * Why is this needed?
33 */
34- LinuxCheckChown ("/dev/tty0");
35+ LinuxCheckChown ("/dev/vc/0");
36 /*
37 * Linux doesn't switch to an active vt after the last close of a vt,
38 * so we do this ourselves by remembering which is active now.
39@@ -453,7 +453,7 @@
40 activeVT = -1;
41 }
42 close(LinuxConsoleFd); /* make the vt-manager happy */
43- fd = open ("/dev/tty0", O_RDWR|O_NDELAY, 0);
44+ fd = open ("/dev/vc/0", O_RDWR|O_NDELAY, 0);
45 if (fd >= 0)
46 {
47 memset (&vts, '\0', sizeof (vts)); /* valgrind */
diff --git a/openembedded/packages/xserver/xserver-kdrive/disable-apm.patch b/openembedded/packages/xserver/xserver-kdrive/disable-apm.patch
new file mode 100644
index 0000000000..bd8842721b
--- /dev/null
+++ b/openembedded/packages/xserver/xserver-kdrive/disable-apm.patch
@@ -0,0 +1,20 @@
1--- xserver/hw/kdrive/linux/linux.c.orig 2005-04-23 15:56:13.988849232 +0000
2+++ xserver/hw/kdrive/linux/linux.c 2005-04-23 15:57:05.001094192 +0000
3@@ -342,7 +342,7 @@
4 /*
5 * Open the APM driver
6 */
7- LinuxApmFd = open ("/dev/apm_bios", 2);
8+ /*LinuxApmFd = open ("/dev/apm_bios", 2);
9 if (LinuxApmFd < 0 && errno == ENOENT)
10 LinuxApmFd = open ("/dev/misc/apm_bios", 2);
11 if (LinuxApmFd >= 0)
12@@ -352,7 +352,7 @@
13 RegisterBlockAndWakeupHandlers (LinuxApmBlock, LinuxApmWakeup, 0);
14 AddEnabledDevice (LinuxApmFd);
15 }
16-
17+ */
18 /*
19 * now get the VT
20 */
diff --git a/openembedded/packages/xserver/xserver-kdrive/epson.patch b/openembedded/packages/xserver/xserver-kdrive/epson.patch
new file mode 100644
index 0000000000..07009bdc40
--- /dev/null
+++ b/openembedded/packages/xserver/xserver-kdrive/epson.patch
@@ -0,0 +1,11 @@
1--- xserver.orig/hw/kdrive/epson/epson13806stub.c 2004-10-20 10:20:51.000000000 +0200
2+++ xserver/hw/kdrive/epson/epson13806stub.c 2005-03-17 14:38:22.000000000 +0100
3@@ -55,7 +55,7 @@
4 {
5 KdInitInput (&LinuxMouseFuncs, &LinuxKeyboardFuncs);
6 #ifdef TOUCHSCREEN
7- KdInitTouchScreen (&TsFuncs);
8+ KdAddMouseDriver (&TsFuncs);
9 #endif
10 }
11
diff --git a/openembedded/packages/xserver/xserver-kdrive/fbdev-not-fix.patch b/openembedded/packages/xserver/xserver-kdrive/fbdev-not-fix.patch
new file mode 100644
index 0000000000..f87e7cc2cd
--- /dev/null
+++ b/openembedded/packages/xserver/xserver-kdrive/fbdev-not-fix.patch
@@ -0,0 +1,14 @@
1--- xserver/hw/kdrive/fbdev/fbdev.c~ 2004-09-15 00:08:10.000000000 +0100
2+++ xserver/hw/kdrive/fbdev/fbdev.c 2004-11-13 17:47:02.000000000 +0000
3@@ -198,6 +198,11 @@
4 return FALSE;
5 }
6
7+ /* Re-get the "fixed" parameters since they might have changed */
8+ k = ioctl (priv->fd, FBIOGET_FSCREENINFO, &priv->fix);
9+ if (k < 0)
10+ perror ("FBIOGET_FSCREENINFO");
11+
12 /* Now get the new screeninfo */
13 ioctl (priv->fd, FBIOGET_VSCREENINFO, &priv->var);
14 depth = priv->var.bits_per_pixel;
diff --git a/openembedded/packages/xserver/xserver-kdrive/kmode.patch b/openembedded/packages/xserver/xserver-kdrive/kmode.patch
new file mode 100644
index 0000000000..5ad3e4e277
--- /dev/null
+++ b/openembedded/packages/xserver/xserver-kdrive/kmode.patch
@@ -0,0 +1,28 @@
1--- /tmp/kmode.c 2005-06-27 14:46:19.716843288 +0200
2+++ xserver/hw/kdrive/src/kmode.c 2005-06-27 14:46:30.070269328 +0200
3@@ -41,6 +41,11 @@
4 1, 11, 14, KdSyncNegative,
5 },
6
7+ { 240, 320, 64, 0,
8+ 0, 0, 0, KdSyncNegative,
9+ 0, 0, 0, KdSyncNegative,
10+ },
11+
12 /* Other VESA modes */
13 { 640, 350, 85, 31500, /* VESA */
14 32, 96, 192, KdSyncPositive, /* 26.413 */
15@@ -80,6 +85,13 @@
16 16, 48, 160, KdSyncNegative, /* 31.469 */
17 10, 33, 45, KdSyncNegative, /* 59.940 */
18 },
19+
20+
21+ { 480, 640, 60, 0, /* VESA */
22+ 0, 0, 0, KdSyncNegative, /* 31.469 */
23+ 0, 0, 0, KdSyncNegative, /* 59.940 */
24+ },
25+
26
27 /* 800x600 modes */
28 { 800, 600, 85, 56250, /* VESA */
diff --git a/openembedded/packages/xserver/xserver-kdrive/onlyfb.patch b/openembedded/packages/xserver/xserver-kdrive/onlyfb.patch
new file mode 100644
index 0000000000..e773324981
--- /dev/null
+++ b/openembedded/packages/xserver/xserver-kdrive/onlyfb.patch
@@ -0,0 +1,21 @@
1
2#
3# Patch managed by http://www.holgerschurig.de/patcher.html
4#
5
6--- xserver/hw/kdrive/Makefile.am~onlyfb
7+++ xserver/hw/kdrive/Makefile.am
8@@ -17,12 +17,4 @@
9 SUBDIRS = \
10 src \
11 linux \
12- $(XSDL_SUBDIRS) \
13- $(FBDEV_SUBDIRS) \
14- $(VESA_SUBDIRS) \
15- $(XEPHYR_SUBDIRS) \
16- ati \
17- fake \
18- ephyr \
19- i810 \
20- epson
21+ $(FBDEV_SUBDIRS)
diff --git a/openembedded/packages/xserver/xserver-kdrive/xserver-kdrive-poodle.patch b/openembedded/packages/xserver/xserver-kdrive/xserver-kdrive-poodle.patch
new file mode 100644
index 0000000000..ce80a7e389
--- /dev/null
+++ b/openembedded/packages/xserver/xserver-kdrive/xserver-kdrive-poodle.patch
@@ -0,0 +1,44 @@
1
2#
3# Patch managed by http://www.holgerschurig.de/patcher.html
4#
5
6--- xserver/hw/kdrive/fbdev/fbdev.c~xserver-kdrive-poodle.patch
7+++ xserver/hw/kdrive/fbdev/fbdev.c
8@@ -190,6 +190,7 @@
9 var.nonstd = 0;
10 var.grayscale = 0;
11
12+ /* commented out for poodle
13 k = ioctl (priv->fd, FBIOPUT_VSCREENINFO, &var);
14
15 if (k < 0)
16@@ -198,10 +199,11 @@
17 return FALSE;
18 }
19
20- /* Re-get the "fixed" parameters since they might have changed */
21+ // Re-get the "fixed" parameters since they might have changed
22 k = ioctl (priv->fd, FBIOGET_FSCREENINFO, &priv->fix);
23 if (k < 0)
24 perror ("FBIOGET_FSCREENINFO");
25+ */
26
27 /* Now get the new screeninfo */
28 ioctl (priv->fd, FBIOGET_VSCREENINFO, &priv->var);
29@@ -659,13 +661,14 @@
30 priv->var.activate = FB_ACTIVATE_NOW|FB_CHANGE_CMAP_VBL;
31
32 /* display it on the LCD */
33+ /* commented out for poodle
34 k = ioctl (priv->fd, FBIOPUT_VSCREENINFO, &priv->var);
35 if (k < 0)
36 {
37 perror ("FBIOPUT_VSCREENINFO");
38 return FALSE;
39 }
40-
41+ */
42 if (priv->fix.visual == FB_VISUAL_DIRECTCOLOR)
43 {
44 struct fb_cmap cmap;