andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

More warning cleanup.

Browse Source
This commit is contained in:
Adam Jackson 2006-03-29 01:05:09 +00:00
parent 52d9ce7f4f
commit ff6f88348c
18 changed files with 82 additions and 241 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ChangeLog
View File

@ -1,3 +1,24 @@
2006-03-28 Adam Jackson <ajax@freedesktop.org>
* afb/afbbitblt.c:
* afb/afbcmap.c:
* afb/afbfillarc.c:
* afb/afbfillrct.c:
* afb/afbpushpxl.c:
* afb/afbscrinit.c:
* afb/afbzerarc.c:
* hw/dmx/input/usb-other.c:
* hw/xfree86/common/xf86xv.c:
* hw/xfree86/dri/dri.c:
* hw/xfree86/fbdevhw/fbdevhw.c:
* hw/xfree86/i2c/fi1236.c:
* hw/xfree86/i2c/msp3430.c:
* hw/xfree86/i2c/uda1380.c:
* hw/xfree86/xf4bpp/ppcGetSp.c:
* hw/xfree86/xf8_16bpp/cfbscrinit.c:
* hw/xfree86/xf8_32bpp/cfbimage.c:
More warning cleanup.
2006-03-28 Kristian Høgsberg <krh@redhat.com>
* configure.ac: Fix another typo.

48
afb/afbbitblt.c
View File

@ -104,12 +104,7 @@ destination. this is a simple translation.
*/
void
afbDoBitblt(pSrc, pDst, alu, prgnDst, pptSrc, planemask)
DrawablePtr pSrc, pDst;
int alu;
RegionPtr prgnDst;
DDXPointPtr pptSrc;
unsigned long planemask;
afbDoBitblt(DrawablePtr pSrc, DrawablePtr pDst, int alu, RegionPtr prgnDst, DDXPointPtr pptSrc, long unsigned int planemask)
{
switch (alu) {
case GXcopy:
@ -130,17 +125,13 @@ afbDoBitblt(pSrc, pDst, alu, prgnDst, pptSrc, planemask)
}
}
typedef void (*afb_blit_func)
(DrawablePtr, DrawablePtr, int, RegionPtr, DDXPointPtr, unsigned long);
RegionPtr
afbCopyArea(pSrcDrawable, pDstDrawable, pGC, srcx, srcy, width, height,
dstx, dsty)
DrawablePtr pSrcDrawable;
DrawablePtr pDstDrawable;
GC *pGC;
int srcx, srcy;
int width, height;
int dstx, dsty;
afbCopyArea(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable, GC *pGC, int srcx, int srcy, int width, int height, int dstx, int dsty)
{
void (*doBitBlt)();
afb_blit_func doBitBlt;
switch (pGC->alu) {
case GXcopy:
@ -165,16 +156,7 @@ afbCopyArea(pSrcDrawable, pDstDrawable, pGC, srcx, srcy, width, height,
}
RegionPtr
afbBitBlt(pSrcDrawable, pDstDrawable, pGC, srcx, srcy, width, height,
dstx, dsty, doBitBlt, planemask)
register DrawablePtr pSrcDrawable;
register DrawablePtr pDstDrawable;
register GC *pGC;
int srcx, srcy;
int width, height;
int dstx, dsty;
void (*doBitBlt)();
unsigned long planemask;
afbBitBlt(register DrawablePtr pSrcDrawable, register DrawablePtr pDstDrawable, register GC *pGC, int srcx, int srcy, int width, int height, int dstx, int dsty, afb_blit_func doBitBlt, long unsigned int planemask)
{
RegionPtr prgnSrcClip = NULL; /* may be a new region, or just a copy */
Bool freeSrcClip = FALSE;
@ -366,14 +348,7 @@ afbBitBlt(pSrcDrawable, pDstDrawable, pGC, srcx, srcy, width, height,
}
RegionPtr
afbCopyPlane(pSrcDrawable, pDstDrawable, pGC, srcx, srcy, width, height,
dstx, dsty, plane)
DrawablePtr pSrcDrawable, pDstDrawable;
register GC *pGC;
int srcx, srcy;
int width, height;
int dstx, dsty;
unsigned long plane;
afbCopyPlane(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable, register GC *pGC, int srcx, int srcy, int width, int height, int dstx, int dsty, long unsigned int plane)
{
int alu;
RegionPtr prgnExposed = NULL;
@ -454,12 +429,7 @@ unsigned long plane;
}
void
afbCopy1ToN(pSrc, pDst, alu, prgnDst, pptSrc, planemask)
DrawablePtr pSrc, pDst;
int alu;
RegionPtr prgnDst;
DDXPointPtr pptSrc;
unsigned long planemask;
afbCopy1ToN(DrawablePtr pSrc, DrawablePtr pDst, int alu, RegionPtr prgnDst, DDXPointPtr pptSrc, long unsigned int planemask)
{
int numRects = REGION_NUM_RECTS(prgnDst);
BoxPtr pbox = REGION_RECTS(prgnDst);

41
afb/afbcmap.c
View File

@ -39,66 +39,53 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include "colormapst.h"
#include "resource.h"
#include "micmap.h"
#include "afb.h"
int
afbListInstalledColormaps(pScreen, pmaps)
ScreenPtr pScreen;
Colormap *pmaps;
afbListInstalledColormaps(ScreenPtr pScreen, Colormap *pmaps)
{
return miListInstalledColormaps(pScreen, pmaps);
}
void
afbInstallColormap(pmap)
ColormapPtr pmap;
afbInstallColormap(ColormapPtr pmap)
{
miInstallColormap(pmap);
}
void
afbUninstallColormap(pmap)
ColormapPtr pmap;
afbUninstallColormap(ColormapPtr pmap)
{
miUninstallColormap(pmap);
}
void
afbResolveColor(pred, pgreen, pblue, pVisual)
unsigned short *pred, *pgreen, *pblue;
register VisualPtr pVisual;
afbResolveColor(short unsigned int *pred, short unsigned int *pgreen, short unsigned int *pblue, register VisualPtr pVisual)
{
miResolveColor(pred, pgreen, pblue, pVisual);
}
Bool
afbInitializeColormap(pmap)
register ColormapPtr pmap;
afbInitializeColormap(register ColormapPtr pmap)
{
return miInitializeColormap(pmap);
}
int
afbExpandDirectColors(pmap, ndef, indefs, outdefs)
ColormapPtr pmap;
int ndef;
xColorItem *indefs, *outdefs;
afbExpandDirectColors(ColormapPtr pmap, int ndef, xColorItem *indefs, xColorItem *outdefs)
{
return miExpandDirectColors(pmap, ndef, indefs, outdefs);
}
Bool
afbCreateDefColormap(pScreen)
ScreenPtr pScreen;
afbCreateDefColormap(ScreenPtr pScreen)
{
return miCreateDefColormap(pScreen);
}
Bool
afbSetVisualTypes(depth, visuals, bitsPerRGB)
int depth;
int visuals;
int bitsPerRGB;
afbSetVisualTypes(int depth, int visuals, int bitsPerRGB)
{
return miSetVisualTypes(depth, visuals, bitsPerRGB, -1);
}
@ -110,15 +97,7 @@ afbSetVisualTypes(depth, visuals, bitsPerRGB)
*/
Bool
afbInitVisuals(visualp, depthp, nvisualp, ndepthp, rootDepthp, defaultVisp,
sizes, bitsPerRGB)
VisualPtr *visualp;
DepthPtr *depthp;
int *nvisualp, *ndepthp;
int *rootDepthp;
VisualID *defaultVisp;
unsigned long sizes;
int bitsPerRGB;
afbInitVisuals(VisualPtr *visualp, DepthPtr *depthp, int *nvisualp, int *ndepthp, int *rootDepthp, VisualID *defaultVisp, long unsigned int sizes, int bitsPerRGB)
{
return miInitVisuals(visualp, depthp, nvisualp, ndepthp, rootDepthp,
defaultVisp, sizes, bitsPerRGB, -1);

17
afb/afbfillarc.c
View File

@ -44,10 +44,7 @@ in this Software without prior written authorization from the X Consortium.
#include "mi.h"
static void
afbFillEllipseSolid(pDraw, arc, rrops)
DrawablePtr pDraw;
xArc *arc;
register unsigned char *rrops;
afbFillEllipseSolid(DrawablePtr pDraw, xArc *arc, register unsigned char *rrops)
{
int x, y, e;
int yk, xk, ym, xm, dx, dy, xorg, yorg;
@ -268,11 +265,7 @@ afbFillEllipseSolid(pDraw, arc, rrops)
}
static void
afbFillArcSliceSolidCopy(pDraw, pGC, arc, rrops)
DrawablePtr pDraw;
GCPtr pGC;
xArc *arc;
register unsigned char *rrops;
afbFillArcSliceSolidCopy(DrawablePtr pDraw, GCPtr pGC, xArc *arc, register unsigned char *rrops)
{
PixelType *addrl;
register PixelType *pdst;
@ -321,11 +314,7 @@ afbFillArcSliceSolidCopy(pDraw, pGC, arc, rrops)
}
void
afbPolyFillArcSolid(pDraw, pGC, narcs, parcs)
register DrawablePtr pDraw;
GCPtr pGC;
int narcs;
xArc *parcs;
afbPolyFillArcSolid(register DrawablePtr pDraw, GCPtr pGC, int narcs, xArc *parcs)
{
afbPrivGC *priv;
register xArc *arc;

11
afb/afbfillrct.c
View File

@ -65,7 +65,6 @@ SOFTWARE.
#include "maskbits.h"
#define MODEQ(a, b) ((a) %= (b))
void afbPaintOddSize();
/*
filled rectangles.
@ -76,11 +75,11 @@ helper function in the GC.
#define NUM_STACK_RECTS 1024
void
afbPolyFillRect(pDrawable, pGC, nrectFill, prectInit)
DrawablePtr pDrawable;
GCPtr pGC;
int nrectFill; /* number of rectangles to fill */
xRectangle *prectInit; /* Pointer to first rectangle to fill */
afbPolyFillRect(DrawablePtr pDrawable, GCPtr pGC, int nrectFill, xRectangle *prectInit)
/* number of rectangles to fill */
/* Pointer to first rectangle to fill */
{
xRectangle *prect;
RegionPtr prgnClip;

92
afb/afbpushpxl.c
View File

@ -62,92 +62,6 @@ SOFTWARE.
#include "maskbits.h"
#include "afb.h"
/* afbSolidPP is courtesy of xhacks@csri.toronto.edu
For fillStyle==FillSolid, a monochrome PushPixels can be reduced to
a ROP in the following way: (Note that the ROP is the same as the
result of ROP(src=0x3,dst=0x5))
src=0011 0000 0011
dst=0101 0101 0101
rop fg=0 fg=1
GXclear 0x0 0000 0100 0100 0
GXand 0x1 0001 0100 0101 s&d
GXandReverse 0x2 0010 0100 0110 s&~d
GXcopy 0x3 0011 0100 0111 s
GXandInverted 0x4 0100 0101 0100 ~s&d
GXnoop 0x5 0101 0101 0101 d
GXxor 0x6 0110 0101 0110 s^d
GXor 0x7 0111 0101 0111 s|d
GXnor 0x8 1000 0110 0100 ~s&~d
GXequiv 0x9 1001 0110 0101 ~s^d
GXinvert 0xa 1010 0110 0110 ~d
GXorReverse 0xb 1011 0110 0111 s|~d
GXcopyInverted 0xc 1100 0111 0100 ~s
GXorInverted 0xd 1101 0111 0101 ~s|d
GXnand 0xe 1110 0111 0110 ~s|~d
GXset 0xf 1111 0111 0111 1
For src=0: newRop = 0x4|(rop>>2)
For src=1: newRop = 0x4|(rop&3)
*/
/* afbSolidPP -- squeegees the forground color of pGC through pBitMap
* into pDrawable. pBitMap is a stencil (dx by dy of it is used, it may
* be bigger) which is placed on the drawable at xOrg, yOrg. Where a 1 bit
* is set in the bitmap, the fill style is put onto the drawable using
* the GC's logical function. The drawable is not changed where the bitmap
* has a zero bit or outside the area covered by the stencil.
*/
void
afbSolidPP(pGC, pBitMap, pDrawable, dx, dy, xOrg, yOrg)
GCPtr pGC;
PixmapPtr pBitMap;
DrawablePtr pDrawable;
int dx, dy, xOrg, yOrg;
{
unsigned char alu;
RegionRec rgnDst;
DDXPointPtr pptSrc;
BoxRec srcBox;
register DDXPointPtr ppt;
register BoxPtr pbox;
int i;
if (!pGC->planemask & 1) return;
/* compute the reduced rop function */
alu = pGC->alu;
if (!(pGC->fgPixel&1)) alu >>= 2;
alu = (alu & 0x3) | 0x4;
if (alu == GXnoop) return;
srcBox.x1 = xOrg;
srcBox.y1 = yOrg;
srcBox.x2 = xOrg + dx;
srcBox.y2 = yOrg + dy;
REGION_INIT(pGC->pScreen, &rgnDst, &srcBox, 1);
/* clip the shape of the dst to the destination composite clip */
REGION_INTERSECT(pGC->pScreen, &rgnDst, &rgnDst, pGC->pCompositeClip);
if (!REGION_NIL(&rgnDst)) {
i = REGION_NUM_RECTS(&rgnDst);
pptSrc = (DDXPointPtr)ALLOCATE_LOCAL(i * sizeof(DDXPointRec));
if(pptSrc) {
for (pbox = REGION_RECTS(&rgnDst), ppt = pptSrc; --i >= 0;
pbox++, ppt++) {
ppt->x = pbox->x1 - xOrg;
ppt->y = pbox->y1 - yOrg;
}
afbDoBitblt((DrawablePtr)pBitMap, pDrawable, alu, &rgnDst, pptSrc,
pGC->planemask);
DEALLOCATE_LOCAL(pptSrc);
}
}
REGION_UNINIT(pGC->pScreen, &rgnDst);
}
#define NPT 128
/* afbPushPixels -- squeegees the forground color of pGC through pBitMap
@ -158,11 +72,7 @@ afbSolidPP(pGC, pBitMap, pDrawable, dx, dy, xOrg, yOrg)
* has a zero bit or outside the area covered by the stencil.
*/
void
afbPushPixels(pGC, pBitMap, pDrawable, dx, dy, xOrg, yOrg)
GCPtr pGC;
PixmapPtr pBitMap;
DrawablePtr pDrawable;
int dx, dy, xOrg, yOrg;
afbPushPixels(GCPtr pGC, PixmapPtr pBitMap, DrawablePtr pDrawable, int dx, int dy, int xOrg, int yOrg)
{
int h, dxDivPPW, ibEnd;
PixelType *pwLineStart;

36
afb/afbscrinit.c
View File

@ -88,9 +88,7 @@ BSFuncRec afbBSFuncRec = {
};
Bool
afbCloseScreen(index, pScreen)
int index;
ScreenPtr pScreen;
afbCloseScreen(int index, ScreenPtr pScreen)
{
int d;
DepthPtr depths = pScreen->allowedDepths;
@ -103,9 +101,8 @@ afbCloseScreen(index, pScreen)
return(TRUE);
}
Bool
afbCreateScreenResources(pScreen)
ScreenPtr pScreen;
static Bool
afbCreateScreenResources(ScreenPtr pScreen)
{
Bool retval;
@ -125,9 +122,7 @@ afbCreateScreenResources(pScreen)
}
Bool
afbAllocatePrivates(pScreen, pWinIndex, pGCIndex)
ScreenPtr pScreen;
int *pWinIndex, *pGCIndex;
afbAllocatePrivates(ScreenPtr pScreen, int *pWinIndex, int *pGCIndex)
{
if (afbGeneration != serverGeneration) {
#ifdef PIXMAP_PER_WINDOW
@ -151,12 +146,12 @@ afbAllocatePrivates(pScreen, pWinIndex, pGCIndex)
/* dts * (inch/dot) * (25.4 mm / inch) = mm */
Bool
afbScreenInit(pScreen, pbits, xsize, ysize, dpix, dpiy, width)
register ScreenPtr pScreen;
pointer pbits; /* pointer to screen bitmap */
int xsize, ysize; /* in pixels */
int dpix, dpiy; /* dots per inch */
int width; /* pixel width of frame buffer */
afbScreenInit(register ScreenPtr pScreen, pointer pbits, int xsize, int ysize, int dpix, int dpiy, int width)
/* pointer to screen bitmap */
/* in pixels */
/* dots per inch */
/* pixel width of frame buffer */
{
VisualPtr visuals;
DepthPtr depths;
@ -200,11 +195,11 @@ afbScreenInit(pScreen, pbits, xsize, ysize, dpix, dpiy, width)
pScreen->UnrealizeFont = afbUnrealizeFont;
pScreen->CreateGC = afbCreateGC;
pScreen->CreateColormap = afbInitializeColormap;
pScreen->DestroyColormap = (void (*)())NoopDDA;
pScreen->DestroyColormap = (DestroyColormapProcPtr)NoopDDA;
pScreen->InstallColormap = afbInstallColormap;
pScreen->UninstallColormap = afbUninstallColormap;
pScreen->ListInstalledColormaps = afbListInstalledColormaps;
pScreen->StoreColors = (void (*)())NoopDDA;
pScreen->StoreColors = (StoreColorsProcPtr)NoopDDA;
pScreen->ResolveColor = afbResolveColor;
pScreen->BitmapToRegion = afbPixmapToRegion;
oldDevPrivate = pScreen->devPrivate;
@ -225,8 +220,7 @@ afbScreenInit(pScreen, pbits, xsize, ysize, dpix, dpiy, width)
}
PixmapPtr
afbGetWindowPixmap(pWin)
WindowPtr pWin;
afbGetWindowPixmap(WindowPtr pWin)
{
#ifdef PIXMAP_PER_WINDOW
return (PixmapPtr)(pWin->devPrivates[frameWindowPrivateIndex].ptr);
@ -238,9 +232,7 @@ afbGetWindowPixmap(pWin)
}
void
afbSetWindowPixmap(pWin, pPix)
WindowPtr pWin;
PixmapPtr pPix;
afbSetWindowPixmap(WindowPtr pWin, PixmapPtr pPix)
{
#ifdef PIXMAP_PER_WINDOW
pWin->devPrivates[frameWindowPrivateIndex].ptr = (pointer)pPix;

11
afb/afbzerarc.c
View File

@ -83,10 +83,7 @@ in this Software without prior written authorization from the X Consortium.
#define DoPix(bit,base,yoff,xoff) if (mask & bit) Pixelate(base,yoff,xoff);
static void
afbZeroArcSS(pDraw, pGC, arc)
DrawablePtr pDraw;
GCPtr pGC;
xArc *arc;
afbZeroArcSS(DrawablePtr pDraw, GCPtr pGC, xArc *arc)
{
miZeroArcRec info;
Bool do360;
@ -182,11 +179,7 @@ afbZeroArcSS(pDraw, pGC, arc)
}
void
afbZeroPolyArcSS(pDraw, pGC, narcs, parcs)
DrawablePtr pDraw;
GCPtr pGC;
int narcs;
xArc *parcs;
afbZeroPolyArcSS(DrawablePtr pDraw, GCPtr pGC, int narcs, xArc *parcs)
{
register xArc *arc;
register int i;

2
hw/dmx/input/usb-other.c
View File

@ -142,7 +142,7 @@ void othUSBGetInfo(DevicePtr pDev, DMXLocalInitInfoPtr info)
} else
info->numAbsAxes = priv->numAbs;
for (j = 0; j < info->numAbsAxes; j++) {
ioctl(priv->fd, EVIOCGABS(j), abs);
ioctl(priv->fd, EVIOCGABS(j), absolute);
info->minval[1+j] = absolute[1];
info->maxval[1+j] = absolute[2];
info->res[1+j] = absolute[3];

2
hw/xfree86/common/xf86xv.c
View File

@ -687,8 +687,6 @@ xf86XVCopyClip(
XvPortRecPrivatePtr portPriv,
GCPtr pGC
){
ScreenPtr pScreen = pGC->pScreen;
/* copy the new clip if it exists */
if((pGC->clientClipType == CT_REGION) && pGC->clientClip) {
if(!portPriv->clientClip)

4
hw/xfree86/dri/dri.c
View File

@ -41,6 +41,8 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "xf86.h"
#include <sys/time.h>
#include <unistd.h>
#include <string.h>
#include <stdio.h>
#define NEED_REPLIES
#define NEED_EVENTS
@ -1135,7 +1137,9 @@ DRIGetDrawableInfo(ScreenPtr pScreen,
WindowPtr pWin, pOldWin;
int i;
#if 0
printf("maxDrawableTableEntry = %d\n", pDRIPriv->pDriverInfo->maxDrawableTableEntry);
#endif
if (pDrawable->type == DRAWABLE_WINDOW) {
pWin = (WindowPtr)pDrawable;

2
hw/xfree86/fbdevhw/fbdevhw.c
View File

@ -5,6 +5,8 @@
#include <xorg-config.h>
#endif
#include <string.h>
#include "xf86.h"
#include "xf86_OSproc.h"

5
hw/xfree86/i2c/fi1236.c
View File

@ -1,4 +1,4 @@
/* $XdotOrg: xserver/xorg/hw/xfree86/i2c/fi1236.c,v 1.8 2005/07/30 18:56:32 alanc Exp $ */
/* $XdotOrg: xserver/xorg/hw/xfree86/i2c/fi1236.c,v 1.9 2006/02/10 22:00:25 anholt Exp $ */
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
@ -102,7 +102,6 @@ xf86DrvMsg(f->d.pI2CBus->scrnIndex, X_INFO, "MT2032: Company code 0x%02x%02x, pa
static void MT2032_shutdown(FI1236Ptr f)
{
CARD8 data[10];
CARD8 value;
data[0]=0x00; /* start with register 0x00 */
data[1]=0x1A;
@ -534,8 +533,6 @@ void FI1236_tune(FI1236Ptr f, CARD32 frequency)
void TUNER_set_frequency(FI1236Ptr f, CARD32 frequency)
{
CARD16 divider;
if(frequency < f->parm.min_freq) frequency = f->parm.min_freq;
if(frequency > f->parm.max_freq) frequency = f->parm.max_freq;

7
hw/xfree86/i2c/msp3430.c
View File

@ -82,6 +82,7 @@ static void GetMSP3430Data(MSP3430Ptr m, CARD8 RegAddress, CARD8 RegSubAddressHi
*RegValueLow = receive[1];
}
#if __MSPDEBUG__ > 2
static void MSP3430DumpStatus(MSP3430Ptr m)
{
CARD8 status_hi, status_lo;
@ -102,6 +103,7 @@ I2C_WriteRead(&(m->d), &subaddr, 1, data, 2);
xf86DrvMsg(m->d.pI2CBus->scrnIndex, X_INFO, "MSP34xx: control=0x%02x%02x\n",
data[1], data[0]);
}
#endif
/* wrapper */
void InitMSP3430(MSP3430Ptr m)
@ -263,9 +265,8 @@ void ResetMSP3430(MSP3430Ptr m)
void MSP3430SetVolume (MSP3430Ptr m, CARD8 value)
{
CARD8 result;
CARD8 old_volume;
#if 0
CARD8 old_volume;
GetMSP3430Data(m, RD_DSP, 0x00, 0x00, &old_volume, &result);
xf86DrvMsg(m->d.pI2CBus->scrnIndex, X_INFO, "MSP3430 result 0x%02x\n", result);
#endif
@ -608,7 +609,6 @@ void CheckModeMSP34x5D(MSP3430Ptr m) {
const char dual_off=-stereo_off;
char detect;
CARD8 matrix, fmmatrix, source, high, low;
char *msg;
fmmatrix=0; /*no matrix*/
source=0; /*FM*/
@ -702,6 +702,7 @@ void CheckModeMSP34x5D(MSP3430Ptr m) {
SetMSP3430Data (m, WR_DEM, 0x00, 0x21, 0, 1);
#if __MSPDEBUG__ > 0
char *msg;
switch (matrix) {
case 0x30: /*MONO*/
msg="MONO";

16
hw/xfree86/i2c/uda1380.c
View File

@ -22,22 +22,6 @@
* otherwise to promote the sale, use or other dealings in this Software without prior written
* authorization from the author.
*
* $Log$
* Revision 1.5 2005/09/24 21:56:00 bogdand
* Changed the license to a X/MIT one
*
* Revision 1.4 2005/07/13 20:19:37 sandmann
* xc/programs/Xserver/hw/xfree86/drivers/i2c/*.c: include xorg-config.h
* instead of config.h
* xserver/xorg/hw/xfree86/i2c/Makefile.am: Add i2c drivers
*
* Revision 1.3 2005/07/11 02:29:50 ajax
* Prep for modular builds by adding guarded #include "config.h" everywhere.
*
* Revision 1.2 2005/07/01 22:43:11 daniels
* Change all misc.h and os.h references to <X11/foo.h>.
*
*
************************************************************************************/
#ifdef HAVE_XORG_CONFIG_H

1
hw/xfree86/xf4bpp/ppcGetSp.c
View File

@ -76,6 +76,7 @@ SOFTWARE.
#include <xorg-config.h>
#endif
#include <string.h>
#include "xf4bpp.h"
#include "OScompiler.h"
#include "mfbmap.h"

4
hw/xfree86/xf8_16bpp/cfbscrinit.c
View File

@ -153,11 +153,11 @@ cfb8_16SetupScreen(
pScreen->UnrealizeFont = mfbUnrealizeFont;
pScreen->CreateGC = cfb8_16CreateGC;
pScreen->CreateColormap = miInitializeColormap;
pScreen->DestroyColormap = (void (*)())NoopDDA;
pScreen->DestroyColormap = (DestroyColormapProcPtr)NoopDDA;
pScreen->InstallColormap = miInstallColormap;
pScreen->UninstallColormap = miUninstallColormap;
pScreen->ListInstalledColormaps = miListInstalledColormaps;
pScreen->StoreColors = (void (*)())NoopDDA;
pScreen->StoreColors = (StoreColorsProcPtr)NoopDDA;
pScreen->ResolveColor = miResolveColor;
pScreen->BitmapToRegion = mfbPixmapToRegion;

3
hw/xfree86/xf8_32bpp/cfbimage.c
View File

@ -5,6 +5,7 @@
#endif
#include <stdlib.h>
#include <string.h>
#include <X11/X.h>
#include "windowstr.h"
@ -60,7 +61,7 @@ cfb8_32GetImage (
if (!pPixmap)
return;
if ((planemask & 0xff) != 0xff)
bzero((char *)pdstLine, pPixmap->devKind * h);
memset((char *)pdstLine, 0, pPixmap->devKind * h);
ptSrc.x = sx + pDraw->x;
ptSrc.y = sy + pDraw->y;
box.x1 = 0;