From 2d0a4fff7985f58c21023cc4757090ee67067593 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Fri, 3 Apr 2009 13:44:37 -0400 Subject: DPMS: Remove unused DPMSGet() --- Xext/dpmsproc.h | 2 -- Xext/dpmsstubs.c | 5 ----- hw/kdrive/src/kdrive.c | 6 ------ hw/xfree86/common/xf86.h | 2 -- hw/xfree86/common/xf86DPMS.c | 21 --------------------- 5 files changed, 36 deletions(-) diff --git a/Xext/dpmsproc.h b/Xext/dpmsproc.h index d57f57318..c1df56fdf 100644 --- a/Xext/dpmsproc.h +++ b/Xext/dpmsproc.h @@ -1,4 +1,3 @@ - /* Prototypes for functions that the DDX must provide */ #ifdef HAVE_DIX_CONFIG_H @@ -11,7 +10,6 @@ #include "dixstruct.h" int DPMSSet(ClientPtr client, int level); -int DPMSGet(int *plevel); Bool DPMSSupported(void); #endif diff --git a/Xext/dpmsstubs.c b/Xext/dpmsstubs.c index 0f59d5160..f0f54d293 100644 --- a/Xext/dpmsstubs.c +++ b/Xext/dpmsstubs.c @@ -39,11 +39,6 @@ Bool DPMSSupported(void) return FALSE; } -int DPMSGet(int *plevel) -{ - return -1; -} - int DPMSSet(ClientPtr client, int level) { return Success; diff --git a/hw/kdrive/src/kdrive.c b/hw/kdrive/src/kdrive.c index 162a3db23..76355e8a1 100644 --- a/hw/kdrive/src/kdrive.c +++ b/hw/kdrive/src/kdrive.c @@ -1371,12 +1371,6 @@ DPMSSet(ClientPtr client, int level) { } -int -DPMSGet (int *level) -{ - return -1; -} - Bool DPMSSupported (void) { diff --git a/hw/xfree86/common/xf86.h b/hw/xfree86/common/xf86.h index eb0ef43fb..0c0320fda 100644 --- a/hw/xfree86/common/xf86.h +++ b/hw/xfree86/common/xf86.h @@ -1,4 +1,3 @@ - /* * Copyright (c) 1997-2003 by The XFree86 Project, Inc. * @@ -175,7 +174,6 @@ extern _X_EXPORT DisplayModePtr xf86CVTMode(int HDisplay, int VDisplay, float VR extern _X_EXPORT Bool xf86DPMSInit(ScreenPtr pScreen, DPMSSetProcPtr set, int flags); #ifdef DPMSExtension -extern _X_EXPORT int DPMSGet(int *level); extern _X_EXPORT int DPMSSet(ClientPtr client, int level); extern _X_EXPORT Bool DPMSSupported(void); #endif diff --git a/hw/xfree86/common/xf86DPMS.c b/hw/xfree86/common/xf86DPMS.c index 03a6d0cbf..1687f2cb5 100644 --- a/hw/xfree86/common/xf86DPMS.c +++ b/hw/xfree86/common/xf86DPMS.c @@ -198,25 +198,4 @@ DPMSSupported(void) return FALSE; } - -/* - * DPMSGet -- - * Device dependent DPMS mode getting hook. This returns the current - * DPMS mode, or -1 if DPMS is not supported. - * - * This should hook in to the appropriate driver-level function, which - * will be added to the ScrnInfoRec. - * - * NOTES: - * 1. the calling interface should be changed to specify which - * screen to check. - * 2. It isn't clear that this function is ever used or what it should - * return. - */ -int -DPMSGet(int *level) -{ - return DPMSPowerLevel; -} - #endif /* DPMSExtension */ -- cgit v1.2.3