From 70869fc6777f87cd05794446caa739e3d9a91ffe Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Fri, 21 Jul 2006 23:39:37 -0400 Subject: [PATCH] Yet more dead code. --- hw/xfree86/common/xf86.h | 3 --- hw/xfree86/common/xf86Bus.c | 17 ----------------- hw/xfree86/common/xf86Bus.h | 9 --------- hw/xfree86/loader/xf86sym.c | 6 ------ 4 files changed, 35 deletions(-) diff --git a/hw/xfree86/common/xf86.h b/hw/xfree86/common/xf86.h index 997868390..6a2ed4670 100644 --- a/hw/xfree86/common/xf86.h +++ b/hw/xfree86/common/xf86.h @@ -164,9 +164,6 @@ void xf86EnablePciBusMaster(pciVideoPtr pPci, Bool enable); #endif void xf86RegisterStateChangeNotificationCallback(xf86StateChangeNotificationCallbackFunc func, pointer arg); Bool xf86DeregisterStateChangeNotificationCallback(xf86StateChangeNotificationCallbackFunc func); -#ifdef async -Bool xf86QueueAsyncEvent(void (*func)(pointer),pointer arg); -#endif int xf86GetLastScrnFlag(int entityIndex); void xf86SetLastScrnFlag(int entityIndex, int scrnIndex); diff --git a/hw/xfree86/common/xf86Bus.c b/hw/xfree86/common/xf86Bus.c index f4a22ac8d..e5c9615d3 100644 --- a/hw/xfree86/common/xf86Bus.c +++ b/hw/xfree86/common/xf86Bus.c @@ -3120,23 +3120,6 @@ notifyStateChange(xf86NotifyState state) } } -#ifdef async -_X_EXPORT Bool -xf86QueueAsyncEvent(void (*func)(pointer),pointer arg) -{ - AsyncQPtr new; - - if (!AsyncQ) return FALSE; - - new = (AsyncQPtr)xfnalloc(sizeof(AsyncQRec)); - new->func = func; - new->arg = arg; - (*AsyncQPtr)->next = new; - AsyncQPtr = &new; - return TRUE; -} -#endif - /* Multihead accel sharing accessor functions and entity Private handling */ _X_EXPORT int diff --git a/hw/xfree86/common/xf86Bus.h b/hw/xfree86/common/xf86Bus.h index ea86c1cf3..b7d16089c 100644 --- a/hw/xfree86/common/xf86Bus.h +++ b/hw/xfree86/common/xf86Bus.h @@ -74,15 +74,6 @@ typedef struct { IOADDRESS domainIO; } EntityRec, *EntityPtr; -/* asynchronous event handling */ -#ifdef async -typedef struct _AsyncQRec { - void (*func)(pointer); - pointer arg; - struct _AsyncQRec *next; -} AsyncQRec, *AsyncQPtr; -#endif - #define NO_SEPARATE_IO_FROM_MEM 0x0001 #define NO_SEPARATE_MEM_FROM_IO 0x0002 #define NEED_VGA_ROUTED 0x0004 diff --git a/hw/xfree86/loader/xf86sym.c b/hw/xfree86/loader/xf86sym.c index ad4f77353..598b763d8 100644 --- a/hw/xfree86/loader/xf86sym.c +++ b/hw/xfree86/loader/xf86sym.c @@ -356,9 +356,6 @@ _X_HIDDEN void *xfree86LookupTab[] = { SYMFUNC(xf86RegisterStateChangeNotificationCallback) SYMFUNC(xf86DeregisterStateChangeNotificationCallback) SYMFUNC(xf86NoSharedResources) -#ifdef async - SYMFUNC(xf86QueueAsyncEvent) -#endif /* Shared Accel Accessor Functions */ SYMFUNC(xf86GetLastScrnFlag) SYMFUNC(xf86SetLastScrnFlag) @@ -1146,9 +1143,6 @@ _X_HIDDEN void *xfree86LookupTab[] = { SYMVAR(xf86DummyVar3) #endif -#ifdef async - SYMVAR(xf86CurrentScreen) -#endif /* predefined resource lists from xf86Bus.h */ SYMVAR(resVgaExclusive) SYMVAR(resVgaShared)