frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Xipaq build after layer/RandR additions

This commit is contained in:
Keith Packard 2001-05-29 17:47:55 +00:00
parent 78b53386b5
commit 562925c439
5 changed files with 60 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
hw/kdrive/fbdev/fbdev.c
View File

@ -21,7 +21,7 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $XFree86: xc/programs/Xserver/hw/kdrive/fbdev/fbdev.c,v 1.13 2001/05/25 07:44:29 alanh Exp $ */ /* $XFree86: xc/programs/Xserver/hw/kdrive/fbdev/fbdev.c,v 1.14 2001/05/29 04:54:11 keithp Exp $ */
#include "fbdev.h" #include "fbdev.h"
@ -768,3 +768,32 @@ fbdevPutColors (ScreenPtr pScreen, int fb, int n, xColorItem *pdefs)
cmap.transp = 0; cmap.transp = 0;
ioctl (priv->fd, FBIOPUTCMAP, &cmap); ioctl (priv->fd, FBIOPUTCMAP, &cmap);
} }
KdCardFuncs fbdevFuncs = {
fbdevCardInit, /* cardinit */
fbdevScreenInit, /* scrinit */
fbdevInitScreen, /* initScreen */
fbdevPreserve, /* preserve */
fbdevEnable, /* enable */
fbdevDPMS, /* dpms */
fbdevDisable, /* disable */
fbdevRestore, /* restore */
fbdevScreenFini, /* scrfini */
fbdevCardFini, /* cardfini */
0, /* initCursor */
0, /* enableCursor */
0, /* disableCursor */
0, /* finiCursor */
0, /* recolorCursor */
0, /* initAccel */
0, /* enableAccel */
0, /* syncAccel */
0, /* disableAccel */
0, /* finiAccel */
fbdevGetColors, /* getColors */
fbdevPutColors, /* putColors */
};

4
hw/kdrive/fbdev/fbdev.h
View File

@ -21,7 +21,7 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $XFree86: xc/programs/Xserver/hw/kdrive/fbdev/fbdev.h,v 1.5 2000/09/03 05:11:17 keithp Exp $ */ /* $XFree86: xc/programs/Xserver/hw/kdrive/fbdev/fbdev.h,v 1.9 2001/05/29 04:54:11 keithp Exp $ */
#ifndef _FBDEV_H_ #ifndef _FBDEV_H_
#define _FBDEV_H_ #define _FBDEV_H_
@ -52,6 +52,8 @@ typedef struct _fbdevScrPriv {
LayerPtr pLayer; LayerPtr pLayer;
} FbdevScrPriv; } FbdevScrPriv;
extern KdCardFuncs fbdevFuncs;
Bool Bool
fbdevInitialize (KdCardInfo *card, FbdevPriv *priv); fbdevInitialize (KdCardInfo *card, FbdevPriv *priv);

32
hw/kdrive/fbdev/fbinit.c
View File

@ -21,39 +21,10 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $XFree86: xc/programs/Xserver/hw/kdrive/fbdev/fbinit.c,v 1.6 2000/09/28 20:58:21 keithp Exp $ */ /* $XFree86: xc/programs/Xserver/hw/kdrive/fbdev/fbinit.c,v 1.7 2001/05/23 08:56:08 alanh Exp $ */
#include <fbdev.h> #include <fbdev.h>
KdCardFuncs fbdevFuncs = {
fbdevCardInit, /* cardinit */
fbdevScreenInit, /* scrinit */
fbdevInitScreen, /* initScreen */
fbdevPreserve, /* preserve */
fbdevEnable, /* enable */
fbdevDPMS, /* dpms */
fbdevDisable, /* disable */
fbdevRestore, /* restore */
fbdevScreenFini, /* scrfini */
fbdevCardFini, /* cardfini */
0, /* initCursor */
0, /* enableCursor */
0, /* disableCursor */
0, /* finiCursor */
0, /* recolorCursor */
0, /* initAccel */
0, /* enableAccel */
0, /* syncAccel */
0, /* disableAccel */
0, /* finiAccel */
fbdevGetColors, /* getColors */
fbdevPutColors, /* putColors */
};
#ifndef XIPAQ
void void
InitCard (char *name) InitCard (char *name)
{ {
@ -86,4 +57,3 @@ ddxProcessArgument (int argc, char **argv, int i)
{ {
return KdProcessArgument (argc, argv, i); return KdProcessArgument (argc, argv, i);
} }
#endif

3
hw/kdrive/ipaq/ipaq.c
View File

@ -22,12 +22,11 @@
* Adapted from ts300.c by Alan Hourihane <alanh@fairlite.demon.co.uk> * Adapted from ts300.c by Alan Hourihane <alanh@fairlite.demon.co.uk>
* For the Compaq IPAQ handheld, with the HP VGA Out Card (F1252A). * For the Compaq IPAQ handheld, with the HP VGA Out Card (F1252A).
*/ */
/* $XFree86: $ */ /* $XFree86: xc/programs/Xserver/hw/kdrive/ipaq/ipaq.c,v 1.1 2001/05/23 17:28:39 alanh Exp $ */
#include "pcmcia.h" #include "pcmcia.h"
extern KdCardFuncs pcmciaFuncs; extern KdCardFuncs pcmciaFuncs;
extern KdCardFuncs fbdevFuncs;
void void
InitCard (char *name) InitCard (char *name)

44
hw/kdrive/pcmcia/pcmciashadow.c
View File

@ -21,7 +21,7 @@
* *
* Authors: Alan Hourihane, <alanh@fairlite.demon.co.uk> * Authors: Alan Hourihane, <alanh@fairlite.demon.co.uk>
*/ */
/* $XFree86$ */ /* $XFree86: xc/programs/Xserver/hw/kdrive/pcmcia/pcmciashadow.c,v 1.1 2001/05/23 08:56:09 alanh Exp $ */
#include "X.h" #include "X.h"
#include "scrnintstr.h" #include "scrnintstr.h"
@ -37,10 +37,11 @@
#include "fb.h" #include "fb.h"
void void
tridentUpdatePacked (ScreenPtr pScreen, tridentUpdatePacked (ScreenPtr pScreen,
PixmapPtr pShadow, shadowBufPtr pBuf)
RegionPtr damage)
{ {
RegionPtr damage = &pBuf->damage;
PixmapPtr pShadow = pBuf->pPixmap;
shadowScrPriv(pScreen); shadowScrPriv(pScreen);
int nbox = REGION_NUM_RECTS (damage); int nbox = REGION_NUM_RECTS (damage);
BoxPtr pbox = REGION_RECTS (damage); BoxPtr pbox = REGION_RECTS (damage);
@ -48,12 +49,13 @@ tridentUpdatePacked (ScreenPtr pScreen,
FbStride shaStride; FbStride shaStride;
int scrBase, scrLine, scr; int scrBase, scrLine, scr;
int shaBpp; int shaBpp;
int shaXoff, shaYoff; /* XXX assumed to be zero */
int x, y, w, h, width; int x, y, w, h, width;
int i; int i;
FbBits *winBase, *win; FbBits *winBase, *win;
CARD32 winSize; CARD32 winSize;
fbGetDrawable (&pShadow->drawable, shaBase, shaStride, shaBpp); fbGetDrawable (&pShadow->drawable, shaBase, shaStride, shaBpp, shaXoff, shaYoff);
while (nbox--) while (nbox--)
{ {
x = pbox->x1 * shaBpp; x = pbox->x1 * shaBpp;
@ -79,11 +81,12 @@ tridentUpdatePacked (ScreenPtr pScreen,
i = scrBase + winSize - scr; i = scrBase + winSize - scr;
if (i <= 0 || scr < scrBase) if (i <= 0 || scr < scrBase)
{ {
winBase = (FbBits *) (*pScrPriv->window) (pScreen, winBase = (FbBits *) (*pBuf->window) (pScreen,
y, y,
scr * sizeof (FbBits), scr * sizeof (FbBits),
SHADOW_WINDOW_WRITE, SHADOW_WINDOW_WRITE,
&winSize); &winSize,
pBuf->closure);
if(!winBase) if(!winBase)
return; return;
scrBase = scr; scrBase = scr;
@ -113,10 +116,11 @@ tridentUpdatePacked (ScreenPtr pScreen,
} }
void void
cirrusUpdatePacked (ScreenPtr pScreen, cirrusUpdatePacked (ScreenPtr pScreen,
PixmapPtr pShadow, shadowBufPtr pBuf)
RegionPtr damage)
{ {
RegionPtr damage = &pBuf->damage;
PixmapPtr pShadow = pBuf->pPixmap;
shadowScrPriv(pScreen); shadowScrPriv(pScreen);
int nbox = REGION_NUM_RECTS (damage); int nbox = REGION_NUM_RECTS (damage);
BoxPtr pbox = REGION_RECTS (damage); BoxPtr pbox = REGION_RECTS (damage);
@ -124,12 +128,13 @@ cirrusUpdatePacked (ScreenPtr pScreen,
FbStride shaStride; FbStride shaStride;
int scrBase, scrLine, scr; int scrBase, scrLine, scr;
int shaBpp; int shaBpp;
int shaXoff, shaYoff; /* XXX assumed to be zero */
int x, y, w, h, width; int x, y, w, h, width;
int i; int i;
FbBits *winBase, *win; FbBits *winBase, *win;
CARD32 winSize; CARD32 winSize;
fbGetDrawable (&pShadow->drawable, shaBase, shaStride, shaBpp); fbGetDrawable (&pShadow->drawable, shaBase, shaStride, shaBpp, shaXoff, shaYoff);
while (nbox--) while (nbox--)
{ {
x = pbox->x1 * shaBpp; x = pbox->x1 * shaBpp;
@ -155,11 +160,12 @@ cirrusUpdatePacked (ScreenPtr pScreen,
i = scrBase + winSize - scr; i = scrBase + winSize - scr;
if (i <= 0 || scr < scrBase) if (i <= 0 || scr < scrBase)
{ {
winBase = (FbBits *) (*pScrPriv->window) (pScreen, winBase = (FbBits *) (*pBuf->window) (pScreen,
y, y,
scr * sizeof (FbBits), scr * sizeof (FbBits),
SHADOW_WINDOW_WRITE, SHADOW_WINDOW_WRITE,
&winSize); &winSize,
pBuf->closure);
if(!winBase) if(!winBase)
return; return;
scrBase = scr; scrBase = scr;