Bug 5798 - fix sysmouse for DragonFly
Summary: fix sysmouse for DragonFly
Status: RESOLVED FIXED
Alias: None
Product: xorg
Classification: Unclassified
Component: Server/General (show other bugs)
Version: 6.9.0
Hardware: x86 (IA32) other
: high normal
Assignee: Xorg Project Team
QA Contact: Xorg Project Team
URL:
Whiteboard:
Keywords: patch
Depends on:
Blocks: 5799
  Show dependency treegraph
 
Reported: 2006-02-03 13:46 UTC by Jeremy C. Reed
Modified: 2011-10-15 15:33 UTC (History)
0 users

See Also:
i915 platform:
i915 features:


Attachments

Description Jeremy C. Reed 2006-02-03 13:46:20 UTC
I already committed fix for modular HEAD's hw/xfree86/os-support/xf86_OSlib.h

Fix sysmouse handling on DragonFly, mostly garbage arrived.
From Joerg Sonnenberger.

Here is patch for monolithic:
$NetBSD: patch-av,v 1.4 2006/02/01 20:21:59 joerg Exp $

--- programs/Xserver/hw/xfree86/os-support/xf86_OSlib.h.orig	2005-11-08
06:33:29.000000000 +0000
+++ programs/Xserver/hw/xfree86/os-support/xf86_OSlib.h
@@ -445,7 +445,7 @@ extern int errno;
 /* Kernel of *BSD                                                         */
 /**************************************************************************/
 #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || \
- defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__)
+ defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__) ||
defined(__DragonFly__)
 
 # include <sys/param.h>
 # if defined(__FreeBSD_version) && !defined(__FreeBSD_kernel_version)
@@ -470,11 +470,11 @@ extern int errno;
 #   endif
 #   ifdef SYSCONS_SUPPORT
 #    define COMPAT_SYSCONS
-#    if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
+#    if defined(__NetBSD__) || defined(__OpenBSD__)
 #     include <machine/console.h>
 #    else
-#     if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-#        if (__FreeBSD_kernel_version >= 410000)
+#     if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) ||
defined(__DragonFly__)
+#        if defined(__DragonFly__)  || (__FreeBSD_kernel_version >= 410000)
 #          include <sys/consio.h>
 #          include <sys/kbio.h>
 #        else
@@ -488,7 +488,7 @@ extern int errno;
 #   if defined(PCVT_SUPPORT)
 #    if !defined(SYSCONS_SUPPORT)
       /* no syscons, so include pcvt specific header file */
-#     if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) ||
defined(__DragonFly__)
+#     if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
 #      include <machine/pcvt_ioctl.h>
 #     else
 #      if defined(__NetBSD__) || defined(__OpenBSD__)
@@ -511,8 +511,8 @@ extern int errno;
 #    include <dev/wscons/wsconsio.h>
 #    include <dev/wscons/wsdisplay_usl_io.h>
 #   endif /* WSCONS_SUPPORT */
-#   if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-#    if (__FreeBSD_kernel_version >= 500013)
+#   if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) ||
defined(__DragonFly__)
+#    if defined(__FreeBSD_kernel_version) && (__FreeBSD_kernel_version >= 500013)
 #     include <sys/mouse.h>
 #    else
 #     undef MOUSE_GETINFO
Comment 1 Erik Andren 2006-04-30 17:08:07 UTC
Is this also merged to modular xorg?
Comment 2 Daniel Stone 2006-06-03 03:43:27 UTC
yeah, it is
Comment 3 Daniel Stone 2007-02-27 01:30:15 UTC
Sorry about the phenomenal bug spam, guys.  Adding xorg-team@ to the QA contact so bugs don't get lost in future.
Comment 4 Paulo César Pereira de Andrade 2008-11-29 21:41:49 UTC
  I think this bug can be closed, as the
patch is already in modular Xorg.


Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.