Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-04 02:15:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Re-remove intrinics from winddk.h

Browse source 
- Fix a typo in LOADER_PARAMETER_BLOCK

svn path=/trunk/; revision=24317
This commit is contained in:
Alex Ionescu 2006-09-30 14:57:30 +00:00
parent 10bd13604b
commit 13ccbc28b2
2 changed files with 2 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

23
reactos/include/ddk/winddk.h
View file

@ -31,28 +31,7 @@
extern "C" { extern "C" {
#endif #endif
#ifdef __GNUC__ #include "intrin.h"
/* 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
/* /*
** Definitions specific to this Device Driver Kit ** Definitions specific to this Device Driver Kit

2
reactos/include/reactos/arc/arc.h
View file

@ -251,7 +251,7 @@ typedef struct _LOADER_PARAMETER_BLOCK
LPSTR NtBootPathName; LPSTR NtBootPathName;
LPSTR NtHalPathName; LPSTR NtHalPathName;
LPSTR LoadOptions; LPSTR LoadOptions;
PNLS_DATA_BLOCK NlsData; NLS_DATA_BLOCK NlsData;
PARC_DISK_INFORMATION ArcDiskInformation; PARC_DISK_INFORMATION ArcDiskInformation;
PVOID OemFontFile; PVOID OemFontFile;
struct _SETUP_LOADER_BLOCK *SetupLdrBlock; struct _SETUP_LOADER_BLOCK *SetupLdrBlock;