3336. Fx up new MMIO macros (#3337, Matt Grossman).xf-3_9_16fxf-3_9_16exf-3_9_16dxf-3_9_16Z

3335. Clean up compiler warnings in lib/font/bitmap (#3411, Matt Grossman).
3334. TGA fixes, add sync on green (#3410, Matt Grossman).
3333. Fix NULL pointer dereference in libXaw (#3406, Christopher Sekiya).
3332. Add Rage128 support (#3405, Rik Faith, funded by ATI).
3331. Add MTRR support for NetBSD and OpenBSD. Add new NetBSD aperture
    driver (#3404, Matthieu Herrb).
3330. Xterm patch #121 (#3402, Thomas Dickey).
3329. Rendition driver bugfixes and alpha related cleanups (#3400, Dejan
    Ilic, Marc Langenbach, Egbert Eich).
3328. Add void input device (#3392, Frederic Lepied).
3327. Changed the Xon serial option to be able to select xon/xoff for
    input, output or both. Add support for Graphire models. Change wacom
    init phase to use new Xoff option (#3391, Frederic Lepied).
3326. Change the SwapAxes option to SwapXY in elographics/microtouch driver
    to match an already existing option in the Dynapro driver. Add a Focus
    class capability to the elographics driver (#3395, Patrick Lecoanet).
3325. Update mouse rate handling (#3388, Harald Koenig).
3324. Fix NULL pointer dereference in misprite.c (#3380, Edward Wang).
3323. Add FBDev and ShadowFB support to glint driver. Add new option
    "NoWriteBitmap" (#3383, Michel Daenzer).
3322. Update SuperProbe to handle S3 Savage4, Savage200 and clean up
    Trio3D/Savage3D detection (#3382,3384 Harald Koenig).
3321. Add new framebuffer code and tiny X DDX architecture (#3379, Keith
    Packard).
3320. Add DGA2 documentation (#3378, Mark Vojkovich).
3319. Update XFree86 manpage wrt -bpp/-depth/-fbbpp (#3377, Andy Isaacson).
3318. Make SuperProbe check primary cards, only (#3374, Harald Koenig).
3317. Add SilkenMouse to *BSD (#3373, Matthieu Herrb).
3316. Allow SilkenMouse to work if not all drivers of an OS support SIGIO
    (#3372, Keith Packard).
3315. Fix a few problems in TGA driver and add support for backing store
    and SilkenMouse (#3371, Matt Grossman).
3314. Add smarter scheduler (#3370, Keith Packard).
3313. Xterm patch #120 (#3369, Thomas Dickey).
3312. Enable xf86SetKbdRate function on Solaris 8 (#3364, David Holland).
3311. Fix some bugs and add acceleration to Rendition server (#3360, Dejan
    Ilic).
3310. Make raw DDC information available as properties in the root window
    (#3357, Andrew Aitchison).
3309. Fix for xf86CreateRootWindow (#3355, Andrew Aitchison).
3308. Add manpage for the chips driver (#3353, David Bateman).
3307. Update contact info (#3352, Andrew van der Stock).
3306. Add kbd rate support for Linux (#3363, Harald Koenig).
3305. Update Portuguese XKB map (#3351, Joao Esteves, Francisco Colaco).
3304. Fix text clipping in 3dfx driver (#3349, Henrik Harmsen).
3303. Fix S3 ViRGE hw cursor (#3348, Harald Koenig).
3302. Fix clipping in 3dfx driver (#3342, Daryll Strauss).
3301. Enable SilkenMouse for 3dfx driver (#3341, Henrik Harmsen).
3300. Enable SIGIO support on LynxOS (#3339, Thomas Mueller).
3299. Get TRUE defined in sigio.c. Fix xterm compile problem on ISC (#3338,
    Michael Rohleder).
3298. Correct DPMS suspend/standby modes for 3dfx driver (#3336, Henrik
    Harmsen)
3297. Xterm patch #119 (#3335, Thomas Dickey).

1 files changed, 311 insertions, 0 deletions

diff --git a/hw/kdrive/itsy/itsy.c b/hw/kdrive/itsy/itsy.c
new file mode 100644
index 000000000..68ce60aaa
--- /dev/null
+++ b/hw/kdrive/itsy/itsy.c
@@ -0,0 +1,311 @@
+/*
+ * $Id$
+ *
+ * Copyright © 1999 Keith Packard
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of Keith Packard not be used in
+ * advertising or publicity pertaining to distribution of the software without
+ * specific, written prior permission.  Keith Packard makes no
+ * representations about the suitability of this software for any purpose.  It
+ * is provided "as is" without express or implied warranty.
+ *
+ * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
+/* $XFree86: $ */
+
+#include "itsy.h"
+
+/* struct with LCD characteristics defined in fb_brutus.h  */
+static struct FbLcdParamsStruct fbLcdParams; 
+static int fb_d;
+static int fbn;
+Bool
+itsyCardInit (KdCardInfo *card)
+{
+    int	    k;
+    char    *fb;
+    char    *pixels;
+
+    if ((fb_d = open("/dev/fbclone", O_RDWR)) < 0) {
+	perror("Error opening /dev/fb\n");
+	return FALSE;
+    }
+    if ((k=ioctl(fb_d, FB_LCD_PARAMS, &fbLcdParams)) != 0) {
+	perror("Error with /dev/fb ioctl FB_LCD_PARAMS call");
+	return FALSE;
+    }
+
+    fb = (char *) mmap ((caddr_t) NULL, fbLcdParams.frameBufferSize,
+			PROT_READ|PROT_WRITE, MAP_FILE|MAP_SHARED, fb_d, 0);
+
+    fprintf (stderr, "fb mapped at 0x%x\n", fb);
+    if (fb == (char *)-1) {
+	perror("ERROR: mmap framebuffer fails!");
+	return FALSE;
+    }
+    
+    card->driver = fb;
+    
+    return TRUE;
+}
+
+Bool
+itsyScreenInit (KdScreenInfo *screen)
+{
+    CARD8   *fb = screen->card->driver;
+
+    screen->width = fbLcdParams.screenSizeH;
+    screen->height = fbLcdParams.screenSizeV;
+    screen->depth = fbLcdParams.bitsPerPixel;
+    screen->bitsPerPixel = fbLcdParams.bitsPerPixel;
+    screen->byteStride = fbLcdParams.frameBufferSizeH;
+    screen->pixelStride = (fbLcdParams.frameBufferSizeH * 8 / 
+			   fbLcdParams.bitsPerPixel);
+    fprintf (stderr, "width %d height %d depth %d pstride %d bstride %d\n",
+	     screen->width, screen->height, screen->depth, 
+	     screen->pixelStride, screen->byteStride);
+    screen->dumb = FALSE;
+    screen->softCursor = TRUE;
+    screen->blueMask = 0;
+    screen->greenMask = 0;
+    screen->redMask = 0;
+    screen->visuals = 1 << StaticGray;
+    screen->rate = 72;
+    screen->frameBuffer = (CARD8 *) (fb + 
+				     fbLcdParams.pixelDataOffset +
+				     (fbLcdParams.reserveTopRows * 
+				      screen->byteStride));
+    fprintf (stderr, "Frame buffer 0x%x\n", screen->frameBuffer);
+    return TRUE;
+}
+
+void
+itsyPreserve (KdCardInfo *card)
+{
+}
+
+void
+itsyEnable (ScreenPtr pScreen)
+{
+    KdScreenPriv(pScreen);
+
+    fprintf (stderr, "Enabling LCD display\n");
+    /* display it on the LCD */
+    ioctl(fb_d, FB_LCD_SHOW, 0);
+}
+
+Bool
+itsyDPMS (ScreenPtr pScreen, int mode)
+{
+    if (mode)
+	ioctl (fb_d, FB_LCD_OFF, 0);
+    else
+	ioctl (fb_d, FB_LCD_ON, 0);
+    return TRUE;
+}
+
+void
+itsyDisable (ScreenPtr pScreen)
+{
+/*    ioctl (fb_d, FB_LCD_SWITCH, 0); */
+/*    fprintf (stderr, "Disabling LCD display\n");*/
+}
+
+void
+itsyRestore (KdCardInfo *card)
+{
+}
+
+void
+itsyScreenFini (KdScreenInfo *screen)
+{
+}
+
+void
+itsyCardFini (KdCardInfo *card)
+{
+    int	k;
+    
+    fprintf (stderr, "Unmapping driver at 0x%x\n", card->driver);
+    munmap (card->driver, fbLcdParams.frameBufferSize);
+    fprintf (stderr, "Releasing fbn %d\n", fbn);
+    /* release it */
+    if (ioctl(fb_d, FB_LCD_FREE, fbn) != 0) {
+	printf("FB_LCD_FREE of %d fails!\n", fbn);
+    }
+    close (fb_d);
+    fprintf (stderr, "itsyFini done\n");
+}
+
+static unsigned short itsyIntensity[16] = {
+    0xffff,
+    0xffff,
+    0xedb6,
+    0xdb6d,
+    0xc924,
+    0xb6db,
+    0xa492,
+    0x9249,
+    0x8000,
+    0x6db6,
+    0x5b6d,
+    0x4924,
+    0x36db,
+    0x2492,
+    0x1249,
+    0x0000,
+};
+
+Bool
+itsyCreateColormap (ColormapPtr pmap)
+{
+    int	    i;
+
+    for (i = 0; i < 16; i++)
+    {
+	pmap->red[i].co.local.red = itsyIntensity[i];
+	pmap->red[i].co.local.green = itsyIntensity[i];
+	pmap->red[i].co.local.blue = itsyIntensity[i];
+    }
+    return TRUE;
+}
+
+Bool
+itsySetupScreen (ScreenPtr pScreen)
+{
+    pScreen->CreateColormap = itsyCreateColormap;
+    return FALSE;
+}
+
+KdCardFuncs	itsyFuncs = {
+    itsyCardInit,	    /* cardinit */
+    itsyScreenInit,	    /* scrinit */
+    itsyPreserve,	    /* preserve */
+    itsyEnable,		    /* enable */
+    itsyDPMS,		    /* dpms */
+    itsyDisable,	    /* disable */
+    itsyRestore,	    /* restore */
+    itsyScreenFini,	    /* scrfini */
+    itsyCardFini,	    /* cardfini */
+    
+    0,			    /* initCursor */
+    0,			    /* enableCursor */
+    0,			    /* disableCursor */
+    0,			    /* finiCursor */
+    0,			    /* recolorCursor */
+    
+    itsySetupScreen,	    /* initAccel */
+    0,			    /* enableAccel */
+    0,			    /* disableAccel */
+    0,			    /* finiAccel */
+    
+    0,			    /* getColors */
+    0,			    /* putColors */
+};
+
+void
+InitCard (void)
+{
+    KdCardAttr	attr;
+    
+    KdCardInfoAdd (&itsyFuncs, &attr, 0);
+}
+
+void
+InitOutput (ScreenInfo *pScreenInfo, int argc, char **argv)
+{
+    KdInitOutput (pScreenInfo, argc, argv);
+}
+
+void
+InitInput (int argc, char **argv)
+{
+    KdInitInput (&itsyTsMouseFuncs, &itsyKeyboardFuncs);
+}
+
+int	itsySessionFd = -1;
+
+int
+ItsyOsInit (void)
+{
+    pid_t		sid;
+    int			i;
+    itsy_session_info	info;
+
+    if (itsySessionFd < 0)
+    {
+	itsySessionFd = open ("/dev/session", 0);
+	ErrorF("itsySessionFD %d\n", itsySessionFd);
+    }
+    
+    (void) setsid ();
+    sid = getsid (0);
+    ErrorF ("Session ID %d PID %d\n", sid, getpid ());
+    info.sid = sid;
+    strcpy (info.name, "X");
+    if (itsySessionFd >= 0)
+    {
+	i = ioctl (itsySessionFd, SESSION_SET_INFO, &info);
+	if (i < 0)
+	    perror ("SESSION_SET_INFO");
+    }
+    return 1;
+}
+
+void
+ItsyOsEnable (void)
+{
+    itsy_session_request    req;
+    int			    i;
+    
+#define MANAGER_SID_TO_FOREGROUND	2
+    
+    req.operation = MANAGER_SID_TO_FOREGROUND;
+    req.data = 0;
+    if (itsySessionFd >= 0)
+    {
+	i = ioctl (itsySessionFd, SESSION_MANAGER_REQUEST, &req);
+	if (i < 0)
+	    perror ("SESSION_MANAGER_REQUEST");
+    }
+}
+
+Bool
+ItsyOsSpecialKey (KeySym sym)
+{
+    return FALSE;
+}
+
+void
+ItsyOsDisable (void)
+{
+}
+
+void
+ItsyOsFini (void)
+{
+}
+
+KdOsFuncs   ItsyOsFuncs = {
+    ItsyOsInit,
+    ItsyOsEnable,
+    ItsyOsSpecialKey,
+    ItsyOsDisable,
+    ItsyOsFini,
+};
+    
+void
+OsVendorInit (void)
+{
+    KdOsInit (&ItsyOsFuncs);
+}