DPMS: Remove the defaultDPMS* variables

5 files changed, 8 insertions, 16 deletions

diff --git a/dix/globals.c b/dix/globals.c
index 0df3fbe50..c24a94fbe 100644
--- a/dix/globals.c
+++ b/dix/globals.c
@@ -95,11 +95,7 @@ int ScreenSaverBlanking;
 int  ScreenSaverAllowExposures;
 
 #ifdef DPMSExtension
-CARD32 defaultDPMSStandbyTime = DEFAULT_SCREEN_SAVER_TIME;
-CARD32 defaultDPMSSuspendTime = DEFAULT_SCREEN_SAVER_TIME;
-CARD32 defaultDPMSOffTime = DEFAULT_SCREEN_SAVER_TIME;
 CARD16 DPMSPowerLevel = 0;
-Bool defaultDPMSEnabled = TRUE;
 Bool DPMSDisabledSwitch = FALSE;
 Bool DPMSCapableFlag = FALSE;
 CARD32 DPMSStandbyTime;
diff --git a/dix/main.c b/dix/main.c
index 6a45332c3..e10f7e1a4 100644
--- a/dix/main.c
+++ b/dix/main.c
@@ -269,10 +269,10 @@ int main(int argc, char *argv[], char *envp[])
 	ScreenSaverBlanking = defaultScreenSaverBlanking;
 	ScreenSaverAllowExposures = defaultScreenSaverAllowExposures;
 #ifdef DPMSExtension
-	DPMSStandbyTime = defaultDPMSStandbyTime;
-	DPMSSuspendTime = defaultDPMSSuspendTime;
-	DPMSOffTime = defaultDPMSOffTime;
-	DPMSEnabled = defaultDPMSEnabled;
+	DPMSStandbyTime = DEFAULT_SCREEN_SAVER_TIME;
+	DPMSSuspendTime = DEFAULT_SCREEN_SAVER_TIME;
+	DPMSOffTime = DEFAULT_SCREEN_SAVER_TIME;
+	DPMSEnabled = TRUE;
 	DPMSPowerLevel = 0;
 #endif
 	InitBlockAndWakeupHandlers();
diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
index b9ab11a32..9a25c7bca 100644
--- a/hw/xfree86/common/xf86Config.c
+++ b/hw/xfree86/common/xf86Config.c
@@ -986,21 +986,21 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts)
     i = -1;
     xf86GetOptValInteger(FlagOptions, FLAG_DPMS_STANDBYTIME, &i);
     if ((i >= 0) && (i < MAX_TIME_IN_MIN))
-	DPMSStandbyTime = defaultDPMSStandbyTime = i * MILLI_PER_MIN;
+	DPMSStandbyTime = i * MILLI_PER_MIN;
     else if (i != -1)
 	xf86ConfigError("StandbyTime value %d outside legal range of 0 - %d minutes",
 			i, MAX_TIME_IN_MIN);
     i = -1;
     xf86GetOptValInteger(FlagOptions, FLAG_DPMS_SUSPENDTIME, &i);
     if ((i >= 0) && (i < MAX_TIME_IN_MIN))
-	DPMSSuspendTime = defaultDPMSSuspendTime = i * MILLI_PER_MIN;
+	DPMSSuspendTime = i * MILLI_PER_MIN;
     else if (i != -1)
 	xf86ConfigError("SuspendTime value %d outside legal range of 0 - %d minutes",
 			i, MAX_TIME_IN_MIN);
     i = -1;
     xf86GetOptValInteger(FlagOptions, FLAG_DPMS_OFFTIME, &i);
     if ((i >= 0) && (i < MAX_TIME_IN_MIN))
-	DPMSOffTime = defaultDPMSOffTime = i * MILLI_PER_MIN;
+	DPMSOffTime = i * MILLI_PER_MIN;
     else if (i != -1)
 	xf86ConfigError("OffTime value %d outside legal range of 0 - %d minutes",
 			i, MAX_TIME_IN_MIN);
diff --git a/hw/xfree86/common/xf86DPMS.c b/hw/xfree86/common/xf86DPMS.c
index 46d105ce5..0f40e1b0b 100644
--- a/hw/xfree86/common/xf86DPMS.c
+++ b/hw/xfree86/common/xf86DPMS.c
@@ -83,7 +83,7 @@ xf86DPMSInit(ScreenPtr pScreen, DPMSSetProcPtr set, int flags)
     }
     else {
 	enabled_from = X_DEFAULT;
-	DPMSEnabled = defaultDPMSEnabled;
+	DPMSEnabled = TRUE;
     }
     if (DPMSEnabled)
 	xf86DrvMsg(pScreen->myNum, enabled_from, "DPMS enabled\n");
diff --git a/include/globals.h b/include/globals.h
index 79c959a57..a7ef48a54 100644
--- a/include/globals.h
+++ b/include/globals.h
@@ -28,14 +28,10 @@ extern _X_EXPORT DDXPointRec dixScreenOrigins[MAXSCREENS];
 extern _X_EXPORT char *ConnectionInfo;
 
 #ifdef DPMSExtension
-extern CARD32 defaultDPMSStandbyTime;
-extern CARD32 defaultDPMSSuspendTime;
-extern CARD32 defaultDPMSOffTime;
 extern CARD32 DPMSStandbyTime;
 extern CARD32 DPMSSuspendTime;
 extern CARD32 DPMSOffTime;
 extern CARD16 DPMSPowerLevel;
-extern Bool defaultDPMSEnabled;
 extern Bool DPMSEnabled;
 extern Bool DPMSDisabledSwitch;
 extern Bool DPMSCapableFlag;