Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-01 19:01:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

[HAL]

Browse source 
- Simplify check for matching kernel/hal
- Remove underscore from _MsgUnimplemented

svn path=/branches/ros-amd64-bringup/; revision=45443
This commit is contained in:
Timo Kreuzer 2010-02-06 01:26:52 +00:00
parent 548ef27d5c
commit cb79d231d7
2 changed files with 10 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

29
reactos/hal/halx86/generic/amd64/halinit.c
View file

@ -15,6 +15,11 @@
/* GLOBALS *******************************************************************/ /* GLOBALS *******************************************************************/
BOOLEAN HalpPciLockSettings; BOOLEAN HalpPciLockSettings;
#ifdef CONFIG_SMP
#define HAL_BUILD_TYPE (0 | DBG)
#else
#define HAL_BUILD_TYPE (2 | DBG)
#endif
/* PRIVATE FUNCTIONS *********************************************************/ /* PRIVATE FUNCTIONS *********************************************************/
@ -59,30 +64,12 @@ HalInitSystem(IN ULONG BootPhase,
/* Get command-line parameters */ /* Get command-line parameters */
HalpGetParameters(LoaderBlock); HalpGetParameters(LoaderBlock);
#if DBG /* Check if HAL and kernel have identical build type */
/* Checked HAL requires checked kernel */ if (Prcb->BuildType != HAL_BUILD_TYPE)
if (!(Prcb->BuildType & PRCB_BUILD_DEBUG))
{ {
/* No match, bugcheck */ /* No match, bugcheck */
KeBugCheckEx(MISMATCHED_HAL, 2, Prcb->BuildType, 1, 0); KeBugCheckEx(MISMATCHED_HAL, 2, Prcb->BuildType, HAL_BUILD_TYPE, 0);
} }
#else
/* Release build requires release HAL */
if (Prcb->BuildType & PRCB_BUILD_DEBUG)
{
/* No match, bugcheck */
KeBugCheckEx(MISMATCHED_HAL, 2, Prcb->BuildType, 0, 0);
}
#endif
#ifdef CONFIG_SMP
/* SMP HAL requires SMP kernel */
if (Prcb->BuildType & PRCB_BUILD_UNIPROCESSOR)
{
/* No match, bugcheck */
KeBugCheckEx(MISMATCHED_HAL, 2, Prcb->BuildType, 0, 0);
}
#endif
/* Validate the PRCB */ /* Validate the PRCB */
if (Prcb->MajorVersion != PRCB_MAJOR_VERSION) if (Prcb->MajorVersion != PRCB_MAJOR_VERSION)

4
reactos/hal/halx86/generic/amd64/systimer.S
View file

@ -14,8 +14,8 @@
.data .data
.global _MsgUnimplemented .global MsgUnimplemented
_MsgUnimplemented: MsgUnimplemented:
.asciz "WARNING: %s at %s:%d is UNIMPLEMENTED!\n" .asciz "WARNING: %s at %s:%d is UNIMPLEMENTED!\n"