mirror of
https://github.com/reactos/reactos.git
synced 2025-05-28 13:38:19 +00:00
[XDK/DDK]
- Remove useless inline definition of InterlockedBitTestAnd(Re)Set, which was not used anyway. - Update template for ntdef.h svn path=/trunk/; revision=64046
This commit is contained in:
parent
b411c4825b
commit
c8e3595247
4 changed files with 8 additions and 93 deletions
|
@ -235,51 +235,6 @@ inline int IsEqualGUIDAligned(REFGUID guid1, REFGUID guid2)
|
|||
/******************************************************************************
|
||||
* INTERLOCKED Functions *
|
||||
******************************************************************************/
|
||||
//
|
||||
// Intrinsics (note: taken from our winnt.h)
|
||||
// FIXME: 64-bit
|
||||
//
|
||||
#if defined(__GNUC__)
|
||||
|
||||
static __inline__ BOOLEAN
|
||||
InterlockedBitTestAndSet(
|
||||
_Inout_updates_bytes_((Bit+7)/8) _Interlocked_operand_ LONG volatile *Base,
|
||||
_In_ LONG Bit)
|
||||
{
|
||||
#if defined(_M_IX86)
|
||||
LONG OldBit;
|
||||
__asm__ __volatile__("lock "
|
||||
"btsl %2,%1\n\t"
|
||||
"sbbl %0,%0\n\t"
|
||||
:"=r" (OldBit),"+m" (*Base)
|
||||
:"Ir" (Bit)
|
||||
: "memory");
|
||||
return OldBit;
|
||||
#else
|
||||
return (_InterlockedOr(Base, 1 << Bit) >> Bit) & 1;
|
||||
#endif
|
||||
}
|
||||
|
||||
static __inline__ BOOLEAN
|
||||
InterlockedBitTestAndReset(
|
||||
_Inout_updates_bytes_((Bit+7)/8) _Interlocked_operand_ LONG volatile *Base,
|
||||
_In_ LONG Bit)
|
||||
{
|
||||
#if defined(_M_IX86)
|
||||
LONG OldBit;
|
||||
__asm__ __volatile__("lock "
|
||||
"btrl %2,%1\n\t"
|
||||
"sbbl %0,%0\n\t"
|
||||
:"=r" (OldBit),"+m" (*Base)
|
||||
:"Ir" (Bit)
|
||||
: "memory");
|
||||
return OldBit;
|
||||
#else
|
||||
return (_InterlockedAnd(Base, ~(1 << Bit)) >> Bit) & 1;
|
||||
#endif
|
||||
}
|
||||
|
||||
#endif /* defined(__GNUC__) */
|
||||
|
||||
#define BitScanForward _BitScanForward
|
||||
#define BitScanReverse _BitScanReverse
|
||||
|
@ -16136,6 +16091,7 @@ typedef struct _TRANSACTIONMANAGER_RECOVERY_INFORMATION {
|
|||
ULONGLONG LastRecoveredLsn;
|
||||
} TRANSACTIONMANAGER_RECOVERY_INFORMATION, *PTRANSACTIONMANAGER_RECOVERY_INFORMATION;
|
||||
|
||||
|
||||
typedef struct _TRANSACTION_PROPERTIES_INFORMATION {
|
||||
ULONG IsolationLevel;
|
||||
ULONG IsolationFlags;
|
||||
|
@ -16184,7 +16140,7 @@ typedef enum _KTMOBJECT_TYPE {
|
|||
|
||||
typedef struct _KTMOBJECT_CURSOR {
|
||||
GUID LastQuery;
|
||||
ULONG ObjectIdCount;
|
||||
unsigned long ObjectIdCount;
|
||||
GUID ObjectIds[1];
|
||||
} KTMOBJECT_CURSOR, *PKTMOBJECT_CURSOR;
|
||||
|
||||
|
@ -16192,14 +16148,14 @@ typedef enum _TRANSACTION_INFORMATION_CLASS {
|
|||
TransactionBasicInformation,
|
||||
TransactionPropertiesInformation,
|
||||
TransactionEnlistmentInformation,
|
||||
TransactionSuperiorEnlistmentInformation
|
||||
TransactionSuperiorEnlistmentInformation,
|
||||
} TRANSACTION_INFORMATION_CLASS;
|
||||
|
||||
typedef enum _TRANSACTIONMANAGER_INFORMATION_CLASS {
|
||||
TransactionManagerBasicInformation,
|
||||
TransactionManagerLogInformation,
|
||||
TransactionManagerLogPathInformation,
|
||||
TransactionManagerRecoveryInformation = 4
|
||||
TransactionManagerRecoveryInformation = 4,
|
||||
} TRANSACTIONMANAGER_INFORMATION_CLASS;
|
||||
|
||||
typedef enum _RESOURCEMANAGER_INFORMATION_CLASS {
|
||||
|
|
|
@ -4,3 +4,5 @@ hpp.exe wdm.template.h wdm.h
|
|||
hpp.exe ntddk.template.h ntddk.h
|
||||
hpp.exe ntifs.template.h ntifs.h
|
||||
hpp.exe devioctl.template.h devioctl.h
|
||||
hpp.exe ntdef.template.h ..\psdk\ntdef.h
|
||||
hpp.exe winnt.template.h ..\psdk\winnt.h
|
||||
|
|
|
@ -1,51 +1,6 @@
|
|||
/******************************************************************************
|
||||
* INTERLOCKED Functions *
|
||||
******************************************************************************/
|
||||
//
|
||||
// Intrinsics (note: taken from our winnt.h)
|
||||
// FIXME: 64-bit
|
||||
//
|
||||
#if defined(__GNUC__)
|
||||
|
||||
static __inline__ BOOLEAN
|
||||
InterlockedBitTestAndSet(
|
||||
_Inout_updates_bytes_((Bit+7)/8) _Interlocked_operand_ LONG volatile *Base,
|
||||
_In_ LONG Bit)
|
||||
{
|
||||
#if defined(_M_IX86)
|
||||
LONG OldBit;
|
||||
__asm__ __volatile__("lock "
|
||||
"btsl %2,%1\n\t"
|
||||
"sbbl %0,%0\n\t"
|
||||
:"=r" (OldBit),"+m" (*Base)
|
||||
:"Ir" (Bit)
|
||||
: "memory");
|
||||
return OldBit;
|
||||
#else
|
||||
return (_InterlockedOr(Base, 1 << Bit) >> Bit) & 1;
|
||||
#endif
|
||||
}
|
||||
|
||||
static __inline__ BOOLEAN
|
||||
InterlockedBitTestAndReset(
|
||||
_Inout_updates_bytes_((Bit+7)/8) _Interlocked_operand_ LONG volatile *Base,
|
||||
_In_ LONG Bit)
|
||||
{
|
||||
#if defined(_M_IX86)
|
||||
LONG OldBit;
|
||||
__asm__ __volatile__("lock "
|
||||
"btrl %2,%1\n\t"
|
||||
"sbbl %0,%0\n\t"
|
||||
:"=r" (OldBit),"+m" (*Base)
|
||||
:"Ir" (Bit)
|
||||
: "memory");
|
||||
return OldBit;
|
||||
#else
|
||||
return (_InterlockedAnd(Base, ~(1 << Bit)) >> Bit) & 1;
|
||||
#endif
|
||||
}
|
||||
|
||||
#endif /* defined(__GNUC__) */
|
||||
|
||||
#define BitScanForward _BitScanForward
|
||||
#define BitScanReverse _BitScanReverse
|
||||
|
|
|
@ -24,7 +24,9 @@
|
|||
|
||||
/* Dependencies */
|
||||
#include <ctype.h>
|
||||
$if(0)
|
||||
//#include <winapifamily.h>
|
||||
$endif()
|
||||
#include <basetsd.h>
|
||||
#include <guiddef.h>
|
||||
#include <excpt.h>
|
||||
|
|
Loading…
Reference in a new issue