Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-22 16:36:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

[XDK]

Browse source 
- Fix and update some amd64 definitions

svn path=/branches/header-work/; revision=46385
This commit is contained in:
Timo Kreuzer 2010-03-24 01:39:36 +00:00
parent 1be8cd9ee4
commit 73c134f384
7 changed files with 44 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/ddk/ntddk.h
View file

@ -3214,7 +3214,6 @@ KeGetCurrentProcessorNumber(VOID)
#define MM_USER_PROBE_ADDRESS MmUserProbeAddress
#define MM_LOWEST_USER_ADDRESS (PVOID)0x10000
#define MM_LOWEST_SYSTEM_ADDRESS (PVOID)0xFFFF080000000000ULL
#define KI_USER_SHARED_DATA 0xFFFFF78000000000ULL
#elif defined(_M_IA64)
@ -3702,6 +3701,7 @@ IoAllocateAdapterChannel(
IN PVOID Context);
#endif
#if !defined(DMA_MACROS_DEFINED)
//DECLSPEC_DEPRECATED_DDK
NTHALAPI
PHYSICAL_ADDRESS
@ -3713,6 +3713,7 @@ IoMapTransfer(
IN PVOID CurrentVa,
IN OUT PULONG Length,
IN BOOLEAN WriteToDevice);
#endif
NTKERNELAPI
VOID

25
include/ddk/wdm.h
View file

@ -249,6 +249,10 @@ InterlockedBitTestAndReset(
#define InterlockedBitTestAndReset _interlockedbittestandreset
#ifdef _M_AMD64
#define BitTest64 _bittest64
#define BitTestAndComplement64 _bittestandcomplement64
#define BitTestAndSet64 _bittestandset64
#define BitTestAndReset64 _bittestandreset64
#define InterlockedBitTestAndSet64 _interlockedbittestandset64
#define InterlockedBitTestAndReset64 _interlockedbittestandreset64
#endif
@ -453,7 +457,7 @@ typedef struct _TIME_FIELDS {
#if defined(_WIN64)
typedef struct DECLSPEC_ALIGN(16) _SLIST_ENTRY {
PSLIST_ENTRY Next;
struct _SLIST_ENTRY *Next;
} SLIST_ENTRY, *PSLIST_ENTRY;
typedef struct _SLIST_ENTRY32 {
@ -7835,11 +7839,22 @@ _KeQueryTickCount(
#define PROFILE_LEVEL 15
#define HIGH_LEVEL 15
#define KI_USER_SHARED_DATA 0xFFFFF78000000000ULL
#define SharedUserData ((PKUSER_SHARED_DATA const)KI_USER_SHARED_DATA)
#define SharedInterruptTime (KI_USER_SHARED_DATA + 0x8)
#define SharedSystemTime (KI_USER_SHARED_DATA + 0x14)
#define SharedTickCount (KI_USER_SHARED_DATA + 0x320)
#define PAGE_SIZE 0x1000
#define PAGE_SHIFT 12L
#define KI_USER_SHARED_DATA 0xFFFFF78000000000UI64
#define SharedUserData ((PKUSER_SHARED_DATA const)KI_USER_SHARED_DATA)
#define EFLAG_SIGN 0x8000
#define EFLAG_ZERO 0x4000
#define EFLAG_SELECT (EFLAG_SIGN | EFLAG_ZERO)
#define RESULT_NEGATIVE ((EFLAG_SIGN & ~EFLAG_ZERO) & EFLAG_SELECT)
#define RESULT_ZERO ((~EFLAG_SIGN & EFLAG_ZERO) & EFLAG_SELECT)
#define RESULT_POSITIVE ((~EFLAG_SIGN & ~EFLAG_ZERO) & EFLAG_SELECT)
typedef struct _KFLOATING_SAVE {
@ -7872,7 +7887,7 @@ FORCEINLINE
VOID
KeLowerIrql(IN KIRQL NewIrql)
{
ASSERT(KeGetCurrentIrql() >= NewIrql);
//ASSERT(KeGetCurrentIrql() >= NewIrql);
__writecr8(NewIrql);
}
@ -7883,7 +7898,7 @@ KfRaiseIrql(IN KIRQL NewIrql)
KIRQL OldIrql;
OldIrql = __readcr8();
ASSERT(OldIrql <= NewIrql);
//ASSERT(OldIrql <= NewIrql);
__writecr8(NewIrql);
return OldIrql;
}

19
include/xdk/amd64/ke.h
View file

@ -14,11 +14,22 @@ $if (_WDMDDK_)
#define PROFILE_LEVEL 15
#define HIGH_LEVEL 15
#define KI_USER_SHARED_DATA 0xFFFFF78000000000ULL
#define SharedUserData ((PKUSER_SHARED_DATA const)KI_USER_SHARED_DATA)
#define SharedInterruptTime (KI_USER_SHARED_DATA + 0x8)
#define SharedSystemTime (KI_USER_SHARED_DATA + 0x14)
#define SharedTickCount (KI_USER_SHARED_DATA + 0x320)
#define PAGE_SIZE 0x1000
#define PAGE_SHIFT 12L
#define KI_USER_SHARED_DATA 0xFFFFF78000000000UI64
#define SharedUserData ((PKUSER_SHARED_DATA const)KI_USER_SHARED_DATA)
#define EFLAG_SIGN 0x8000
#define EFLAG_ZERO 0x4000
#define EFLAG_SELECT (EFLAG_SIGN | EFLAG_ZERO)
#define RESULT_NEGATIVE ((EFLAG_SIGN & ~EFLAG_ZERO) & EFLAG_SELECT)
#define RESULT_ZERO ((~EFLAG_SIGN & EFLAG_ZERO) & EFLAG_SELECT)
#define RESULT_POSITIVE ((~EFLAG_SIGN & ~EFLAG_ZERO) & EFLAG_SELECT)
typedef struct _KFLOATING_SAVE {
@ -51,7 +62,7 @@ FORCEINLINE
VOID
KeLowerIrql(IN KIRQL NewIrql)
{
ASSERT(KeGetCurrentIrql() >= NewIrql);
//ASSERT(KeGetCurrentIrql() >= NewIrql);
__writecr8(NewIrql);
}
@ -62,7 +73,7 @@ KfRaiseIrql(IN KIRQL NewIrql)
KIRQL OldIrql;
OldIrql = __readcr8();
ASSERT(OldIrql <= NewIrql);
//ASSERT(OldIrql <= NewIrql);
__writecr8(NewIrql);
return OldIrql;
}

1
include/xdk/amd64/mm.h
View file

@ -28,7 +28,6 @@ $if (_NTDDK_)
#define MM_USER_PROBE_ADDRESS MmUserProbeAddress
#define MM_LOWEST_USER_ADDRESS (PVOID)0x10000
#define MM_LOWEST_SYSTEM_ADDRESS (PVOID)0xFFFF080000000000ULL
#define KI_USER_SHARED_DATA 0xFFFFF78000000000ULL
$endif /* _NTDDK_ */

4
include/xdk/interlocked.h
View file

@ -57,6 +57,10 @@ InterlockedBitTestAndReset(
#define InterlockedBitTestAndReset _interlockedbittestandreset
#ifdef _M_AMD64
#define BitTest64 _bittest64
#define BitTestAndComplement64 _bittestandcomplement64
#define BitTestAndSet64 _bittestandset64
#define BitTestAndReset64 _bittestandreset64
#define InterlockedBitTestAndSet64 _interlockedbittestandset64
#define InterlockedBitTestAndReset64 _interlockedbittestandreset64
#endif

2
include/xdk/iofuncs.h
View file

@ -587,6 +587,7 @@ IoAllocateAdapterChannel(
IN PVOID Context);
#endif
#if !defined(DMA_MACROS_DEFINED)
//DECLSPEC_DEPRECATED_DDK
NTHALAPI
PHYSICAL_ADDRESS
@ -598,6 +599,7 @@ IoMapTransfer(
IN PVOID CurrentVa,
IN OUT PULONG Length,
IN BOOLEAN WriteToDevice);
#endif
NTKERNELAPI
VOID

2
include/xdk/rtltypes.h
View file

@ -73,7 +73,7 @@ typedef struct _TIME_FIELDS {
#if defined(_WIN64)
typedef struct DECLSPEC_ALIGN(16) _SLIST_ENTRY {
PSLIST_ENTRY Next;
struct _SLIST_ENTRY *Next;
} SLIST_ENTRY, *PSLIST_ENTRY;
typedef struct _SLIST_ENTRY32 {