[Glibc-bsd-commits] r2713 - in trunk/kfreebsd-7/debian: . patches

[Aurelien Jarno]

Author: aurel32
Date: 2009-08-20 13:34:51 +0000 (Thu, 20 Aug 2009)
New Revision: 2713

Added:
   trunk/kfreebsd-7/debian/patches/914_psm.diff
Modified:
   trunk/kfreebsd-7/debian/changelog
Log:
  * 914_psm.diff: fix PS/2 mouse support in Xorg.



Modified: trunk/kfreebsd-7/debian/changelog
===================================================================
--- trunk/kfreebsd-7/debian/changelog	2009-08-20 13:21:53 UTC (rev 2712)
+++ trunk/kfreebsd-7/debian/changelog	2009-08-20 13:34:51 UTC (rev 2713)
@@ -8,9 +8,9 @@
   * Add basic support for /etc/kernel-img.conf (do_symlinks, preinst_hook,
     prerm_hook, postinst_hook, postrm_hook), to be able to call update-grub
     after a kernel installation.
-  * 
+  * 914_psm.diff: fix PS/2 mouse support in Xorg.
 
- -- Aurelien Jarno <aurel32 at debian.org>  Thu, 20 Aug 2009 15:16:35 +0200
+ -- Aurelien Jarno <aurel32 at debian.org>  Thu, 20 Aug 2009 15:34:31 +0200
 
 kfreebsd-7 (7.2-3) unstable; urgency=low
 

Added: trunk/kfreebsd-7/debian/patches/914_psm.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/914_psm.diff	                        (rev 0)
+++ trunk/kfreebsd-7/debian/patches/914_psm.diff	2009-08-20 13:34:51 UTC (rev 2713)
@@ -0,0 +1,75 @@
+This patch fixes PS/2 mouse support with xserver-xorg-input-mouse 1.4.0.
+It is a revert of upstream commit r18970:
+
+| Teach psm about O_ASYNC
+| 
+| This makes Xorg happy if you aren't using moused.
+
+--- src.orig/sys/dev/atkbdc/psm.c
++++ src/sys/dev/atkbdc/psm.c
+@@ -70,10 +70,7 @@
+ #include <sys/module.h>
+ #include <sys/bus.h>
+ #include <sys/conf.h>
+-#include <sys/filio.h>
+ #include <sys/poll.h>
+-#include <sys/sigio.h>
+-#include <sys/signalvar.h>
+ #include <sys/syslog.h>
+ #include <machine/bus.h>
+ #include <sys/rman.h>
+@@ -215,7 +212,6 @@
+ 	struct cdev	*bdev;
+ 	int		lasterr;
+ 	int		cmdcount;
+-	struct sigio	*async;		/* Processes waiting for SIGIO */
+ };
+ static devclass_t psm_devclass;
+ #define	PSM_SOFTC(unit)	\
+@@ -1387,7 +1383,6 @@
+ 	sc->mode.level = sc->dflt_mode.level;
+ 	sc->mode.protocol = sc->dflt_mode.protocol;
+ 	sc->watchdog = FALSE;
+-	sc->async = NULL;
+ 
+ 	/* flush the event queue */
+ 	sc->queue.count = 0;
+@@ -1527,12 +1522,6 @@
+ 	/* remove anything left in the output buffer */
+ 	empty_aux_buffer(sc->kbdc, 10);
+ 
+-	/* clean up and sigio requests */
+-	if (sc->async != NULL) {
+-		funsetown(&sc->async);
+-		sc->async = NULL;
+-	}
+-
+ 	/* close is almost always successful */
+ 	sc->state &= ~PSM_OPEN;
+ 	kbdc_lock(sc->kbdc, FALSE);
+@@ -2094,15 +2083,6 @@
+ 		break;
+ #endif /* MOUSE_GETHWID */
+ 
+-	case FIONBIO:
+-	case FIOASYNC:
+-		break;
+-	case FIOSETOWN:
+-		error = fsetown(*(int *)addr, &sc->async);
+-		break;
+-	case FIOGETOWN:
+-		*(int *) addr = fgetown(&sc->async);
+-		break;
+ 	default:
+ 		return (ENOTTY);
+ 	}
+@@ -2992,9 +2972,6 @@
+ 		wakeup(sc);
+ 	}
+ 	selwakeuppri(&sc->rsel, PZERO);
+-	if (sc->async != NULL) {
+-		pgsigio(&sc->async, SIGIO, 0);
+-	}
+ 	sc->state &= ~PSM_SOFTARMED;
+ 	splx(s);
+ }