[HAL]

- rename halmp to halmps
- remove hal_generic_pc
- remove some stuff from halamd64

svn path=/branches/ros-amd64-bringup/; revision=44834

diff --git a/reactos/hal/halamd64/directory.rbuild b/reactos/hal/halamd64/directory.rbuild
index 1e0c730..78a5303 100644 (file)
--- a/reactos/hal/halamd64/directory.rbuild
+++ b/reactos/hal/halamd64/directory.rbuild
@@ -4,7 +4,4 @@
        <directory name="generic">
                <xi:include href="generic/generic.rbuild" />
        </directory>
-       <directory name="up">
-               <xi:include href="up/halup.rbuild" />
-       </directory>
 </group>

diff --git a/reactos/hal/halamd64/up/halinit_up.c b/reactos/hal/halamd64/up/halinit_up.c
deleted file mode 100644 (file)
index cbb18bc..0000000
--- a/reactos/hal/halamd64/up/halinit_up.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/* $Id: halinit_up.c 24964 2006-11-29 08:28:20Z ion $
- *
- * COPYRIGHT:     See COPYING in the top level directory
- * PROJECT:       ReactOS kernel
- * FILE:          ntoskrnl/hal/x86/halinit.c
- * PURPOSE:       Initalize the x86 hal
- * PROGRAMMER:    David Welch (welch@cwcom.net)
- * UPDATE HISTORY:
- *              11/06/98: Created
- */
-
-/* INCLUDES *****************************************************************/
-
-#include <hal.h>
-#define NDEBUG
-#include <debug.h>
-
-/* FUNCTIONS ***************************************************************/
-
-VOID
-HalpInitPhase0(IN PLOADER_PARAMETER_BLOCK LoaderBlock)
-{
-
-}
-
-VOID
-HalpInitPhase1(VOID)
-{
-
-}
-
-/* EOF */

diff --git a/reactos/hal/halamd64/up/halup.rc b/reactos/hal/halamd64/up/halup.rc
deleted file mode 100644 (file)
index 951c358..0000000
--- a/reactos/hal/halamd64/up/halup.rc
+++ /dev/null
@@ -1,5 +0,0 @@
-#define REACTOS_VERSION_DLL
-#define REACTOS_STR_FILE_DESCRIPTION   "AMD64 Uniprocessor Hardware Abstraction Layer\0"
-#define REACTOS_STR_INTERNAL_NAME      "halup\0"
-#define REACTOS_STR_ORIGINAL_FILENAME  "halup.dll\0"
-#include <reactos/version.rc>

diff --git a/reactos/hal/halamd64/up/processor.c b/reactos/hal/halamd64/up/processor.c
deleted file mode 100644 (file)
index 1be90e8..0000000
--- a/reactos/hal/halamd64/up/processor.c
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * PROJECT:         ReactOS HAL
- * LICENSE:         GPL - See COPYING in the top level directory
- * FILE:            hal/halamd64/up/processor.c
- * PURPOSE:         HAL Processor Routines
- * PROGRAMMERS:     Alex Ionescu (alex.ionescu@reactos.org)
- */
-
-/* INCLUDES ******************************************************************/
-
-#include <hal.h>
-#define NDEBUG
-#include <debug.h>
-
-LONG HalpActiveProcessors;
-KAFFINITY HalpDefaultInterruptAffinity;
-
-/* FUNCTIONS *****************************************************************/
-
-/*
- * @implemented
- */
-VOID
-NTAPI
-HalInitializeProcessor(IN ULONG ProcessorNumber,
-                       IN PLOADER_PARAMETER_BLOCK LoaderBlock)
-{
-    /* Set default stall count */
-    KeGetPcr()->StallScaleFactor = INITIAL_STALL_COUNT;
-
-    /* Update the interrupt affinity and processor mask */
-    InterlockedBitTestAndSet(&HalpActiveProcessors, ProcessorNumber);
-    InterlockedBitTestAndSet((PLONG)&HalpDefaultInterruptAffinity,
-                             ProcessorNumber);
-
-    /* Register routines for KDCOM */
-    HalpRegisterKdSupportFunctions();
-
-    /* Do per CPU interrupt handling initialization */
-//    HalpInitCpuInterruptHandling(ProcessorNumber);
-}
-
-/*
- * @implemented
- */
-BOOLEAN
-NTAPI
-HalAllProcessorsStarted(VOID)
-{
-    /* Do nothing */
-    return TRUE;
-}
-
-/*
- * @implemented
- */
-BOOLEAN
-NTAPI
-HalStartNextProcessor(IN PLOADER_PARAMETER_BLOCK LoaderBlock,
-                      IN PKPROCESSOR_STATE ProcessorState)
-{
-    /* Ready to start */
-    return FALSE;
-}
-
-/*
- * @implemented
- */
-VOID
-NTAPI
-HalProcessorIdle(VOID)
-{
-    /* Enable interrupts and halt the processor */
-    _enable();
-    __halt();
-}
-
-/*
- * @implemented
- */
-VOID
-NTAPI
-HalRequestIpi(KAFFINITY TargetSet)
-{
-    /* Not implemented on NT */
-    __debugbreak();
-}
-
-/* EOF */

diff --git a/reactos/hal/halx86/directory.rbuild b/reactos/hal/halx86/directory.rbuild
index bc046e1..4d5a219 100644 (file)
--- a/reactos/hal/halx86/directory.rbuild
+++ b/reactos/hal/halx86/directory.rbuild
@@ -3,19 +3,18 @@
 <group xmlns:xi="http://www.w3.org/2001/XInclude">
 
        <xi:include href="hal_generic.rbuild" />
-       <xi:include href="hal_generic_pc.rbuild" />
        <xi:include href="hal_generic_up.rbuild" />
 
        <if property="ARCH" value="i386">
-               <xi:include href="halup.rbuild" />
+               <xi:include href="hal.rbuild" />
                <xi:include href="halxbox.rbuild" />
                <if property="BUILD_MP" value="1">
-                       <xi:include href="halmp.rbuild" />
+                       <xi:include href="halmps.rbuild" />
                </if>
        </if>
 
-       <!-- if property="ARCH" value="amd64">
+       <if property="ARCH" value="amd64">
                <xi:include href="halamd64.rbuild" />
-       </if -->
+       </if>
 
 </group>

diff --git a/reactos/hal/halx86/halup.rbuild b/reactos/hal/halx86/hal.rbuild
similarity index 94%
rename from reactos/hal/halx86/halup.rbuild
rename to reactos/hal/halx86/hal.rbuild
index 096feb2..e4f7ea6 100644 (file)
--- a/reactos/hal/halx86/halup.rbuild
+++ b/reactos/hal/halx86/hal.rbuild
@@ -9,7 +9,6 @@
                <define name="_NTHAL_" />
                <library>hal_generic</library>
                <library>hal_generic_up</library>
-               <library>hal_generic_pc</library>
                <library>ntoskrnl</library>
                <directory name="up">
                        <file>halinit_up.c</file>

diff --git a/reactos/hal/halx86/hal_generic_pc.rbuild b/reactos/hal/halx86/hal_generic_pc.rbuild
deleted file mode 100644 (file)
index 5aac0c9..0000000
--- a/reactos/hal/halx86/hal_generic_pc.rbuild
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd">
-<group>
-       <module name="hal_generic_pc" type="objectlibrary">
-               <include>include</include>
-               <include base="ntoskrnl">include</include>
-               <define name="_NTHAL_" />
-               <directory name="generic">
-                       <directory name="bus">
-                               <file>pcibus.c</file>
-                       </directory>
-               </directory>
-       </module>
-</group>

diff --git a/reactos/hal/halamd64/up/halup.rbuild b/reactos/hal/halx86/halamd64.rbuild
similarity index 62%
rename from reactos/hal/halamd64/up/halup.rbuild
rename to reactos/hal/halx86/halamd64.rbuild
index bfdd25e..43126c4 100644 (file)
--- a/reactos/hal/halamd64/up/halup.rbuild
+++ b/reactos/hal/halx86/halamd64.rbuild
@@ -1,16 +1,23 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="hal" type="kernelmodedll" entrypoint="HalInitSystem" installbase="system32" installname="hal.dll">
-       <importlibrary base="hal" definition="../../hal.pspec" />
+       <importlibrary base="hal" definition="../hal.pspec" />
        <bootstrap installbase="$(CDOUTPUT)" nameoncd="hal.dll" />
-       <include base="hal">../include</include>
+       <include base="hal">include</include>
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_NTHAL_" />
        <library>hal_generic_amd64</library>
        <library>hal_generic</library>
+       <library>hal_generic_up</library>
        <library>ntoskrnl</library>
-       <file>halinit_up.c</file>
-       <file>halup.rc</file>
-       <file>processor.c</file>
+
+       <directory name="up">
+               <file>halinit_up.c</file>
+               <file>halup.rc</file>
+       </directory>
+
+       <!--directory name="mp">
+               <file>apic.c</file>
+       </directory -->
 </module>

diff --git a/reactos/hal/halx86/halmp.rbuild b/reactos/hal/halx86/halmps.rbuild
similarity index 87%
rename from reactos/hal/halx86/halmp.rbuild
rename to reactos/hal/halx86/halmps.rbuild
index 4169f0b..7aededd 100644 (file)
--- a/reactos/hal/halx86/halmp.rbuild
+++ b/reactos/hal/halx86/halmps.rbuild
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd">
 <group xmlns:xi="http://www.w3.org/2001/XInclude">
-       <module name="halmp" type="kernelmodedll" entrypoint="HalInitSystem@8">
+       <module name="halmps" type="kernelmodedll" entrypoint="HalInitSystem@8">
                <importlibrary base="hal" definition="../hal.pspec" />
                <bootstrap installbase="$(CDOUTPUT)" />
                <include>include</include>
@@ -9,7 +9,6 @@
                <define name="CONFIG_SMP" />
                <define name="_NTHAL_" />
                <library>hal_generic</library>
-               <library>hal_generic_pc</library>
                <library>ntoskrnl</library>
                <directory name="mp">
                        <file>apic.c</file>