From e11135776ee1f77cf4bcb59f3ad395f4a01d03af Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Wed, 21 May 2025 14:56:52 +0200 Subject: [PATCH] (!1997) xfree86: fbman: drop FreeBoxesUpdateCallback Nobody fills it anymore, so not needed at all anymore. Signed-off-by: Enrico Weigelt, metux IT consult --- hw/xfree86/common/xf86fbman.c | 30 +----------------------------- hw/xfree86/common/xf86fbman.h | 1 - 2 files changed, 1 insertion(+), 30 deletions(-) diff --git a/hw/xfree86/common/xf86fbman.c b/hw/xfree86/common/xf86fbman.c index b5be75062..00ce224d8 100644 --- a/hw/xfree86/common/xf86fbman.c +++ b/hw/xfree86/common/xf86fbman.c @@ -260,23 +260,9 @@ typedef struct { int NumUsedAreas; FBLinearLinkPtr LinearAreas; CloseScreenProcPtr CloseScreen; - int NumCallbacks; - FreeBoxCallbackProcPtr *FreeBoxesUpdateCallback; DevUnion *devPrivates; } FBManager, *FBManagerPtr; -static void -SendCallFreeBoxCallbacks(FBManagerPtr offman) -{ - int i = offman->NumCallbacks; - - while (i--) { - (*offman->FreeBoxesUpdateCallback[i]) (offman->pScreen, - offman->FreeBoxes, - offman->devPrivates[i].ptr); - } -} - static FBAreaPtr AllocateArea(FBManagerPtr offman, int w, int h, @@ -375,14 +361,10 @@ localAllocateOffscreenArea(ScreenPtr pScreen, RemoveAreaCallbackProcPtr removeCB, void *privData) { FBManagerPtr offman; - FBAreaPtr area = NULL; offman = (FBManagerPtr) dixLookupPrivate(&pScreen->devPrivates, xf86FBScreenKey); - if ((area = AllocateArea(offman, w, h, gran, moveCB, removeCB, privData))) - SendCallFreeBoxCallbacks(offman); - - return area; + return AllocateArea(offman, w, h, gran, moveCB, removeCB, privData); } static void @@ -419,8 +401,6 @@ localFreeOffscreenArea(FBAreaPtr area) free(pLink); offman->NumUsedAreas--; - - SendCallFreeBoxCallbacks(offman); } static Bool @@ -471,8 +451,6 @@ localResizeOffscreenArea(FBAreaPtr resize, int w, int h) RegionUninit(&FreedReg); RegionUninit(&NewReg); - SendCallFreeBoxCallbacks(offman); - return TRUE; } @@ -530,8 +508,6 @@ localResizeOffscreenArea(FBAreaPtr resize, int w, int h) RegionUninit(&FreedReg); - SendCallFreeBoxCallbacks(offman); - return TRUE; } @@ -698,7 +674,6 @@ localPurgeUnlockedOffscreenAreas(ScreenPtr pScreen) if (anyUsed) { RegionValidate(offman->FreeBoxes, &anyUsed); - SendCallFreeBoxCallbacks(offman); } return TRUE; @@ -1109,7 +1084,6 @@ xf86FBCloseScreen(ScreenPtr pScreen) RegionDestroy(offman->InitialBoxes); RegionDestroy(offman->FreeBoxes); - free(offman->FreeBoxesUpdateCallback); free(offman->devPrivates); free(offman); dixSetPrivate(&pScreen->devPrivates, xf86FBScreenKey, NULL); @@ -1187,8 +1161,6 @@ xf86InitFBManagerRegion(ScreenPtr pScreen, RegionPtr FullRegion) offman->UsedAreas = NULL; offman->LinearAreas = NULL; offman->NumUsedAreas = 0; - offman->NumCallbacks = 0; - offman->FreeBoxesUpdateCallback = NULL; offman->devPrivates = NULL; return TRUE; diff --git a/hw/xfree86/common/xf86fbman.h b/hw/xfree86/common/xf86fbman.h index ed5c8bcd7..30e5a455d 100644 --- a/hw/xfree86/common/xf86fbman.h +++ b/hw/xfree86/common/xf86fbman.h @@ -60,7 +60,6 @@ typedef struct _FBLinear { DevUnion devPrivate; } FBLinear, *FBLinearPtr; -typedef void (*FreeBoxCallbackProcPtr) (ScreenPtr, RegionPtr, void *); typedef void (*MoveAreaCallbackProcPtr) (FBAreaPtr, FBAreaPtr); typedef void (*RemoveAreaCallbackProcPtr) (FBAreaPtr);