[oe-commits] org.oe.dev xserver-kdrive: remove a blocking read in the keyboard driver resume path

[pH5 commit]

xserver-kdrive: remove a blocking read in the keyboard driver resume path

Author: pH5 at openembedded.org
Branch: org.openembedded.dev
Revision: f2b8d4851ff5b7fd949b0d144c4e71f1e8bf1307
ViewMTN: http://monotone.openembedded.org/revision/info/f2b8d4851ff5b7fd949b0d144c4e71f1e8bf1307
Files:
1
packages/xorg-xserver/xserver-kdrive-1.4/keyboard-resume-workaround.patch
packages/xorg-xserver/xserver-kdrive_1.4.bb
Diffs:

#
# mt diff -r9ffd2a28e373f472fe60ae833c1effe73b2bed70 -rf2b8d4851ff5b7fd949b0d144c4e71f1e8bf1307
#
# 
# 
# add_file "packages/xorg-xserver/xserver-kdrive-1.4/keyboard-resume-workaround.patch"
#  content [5979fd8232b2f45460bbf4bb52a15b3bcedb90cf]
# 
# patch "packages/xorg-xserver/xserver-kdrive_1.4.bb"
#  from [b08682b1e497d6999914f7b52000ff0293b6b2ef]
#    to [e924574025f2310b2e6051f3aeef14fd3082d730]
# 
============================================================
--- packages/xorg-xserver/xserver-kdrive-1.4/keyboard-resume-workaround.patch	5979fd8232b2f45460bbf4bb52a15b3bcedb90cf
+++ packages/xorg-xserver/xserver-kdrive-1.4/keyboard-resume-workaround.patch	5979fd8232b2f45460bbf4bb52a15b3bcedb90cf
@@ -0,0 +1,18 @@
+Index: xorg-server-1.4/hw/kdrive/linux/keyboard.c
+===================================================================
+--- xorg-server-1.4.orig/hw/kdrive/linux/keyboard.c	2007-09-29 18:31:15.000000000 +0200
++++ xorg-server-1.4/hw/kdrive/linux/keyboard.c	2007-09-29 18:33:02.000000000 +0200
+@@ -743,11 +743,8 @@
+     cfsetispeed(&nTty, 9600);
+     cfsetospeed(&nTty, 9600);
+     tcsetattr(fd, TCSANOW, &nTty);
+-    /*
+-     * Flush any pending keystrokes
+-     */
+-    while ((n = read (fd, buf, sizeof (buf))) > 0)
+-	;
++    n = fcntl(fd, F_GETFL);
++    fprintf(stderr, "LinuxConsoleFd status flags: %x (O_NONBLOCK = %x)\n", n, O_NONBLOCK);
+     KdRegisterFd (fd, LinuxKeyboardRead, ki);
+     return Success;
+ }
============================================================
--- packages/xorg-xserver/xserver-kdrive_1.4.bb	b08682b1e497d6999914f7b52000ff0293b6b2ef
+++ packages/xorg-xserver/xserver-kdrive_1.4.bb	e924574025f2310b2e6051f3aeef14fd3082d730
@@ -1,9 +1,9 @@ PE = "1"
 require xserver-kdrive-common.inc
 
 DEPENDS += "hal libxkbfile libxcalibrate pixman"
 
 PE = "1"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
 	${KDRIVE_COMMON_PATCHES} \
@@ -20,6 +20,7 @@ SRC_URI = "${XORG_MIRROR}/individual/xse
 	file://xcalibrate-new-input-world-order.patch;patch=1 \
 	file://tslib-default-device.patch;patch=1 \
 	file://fbdev-evdev.patch;patch=1 \
+	file://keyboard-resume-workaround.patch;patch=1 \
 	file://xorg-avr32-support.diff;patch=1 \
         "