[tkreuzer] 45443: [HAL] - Simplify check for matching kernel/hal - Remove underscore from _MsgUnimplemented

Author: tkreuzer
Date: Sat Feb  6 02:26:52 2010
New Revision: 45443

URL: http://svn.reactos.org/svn/reactos?rev=45443&view=rev
Log:
[HAL]
- Simplify check for matching kernel/hal
- Remove underscore from _MsgUnimplemented

Modified:
    branches/ros-amd64-bringup/reactos/hal/halx86/generic/amd64/halinit.c
    branches/ros-amd64-bringup/reactos/hal/halx86/generic/amd64/systimer.S

Modified: branches/ros-amd64-bringup/reactos/hal/halx86/generic/amd64/halinit.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/ha...
==============================================================================
--- branches/ros-amd64-bringup/reactos/hal/halx86/generic/amd64/halinit.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/hal/halx86/generic/amd64/halinit.c [iso-8859-1] Sat Feb  6 02:26:52 2010
@@ -15,6 +15,11 @@
 /* GLOBALS *******************************************************************/

BOOLEAN HalpPciLockSettings;
+#ifdef CONFIG_SMP
+#define HAL_BUILD_TYPE (0 | DBG)
+#else
+#define HAL_BUILD_TYPE (2 | DBG)
+#endif

/* PRIVATE FUNCTIONS *********************************************************/

@@ -59,30 +64,12 @@
         /* Get command-line parameters */
         HalpGetParameters(LoaderBlock);

-#if DBG
-        /* Checked HAL requires checked kernel */
-        if (!(Prcb->BuildType & PRCB_BUILD_DEBUG))
+        /* Check if HAL and kernel have identical build type */
+        if (Prcb->BuildType != HAL_BUILD_TYPE)
         {
             /* 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 */
         if (Prcb->MajorVersion != PRCB_MAJOR_VERSION)

Modified: branches/ros-amd64-bringup/reactos/hal/halx86/generic/amd64/systimer.S
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/ha...
==============================================================================
--- branches/ros-amd64-bringup/reactos/hal/halx86/generic/amd64/systimer.S [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/hal/halx86/generic/amd64/systimer.S [iso-8859-1] Sat Feb  6 02:26:52 2010
@@ -14,8 +14,8 @@

.data

-.global _MsgUnimplemented
-_MsgUnimplemented:
+.global MsgUnimplemented
+MsgUnimplemented:
 .asciz "WARNING:  %s at %s:%d is UNIMPLEMENTED!\n"