* include/ddk/ntpoapi.h (POWER_INFORMATION_LEVEL): Remove.

* include/winnt.h (POWER_INFORMATION_LEVEL): Add.
	* include/ddk/winddk.h (SINGLE_LIST_ENTRY,SLIST_HEADER):
	Remove.
	* include/ddk/ndis.h (NdisAllocateSpinLock): Add missing '\'.
This commit is contained in:
Danny Smith 2003-06-02 22:21:54 +00:00
parent 3786526ea8
commit 38b524b385
5 changed files with 35 additions and 43 deletions

View File

@ -1,3 +1,11 @@
2003-06-02 Danny Smith <dannysmith@users.sourceforge.net>
* include/ddk/ntpoapi.h (POWER_INFORMATION_LEVEL): Remove.
* include/winnt.h (POWER_INFORMATION_LEVEL): Add.
* include/ddk/winddk.h (SINGLE_LIST_ENTRY,SLIST_HEADER):
Remove.
* include/ddk/ndis.h (NdisAllocateSpinLock): Add missing '\'.
2003-05-30 Mattia Barbon <mbarbon@dsi.unive.it> 2003-05-30 Mattia Barbon <mbarbon@dsi.unive.it>
* lib/oleacc.def: New file. * lib/oleacc.def: New file.

View File

@ -2524,7 +2524,7 @@ NdisUnicodeStringToAnsiString(
* NdisAllocateSpinLock( * NdisAllocateSpinLock(
* IN PNDIS_SPIN_LOCK SpinLock); * IN PNDIS_SPIN_LOCK SpinLock);
*/ */
#define NdisAllocateSpinLock(_SpinLock) #define NdisAllocateSpinLock(_SpinLock) \
KeInitializeSpinLock(&(_SpinLock)->SpinLock) KeInitializeSpinLock(&(_SpinLock)->SpinLock)
/* /*

View File

@ -36,32 +36,6 @@ extern "C" {
#include "ntddk.h" #include "ntddk.h"
#include "batclass.h" #include "batclass.h"
typedef enum _POWER_INFORMATION_LEVEL {
SystemPowerPolicyAc,
SystemPowerPolicyDc,
VerifySystemPolicyAc,
VerifySystemPolicyDc,
SystemPowerCapabilities,
SystemBatteryState,
SystemPowerStateHandler,
ProcessorStateHandler,
SystemPowerPolicyCurrent,
AdministratorPowerPolicy,
SystemReserveHiberFile,
ProcessorInformation,
SystemPowerInformation,
ProcessorStateHandler2,
LastWakeTime,
LastSleepTime,
SystemExecutionState,
SystemPowerStateNotifyHandler,
ProcessorPowerPolicyAc,
ProcessorPowerPolicyDc,
VerifyProcessorPowerPolicyAc,
VerifyProcessorPowerPolicyDc,
ProcessorPowerPolicyCurrent
} POWER_INFORMATION_LEVEL;
#define POWER_PERF_SCALE 100 #define POWER_PERF_SCALE 100
#define PERF_LEVEL_TO_PERCENT(x) (((x) * 1000) / (POWER_PERF_SCALE * 10)) #define PERF_LEVEL_TO_PERCENT(x) (((x) * 1000) / (POWER_PERF_SCALE * 10))
#define PERCENT_TO_PERF_LEVEL(x) (((x) * POWER_PERF_SCALE * 10) / 1000) #define PERCENT_TO_PERF_LEVEL(x) (((x) * POWER_PERF_SCALE * 10) / 1000)

View File

@ -138,22 +138,6 @@ typedef enum _MODE {
MaximumMode MaximumMode
} MODE; } MODE;
typedef struct _SINGLE_LIST_ENTRY {
struct _SINGLE_LIST_ENTRY *Next;
} SINGLE_LIST_ENTRY, *PSINGLE_LIST_ENTRY;
#define SLIST_ENTRY SINGLE_LIST_ENTRY
#define PSLIST_ENTRY PSINGLE_LIST_ENTRY
typedef union _SLIST_HEADER {
ULONGLONG Alignment;
struct {
SLIST_ENTRY Next;
USHORT Depth;
USHORT Sequence;
};
} SLIST_HEADER, *PSLIST_HEADER;
/* Structures not exposed to drivers */ /* Structures not exposed to drivers */
typedef struct _IO_TIMER *PIO_TIMER; typedef struct _IO_TIMER *PIO_TIMER;

View File

@ -2962,6 +2962,32 @@ typedef struct _SYSTEM_BATTERY_STATE {
ULONG DefaultAlert2; ULONG DefaultAlert2;
} SYSTEM_BATTERY_STATE, *PSYSTEM_BATTERY_STATE; } SYSTEM_BATTERY_STATE, *PSYSTEM_BATTERY_STATE;
typedef enum _POWER_INFORMATION_LEVEL {
SystemPowerPolicyAc,
SystemPowerPolicyDc,
VerifySystemPolicyAc,
VerifySystemPolicyDc,
SystemPowerCapabilities,
SystemBatteryState,
SystemPowerStateHandler,
ProcessorStateHandler,
SystemPowerPolicyCurrent,
AdministratorPowerPolicy,
SystemReserveHiberFile,
ProcessorInformation,
SystemPowerInformation,
ProcessorStateHandler2,
LastWakeTime,
LastSleepTime,
SystemExecutionState,
SystemPowerStateNotifyHandler,
ProcessorPowerPolicyAc,
ProcessorPowerPolicyDc,
VerifyProcessorPowerPolicyAc,
VerifyProcessorPowerPolicyDc,
ProcessorPowerPolicyCurrent
} POWER_INFORMATION_LEVEL;
#if 1 /* (WIN32_WINNT >= 0x0500) */ #if 1 /* (WIN32_WINNT >= 0x0500) */
typedef struct _SYSTEM_POWER_INFORMATION { typedef struct _SYSTEM_POWER_INFORMATION {
ULONG MaxIdlenessAllowed; ULONG MaxIdlenessAllowed;