XLibre/xf86-video-nested
1
0
Fork 0
mirror of https://github.com/X11Libre/xf86-video-nested.git synced 2026-03-24 01:24:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

replace obsolete "pointer" typedef by plain void*

Browse Source 
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult
2026-01-05 19:35:32 +01:00
committed by Enrico Weigelt
parent 73d76ac127
commit 5a8166e874
2 changed files with 14 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/driver.c
View File

@@ -61,9 +61,7 @@ static MODULESETUPPROTO(NestedSetup);
static void NestedIdentify(int flags); static void NestedIdentify(int flags);
static const OptionInfoRec *NestedAvailableOptions(int chipid, int busid); static const OptionInfoRec *NestedAvailableOptions(int chipid, int busid);
static Bool NestedProbe(DriverPtr drv, int flags); static Bool NestedProbe(DriverPtr drv, int flags);
static Bool NestedDriverFunc(ScrnInfoPtr pScrn, xorgDriverFuncOp op, static Bool NestedDriverFunc(ScrnInfoPtr pScrn, xorgDriverFuncOp op, void *ptr);
pointer ptr);
static Bool NestedPreInit(ScrnInfoPtr pScrn, int flags); static Bool NestedPreInit(ScrnInfoPtr pScrn, int flags);
static Bool NestedScreenInit(ScreenPtr pScreen, int argc, char **argv); static Bool NestedScreenInit(ScreenPtr pScreen, int argc, char **argv);
@@ -167,10 +165,8 @@ typedef struct NestedPrivate {
#define PNESTED(p) ((NestedPrivatePtr)((p)->driverPrivate)) #define PNESTED(p) ((NestedPrivatePtr)((p)->driverPrivate))
#define PCLIENTDATA(p) (PNESTED(p)->clientData) #define PCLIENTDATA(p) (PNESTED(p)->clientData)
/*static ScrnInfoPtr NESTEDScrn;*/ static void *
NestedSetup(void *module, void *opts, int *errmaj, int *errmin) {
static pointer
NestedSetup(pointer module, pointer opts, int *errmaj, int *errmin) {
static Bool setupDone = FALSE; static Bool setupDone = FALSE;
if (!setupDone) { if (!setupDone) {
@@ -179,7 +175,7 @@ NestedSetup(pointer module, pointer opts, int *errmaj, int *errmin) {
xf86AddDriver(&NESTED, module, HaveDriverFuncs); xf86AddDriver(&NESTED, module, HaveDriverFuncs);
xf86AddInputDriver(&NESTEDINPUT, module, 0); xf86AddInputDriver(&NESTEDINPUT, module, 0);
return (pointer)1; return (void*)1;
} else { } else {
if (errmaj) if (errmaj)
*errmaj = LDR_ONCEONLY; *errmaj = LDR_ONCEONLY;
@@ -250,7 +246,7 @@ NestedProbe(DriverPtr drv, int flags) {
#endif #endif
static Bool static Bool
NestedDriverFunc(ScrnInfoPtr pScrn, xorgDriverFuncOp op, pointer ptr) { NestedDriverFunc(ScrnInfoPtr pScrn, xorgDriverFuncOp op, void *ptr) {
CARD32 *flag; CARD32 *flag;
xf86Msg(X_INFO, "NestedDriverFunc\n"); xf86Msg(X_INFO, "NestedDriverFunc\n");
@@ -514,7 +510,7 @@ NestedAddMode(ScrnInfoPtr pScrn, int width, int height) {
// Wrapper for timed call to NestedInputLoadDriver. Used with timer in order // Wrapper for timed call to NestedInputLoadDriver. Used with timer in order
// to force the initialization to wait until the input core is initialized. // to force the initialization to wait until the input core is initialized.
static CARD32 static CARD32
NestedMouseTimer(OsTimerPtr timer, CARD32 time, pointer arg) { NestedMouseTimer(OsTimerPtr timer, CARD32 time, void *arg) {
NestedInputLoadDriver(arg); NestedInputLoadDriver(arg);
return 0; return 0;
} }

16
src/nested_input.c
View File

@@ -57,10 +57,10 @@
#define NUM_MOUSE_BUTTONS 6 #define NUM_MOUSE_BUTTONS 6
#define NUM_MOUSE_AXES 2 #define NUM_MOUSE_AXES 2
static pointer static void *
NestedInputPlug(pointer module, pointer options, int *errmaj, int *errmin); NestedInputPlug(void *module, void *options, int *errmaj, int *errmin);
static void static void
NestedInputUnplug(pointer p); NestedInputUnplug(void *p);
static void static void
NestedInputReadInput(InputInfoPtr pInfo); NestedInputReadInput(InputInfoPtr pInfo);
@@ -121,13 +121,13 @@ void
NestedInputUnInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags) { NestedInputUnInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags) {
} }
static pointer static void *
NestedInputPlug(pointer module, pointer options, int *errmaj, int *errmin) { NestedInputPlug(void *module, void *options, int *errmaj, int *errmin) {
return NULL; return NULL;
} }
static void static void
NestedInputUnplug(pointer p) { NestedInputUnplug(void *p) {
} }
static void static void
@@ -224,7 +224,7 @@ _nested_input_init_axes(DeviceIntPtr device) {
} }
static CARD32 static CARD32
nested_input_on(OsTimerPtr timer, CARD32 time, pointer arg) { nested_input_on(OsTimerPtr timer, CARD32 time, void *arg) {
DeviceIntPtr device = arg; DeviceIntPtr device = arg;
InputInfoPtr pInfo = device->public.devicePrivate; InputInfoPtr pInfo = device->public.devicePrivate;
NestedInputDevicePtr pNestedInput = pInfo->private; NestedInputDevicePtr pNestedInput = pInfo->private;
@@ -286,7 +286,7 @@ NestedInputControl(DeviceIntPtr device, int what) {
} }
static CARD32 static CARD32
nested_input_ready(OsTimerPtr timer, CARD32 time, pointer arg) { nested_input_ready(OsTimerPtr timer, CARD32 time, void *arg) {
NestedClientPrivatePtr clientData = arg; NestedClientPrivatePtr clientData = arg;
NestedClientCheckEvents(clientData); NestedClientCheckEvents(clientData);
return 0; return 0;