mirror of
https://github.com/reactos/reactos.git
synced 2024-08-20 18:35:32 +00:00
- Re-remove intrinics from winddk.h
- Fix a typo in LOADER_PARAMETER_BLOCK svn path=/trunk/; revision=24317
This commit is contained in:
parent
10bd13604b
commit
13ccbc28b2
|
@ -31,28 +31,7 @@
|
|||
extern "C" {
|
||||
#endif
|
||||
|
||||
#ifdef __GNUC__
|
||||
/* Available as intrinsics on MSVC */
|
||||
static __inline void _disable(void) {__asm__ __volatile__("cli\n");}
|
||||
static __inline void _enable(void) {__asm__ __volatile__("sti\n");}
|
||||
|
||||
|
||||
static __inline ULONG64 __readcr3(void)
|
||||
{
|
||||
ULONG_PTR Ret;
|
||||
__asm__ __volatile__("movl %%cr3, %0;\n"
|
||||
:"=r"(Ret));
|
||||
return (ULONG64)Ret;
|
||||
}
|
||||
|
||||
static __inline ULONG64 __readcr4(void)
|
||||
{
|
||||
ULONG_PTR Ret;
|
||||
__asm__ __volatile__("movl %%cr4, %0; \n"
|
||||
:"=r"(Ret));
|
||||
return (ULONG64)Ret;
|
||||
}
|
||||
#endif
|
||||
#include "intrin.h"
|
||||
|
||||
/*
|
||||
** Definitions specific to this Device Driver Kit
|
||||
|
|
|
@ -251,7 +251,7 @@ typedef struct _LOADER_PARAMETER_BLOCK
|
|||
LPSTR NtBootPathName;
|
||||
LPSTR NtHalPathName;
|
||||
LPSTR LoadOptions;
|
||||
PNLS_DATA_BLOCK NlsData;
|
||||
NLS_DATA_BLOCK NlsData;
|
||||
PARC_DISK_INFORMATION ArcDiskInformation;
|
||||
PVOID OemFontFile;
|
||||
struct _SETUP_LOADER_BLOCK *SetupLdrBlock;
|
||||
|
|
Loading…
Reference in a new issue