mirror of
https://github.com/X11Libre/xf86-video-chips.git
synced 2026-03-24 01:24:44 +00:00
replace obsolete "pointer" typedef by plain void*
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
committed by
Enrico Weigelt
parent
7aacec9e7a
commit
ea6e475753
@@ -292,8 +292,8 @@ CHIPSLoadCursorImage(ScrnInfoPtr pScrn, unsigned char *src)
|
||||
CHIPSPtr cPtr = CHIPSPTR(pScrn);
|
||||
CHIPSACLPtr cAcl = CHIPSACLPTR(pScrn);
|
||||
#if X_BYTE_ORDER == X_BIG_ENDIAN
|
||||
CARD32 *s = (pointer)src;
|
||||
CARD32 *d = (pointer)(cPtr->FbBase + cAcl->CursorAddress);
|
||||
CARD32 *s = (void*)src;
|
||||
CARD32 *d = (void*)(cPtr->FbBase + cAcl->CursorAddress);
|
||||
int y;
|
||||
#endif
|
||||
|
||||
|
||||
@@ -195,7 +195,7 @@ static void chipsLoadPalette(ScrnInfoPtr pScrn, int numColors,
|
||||
static void chipsLoadPalette16(ScrnInfoPtr pScrn, int numColors,
|
||||
int *indices, LOCO *colors, VisualPtr pVisual);
|
||||
static void chipsSetPanelType(CHIPSPtr cPtr);
|
||||
static void chipsBlockHandler(ScreenPtr arg, pointer pTimeout);
|
||||
static void chipsBlockHandler(ScreenPtr arg, void *pTimeout);
|
||||
|
||||
/*
|
||||
* This is intentionally screen-independent. It indicates the binding
|
||||
@@ -691,8 +691,8 @@ static XF86ModuleVersionInfo chipsVersRec =
|
||||
*/
|
||||
_X_EXPORT XF86ModuleData chipsModuleData = { &chipsVersRec, chipsSetup, NULL };
|
||||
|
||||
static pointer
|
||||
chipsSetup(pointer module, pointer opts, int *errmaj, int *errmin)
|
||||
static void*
|
||||
chipsSetup(void *module, void *opts, int *errmaj, int *errmin)
|
||||
{
|
||||
static Bool setupDone = FALSE;
|
||||
|
||||
@@ -709,7 +709,7 @@ chipsSetup(pointer module, pointer opts, int *errmaj, int *errmin)
|
||||
* The return value must be non-NULL on success even though there
|
||||
* is no TearDownProc.
|
||||
*/
|
||||
return (pointer)1;
|
||||
return (void*)1;
|
||||
} else {
|
||||
if (errmaj) *errmaj = LDR_ONCEONLY;
|
||||
return NULL;
|
||||
@@ -1107,7 +1107,7 @@ chipsPreInitHiQV(ScrnInfoPtr pScrn, int flags)
|
||||
double real;
|
||||
int val, indx;
|
||||
const char *s;
|
||||
pointer pVbeModule = NULL;
|
||||
void *pVbeModule = NULL;
|
||||
|
||||
vgaHWPtr hwp;
|
||||
CHIPSPtr cPtr = CHIPSPTR(pScrn);
|
||||
@@ -7003,7 +7003,7 @@ chipsSetPanelType(CHIPSPtr cPtr)
|
||||
}
|
||||
|
||||
static void
|
||||
chipsBlockHandler (ScreenPtr pScreen, pointer pTimeout)
|
||||
chipsBlockHandler (ScreenPtr pScreen, void *pTimeout)
|
||||
{
|
||||
ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
|
||||
CHIPSPtr cPtr = CHIPSPTR(pScrn);
|
||||
|
||||
@@ -23,14 +23,14 @@
|
||||
|
||||
static XF86VideoAdaptorPtr CHIPSSetupImageVideo(ScreenPtr);
|
||||
static void CHIPSInitOffscreenImages(ScreenPtr);
|
||||
static void CHIPSStopVideo(ScrnInfoPtr, pointer, Bool);
|
||||
static int CHIPSSetPortAttribute(ScrnInfoPtr, Atom, INT32, pointer);
|
||||
static int CHIPSGetPortAttribute(ScrnInfoPtr, Atom ,INT32 *, pointer);
|
||||
static void CHIPSStopVideo(ScrnInfoPtr, void*, Bool);
|
||||
static int CHIPSSetPortAttribute(ScrnInfoPtr, Atom, INT32, void*);
|
||||
static int CHIPSGetPortAttribute(ScrnInfoPtr, Atom ,INT32 *, void*);
|
||||
static void CHIPSQueryBestSize(ScrnInfoPtr, Bool,
|
||||
short, short, short, short, unsigned int *, unsigned int *, pointer);
|
||||
short, short, short, short, unsigned int *, unsigned int *, void*);
|
||||
static int CHIPSPutImage( ScrnInfoPtr,
|
||||
short, short, short, short, short, short, short, short,
|
||||
int, unsigned char*, short, short, Bool, RegionPtr, pointer,
|
||||
int, unsigned char*, short, short, Bool, RegionPtr, void*,
|
||||
DrawablePtr);
|
||||
static int CHIPSQueryImageAttributes(ScrnInfoPtr,
|
||||
int, unsigned short *, unsigned short *, int *, int *);
|
||||
@@ -241,7 +241,7 @@ CHIPSSetupImageVideo(ScreenPtr pScreen)
|
||||
adapt->nPorts = 1;
|
||||
adapt->pPortPrivates = (DevUnion*)(&adapt[1]);
|
||||
pPriv = (CHIPSPortPrivPtr)(&adapt->pPortPrivates[1]);
|
||||
adapt->pPortPrivates[0].ptr = (pointer)(pPriv);
|
||||
adapt->pPortPrivates[0].ptr = (void*)(pPriv);
|
||||
adapt->pAttributes = Attributes;
|
||||
adapt->nImages = NUM_IMAGES;
|
||||
adapt->nAttributes = NUM_ATTRIBUTES;
|
||||
@@ -276,7 +276,7 @@ CHIPSSetupImageVideo(ScreenPtr pScreen)
|
||||
|
||||
|
||||
static void
|
||||
CHIPSStopVideo(ScrnInfoPtr pScrn, pointer data, Bool shadow)
|
||||
CHIPSStopVideo(ScrnInfoPtr pScrn, void *data, Bool shadow)
|
||||
{
|
||||
CHIPSPortPrivPtr pPriv = (CHIPSPortPrivPtr)data;
|
||||
CHIPSPtr cPtr = CHIPSPTR(pScrn);
|
||||
@@ -309,7 +309,7 @@ CHIPSSetPortAttribute(
|
||||
ScrnInfoPtr pScrn,
|
||||
Atom attribute,
|
||||
INT32 value,
|
||||
pointer data
|
||||
void *data
|
||||
){
|
||||
CHIPSPortPrivPtr pPriv = (CHIPSPortPrivPtr)data;
|
||||
CHIPSPtr cPtr = CHIPSPTR(pScrn);
|
||||
@@ -356,7 +356,7 @@ CHIPSGetPortAttribute(
|
||||
ScrnInfoPtr pScrn,
|
||||
Atom attribute,
|
||||
INT32 *value,
|
||||
pointer data
|
||||
void *data
|
||||
){
|
||||
CHIPSPortPrivPtr pPriv = (CHIPSPortPrivPtr)data;
|
||||
|
||||
@@ -374,7 +374,7 @@ CHIPSQueryBestSize(
|
||||
short vid_w, short vid_h,
|
||||
short drw_w, short drw_h,
|
||||
unsigned int *p_w, unsigned int *p_h,
|
||||
pointer data
|
||||
void *data
|
||||
){
|
||||
*p_w = drw_w;
|
||||
*p_h = drw_h;
|
||||
@@ -640,7 +640,7 @@ CHIPSPutImage(
|
||||
int id, unsigned char* buf,
|
||||
short width, short height,
|
||||
Bool sync,
|
||||
RegionPtr clipBoxes, pointer data,
|
||||
RegionPtr clipBoxes, void *data,
|
||||
DrawablePtr pDraw
|
||||
){
|
||||
CHIPSPortPrivPtr pPriv = (CHIPSPortPrivPtr)data;
|
||||
@@ -883,7 +883,7 @@ CHIPSAllocateSurface(
|
||||
surface->id = id;
|
||||
surface->pitches[0] = pitch;
|
||||
surface->offsets[0] = linear->offset * bpp;
|
||||
surface->devPrivate.ptr = (pointer)pPriv;
|
||||
surface->devPrivate.ptr = (void*)pPriv;
|
||||
|
||||
return Success;
|
||||
}
|
||||
@@ -931,7 +931,7 @@ CHIPSGetSurfaceAttribute(
|
||||
INT32 *value
|
||||
){
|
||||
return CHIPSGetPortAttribute(pScrn, attribute, value,
|
||||
(pointer)(GET_PORT_PRIVATE(pScrn)));
|
||||
(void*)(GET_PORT_PRIVATE(pScrn)));
|
||||
}
|
||||
|
||||
static int
|
||||
@@ -941,7 +941,7 @@ CHIPSSetSurfaceAttribute(
|
||||
INT32 value
|
||||
){
|
||||
return CHIPSSetPortAttribute(pScrn, attribute, value,
|
||||
(pointer)(GET_PORT_PRIVATE(pScrn)));
|
||||
(void*)(GET_PORT_PRIVATE(pScrn)));
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user