Bug #4718: Command line flag to disable ACPI.
This commit is contained in:
parent
cf605eb916
commit
f1ba3b4f33
@ -1,3 +1,11 @@
|
||||
2005-12-14 Adam Jackson <ajax@freedesktop.org>
|
||||
|
||||
* hw/xfree86/common/xf86Globals.c:
|
||||
* hw/xfree86/common/xf86Init.c:
|
||||
* hw/xfree86/common/xf86Priv.h:
|
||||
* hw/xfree86/os-support/linux/lnx_apm.c:
|
||||
Bug #4718: Command line flag to disable ACPI.
|
||||
|
||||
2005-12-13 Adam Jackson <ajax@freedesktop.org>
|
||||
|
||||
* Xext/Makefile.am:
|
||||
|
@ -216,6 +216,7 @@ Bool xf86sFlag = FALSE;
|
||||
Bool xf86bsEnableFlag = FALSE;
|
||||
Bool xf86bsDisableFlag = FALSE;
|
||||
Bool xf86silkenMouseDisableFlag = FALSE;
|
||||
Bool xf86acpiDisableFlag = FALSE;
|
||||
char *xf86LayoutName = NULL;
|
||||
char *xf86ScreenName = NULL;
|
||||
char *xf86PointerName = NULL;
|
||||
|
@ -1660,6 +1660,11 @@ ddxProcessArgument(int argc, char **argv, int i)
|
||||
xf86silkenMouseDisableFlag = TRUE;
|
||||
return 1;
|
||||
}
|
||||
if (!strcmp(argv[i], "-noacpi"))
|
||||
{
|
||||
xf86acpiDisableFlag = TRUE;
|
||||
return 1;
|
||||
}
|
||||
if (!strcmp(argv[i], "-scanpci"))
|
||||
{
|
||||
DoScanPci(argc, argv, i);
|
||||
|
@ -60,6 +60,7 @@ extern Bool xf86sFlag;
|
||||
extern Bool xf86bsEnableFlag;
|
||||
extern Bool xf86bsDisableFlag;
|
||||
extern Bool xf86silkenMouseDisableFlag;
|
||||
extern Bool xf86acpiDisableFlag;
|
||||
extern char *xf86LayoutName;
|
||||
extern char *xf86ScreenName;
|
||||
extern char *xf86PointerName;
|
||||
|
@ -131,9 +131,10 @@ xf86OSPMOpen(void)
|
||||
{
|
||||
PMClose ret = NULL;
|
||||
|
||||
/* Favour ACPI over APM */
|
||||
/* Favour ACPI over APM, but only when enabled */
|
||||
|
||||
ret = lnxACPIOpen();
|
||||
if (!xf86acpiDisableFlag)
|
||||
ret = lnxACPIOpen();
|
||||
|
||||
if (!ret)
|
||||
ret = lnxAPMOpen();
|
||||
|
Loading…
Reference in New Issue
Block a user