xserver: Branch 'master' - 2 commits

[Alan Coopersmith]

 hw/xfree86/os-support/solaris/sun_bell.c |    1 +
 hw/xfree86/os-support/solaris/sun_init.c |   31 -------------------------------
 2 files changed, 1 insertion(+), 31 deletions(-)

New commits:
diff-tree 7dc54a40e900cbea1e509620623b091d54a3c2d1 (from e46f7f78b362e76f5a553184e3f5ec7e109aa39d)
Author: Alan Coopersmith <alan.coopersmith at sun.com>
Date:   Thu Nov 2 16:38:47 2006 -0800

    Remove references to xf86Info.kbd* from solaris code

diff --git a/hw/xfree86/os-support/solaris/sun_init.c b/hw/xfree86/os-support/solaris/sun_init.c
index 691cb3f..08d35c5 100644
--- a/hw/xfree86/os-support/solaris/sun_init.c
+++ b/hw/xfree86/os-support/solaris/sun_init.c
@@ -291,23 +291,6 @@ xf86CloseConsole(void)
 #endif /* HAS_USL_VTS */
 
     close(xf86Info.consoleFd);
-
-#if defined(__SOL8__) || !defined(i386)
-
-    /*
-     * This probably shouldn't be here.  However, there is no corresponding
-     * xf86CloseKbd() routine - DWH
-     */
-
-    /* Set the keyboard into "indirect" mode and turn off even translation */
-    tmp = 0;
-    (void) ioctl(xf86Info.kbdFd, KIOCSDIRECT, &tmp);
-    tmp = TR_ASCII;
-    (void) ioctl(xf86Info.kbdFd, KIOCTRANS, &tmp);
-
-    close(xf86Info.kbdFd);
-
-#endif
 }
 
 int
@@ -357,16 +340,6 @@ xf86ProcessArgument(int argc, char **arg
 	    fb_dev[PATH_MAX - 1] = '\0';
 	    return 2;
 	}
-
-	if (!strcmp(argv[i], "-ar1")) {
-	    xf86Info.kbdDelay = atoi(argv[i + 1]) * 1000;
-	    return 2;
-	}
-
-	if (!strcmp(argv[i], "-ar2")) {
-	    xf86Info.kbdRate = atoi(argv[i + 1]) * 1000;
-	    return 2;
-	}
     }
 
 #endif
@@ -381,10 +354,6 @@ void xf86UseMsg()
 #endif
 #if defined(__SOL8__) || !defined(i386)
     ErrorF("-dev <fb>              Framebuffer device\n");
-    ErrorF("-ar1 <float>           Set autorepeat initiate time (sec)\n");
-    ErrorF("                       (if not using XKB)\n");
-    ErrorF("-ar2 <float>           Set autorepeat interval time (sec)\n");
-    ErrorF("                       (if not using XKB)\n");
 #endif
     ErrorF("-keeptty               Don't detach controlling tty\n");
     ErrorF("                       (for debugging only)\n");
diff-tree e46f7f78b362e76f5a553184e3f5ec7e109aa39d (from 58bf9a142d1957f4d77038ee4ce7b1116b1f7955)
Author: Alan Coopersmith <alan.coopersmith at sun.com>
Date:   Thu Nov 2 16:38:12 2006 -0800

    sun_bell.c needs to #include "xf86_OSlib.h"

diff --git a/hw/xfree86/os-support/solaris/sun_bell.c b/hw/xfree86/os-support/solaris/sun_bell.c
index 369103f..b3a9bfe 100644
--- a/hw/xfree86/os-support/solaris/sun_bell.c
+++ b/hw/xfree86/os-support/solaris/sun_bell.c
@@ -38,6 +38,7 @@
 
 #include "xf86.h"
 #include "xf86Priv.h"
+#include "xf86_OSlib.h"
 
 #define BELL_RATE       48000   /* Samples per second */
 #define BELL_HZ         50      /* Fraction of a second i.e. 1/x */