[HAL]
authorTimo Kreuzer <timo.kreuzer@reactos.org>
Thu, 21 Jan 2010 21:05:45 +0000 (21:05 +0000)
committerTimo Kreuzer <timo.kreuzer@reactos.org>
Thu, 21 Jan 2010 21:05:45 +0000 (21:05 +0000)
Cleanup part 1/x
- Rename each architectures default hal to "hal" and delete the stubbed "hal" module.
- Delete halamd64 (will later reuse the x86 hal)
- Rename "halmp" to "halmps" as it's called on windows
- Set HalInitSystem as entry point
- Move pcibus.c into hal_generic.rbuild
- Use a common .pspec file
- Use a directory.rbuild for halx86 as it was done for the other architectures already
- Move some code from hal_generic to hal_generic_up
- No code change

svn path=/trunk/; revision=45195

34 files changed:
reactos/hal/hal.pspec [new file with mode: 0644]
reactos/hal/hal.rbuild
reactos/hal/hal/hal.c [deleted file]
reactos/hal/hal/hal.pspec [deleted file]
reactos/hal/hal/hal.rbuild [deleted file]
reactos/hal/hal/hal.rc [deleted file]
reactos/hal/hal/hal_amd64.def [deleted file]
reactos/hal/halamd64/directory.rbuild [deleted file]
reactos/hal/halamd64/generic/generic.rbuild [deleted file]
reactos/hal/halamd64/generic/halinit.c [deleted file]
reactos/hal/halamd64/generic/irq.S [deleted file]
reactos/hal/halamd64/generic/misc.c [deleted file]
reactos/hal/halamd64/generic/mps.S [deleted file]
reactos/hal/halamd64/generic/systimer.S [deleted file]
reactos/hal/halamd64/hal_generic.c [deleted file]
reactos/hal/halamd64/hal_generic.rbuild [deleted file]
reactos/hal/halamd64/include/bus.h [deleted file]
reactos/hal/halamd64/include/hal.h [deleted file]
reactos/hal/halamd64/include/halp.h [deleted file]
reactos/hal/halamd64/up/halinit_up.c [deleted file]
reactos/hal/halamd64/up/halup.rbuild [deleted file]
reactos/hal/halamd64/up/halup.rc [deleted file]
reactos/hal/halamd64/up/processor.c [deleted file]
reactos/hal/halarm/up/halup.rbuild
reactos/hal/halppc/up/halup.rbuild
reactos/hal/halx86/directory.rbuild [new file with mode: 0644]
reactos/hal/halx86/hal.rbuild [moved from reactos/hal/halx86/halup.rbuild with 73% similarity]
reactos/hal/halx86/hal_generic.rbuild
reactos/hal/halx86/hal_generic_amd64.rbuild [deleted file]
reactos/hal/halx86/hal_generic_mp.rbuild [new file with mode: 0644]
reactos/hal/halx86/hal_generic_pc.rbuild [deleted file]
reactos/hal/halx86/halamd64.rbuild [new file with mode: 0644]
reactos/hal/halx86/halmps.rbuild [moved from reactos/hal/halx86/halmp.rbuild with 58% similarity]
reactos/hal/halx86/halxbox.rbuild

diff --git a/reactos/hal/hal.pspec b/reactos/hal/hal.pspec
new file mode 100644 (file)
index 0000000..786372d
--- /dev/null
@@ -0,0 +1,104 @@
+#include "include/reactos/msvctarget.h"
+#undef i386
+
+#ifdef _M_ARM
+@ fastcall ExAcquireFastMutex(ptr)
+@ fastcall ExReleaseFastMutex(ptr)
+#else
+@ fastcall -arch=i386 ExAcquireFastMutex(ptr) ExiAcquireFastMutex
+@ fastcall -arch=i386 ExReleaseFastMutex(ptr) ExiReleaseFastMutex
+#endif
+@ fastcall -arch=i386,arm ExTryToAcquireFastMutex(ptr) ExiTryToAcquireFastMutex
+@ fastcall HalClearSoftwareInterrupt(long)
+@ fastcall HalRequestSoftwareInterrupt(long)
+@ fastcall HalSystemVectorDispatchEntry(long long long)
+@ fastcall -arch=i386,arm KeAcquireInStackQueuedSpinLock(ptr ptr)
+@ fastcall -arch=i386,arm KeAcquireInStackQueuedSpinLockRaiseToSynch(ptr ptr)
+@ fastcall -arch=i386,arm KeAcquireSpinLockRaiseToSynch(ptr)
+@ fastcall -arch=i386,arm KeAcquireQueuedSpinLock(ptr)
+@ fastcall -arch=i386,arm KeAcquireQueuedSpinLockRaiseToSynch(ptr)
+@ fastcall -arch=i386,arm KeReleaseInStackQueuedSpinLock(ptr)
+@ fastcall -arch=i386,arm KeReleaseQueuedSpinLock(ptr long)
+@ fastcall -arch=i386,arm KeTryToAcquireQueuedSpinLock(long ptr)
+@ fastcall -arch=i386,arm KeTryToAcquireQueuedSpinLockRaiseToSynch(long ptr)
+@ fastcall -arch=i386,arm KfAcquireSpinLock(ptr)
+@ fastcall -arch=i386,arm KfLowerIrql(long)
+@ fastcall -arch=i386,arm KfRaiseIrql(long)
+@ fastcall -arch=i386,arm KfReleaseSpinLock(ptr long)
+@ stdcall HalAcquireDisplayOwnership(ptr)
+@ stdcall HalAdjustResourceList(ptr)
+@ stdcall HalAllProcessorsStarted()
+@ stdcall HalAllocateAdapterChannel(ptr ptr long ptr)
+@ stdcall HalAllocateCommonBuffer(ptr long ptr long)
+@ stdcall HalAllocateCrashDumpRegisters(ptr ptr)
+@ stdcall HalAssignSlotResources(ptr ptr ptr ptr long long long ptr)
+@ stdcall HalBeginSystemInterrupt(long long ptr)
+@ stdcall HalCalibratePerformanceCounter(ptr long long)
+@ stdcall HalDisableSystemInterrupt(long long)
+@ stdcall HalDisplayString(str)
+@ stdcall HalEnableSystemInterrupt(long long long)
+@ stdcall HalEndSystemInterrupt(long long)
+@ stdcall HalFlushCommonBuffer(long long long long long)
+@ stdcall HalFreeCommonBuffer(ptr long long long ptr long)
+@ stdcall HalGetAdapter(ptr ptr)
+@ stdcall HalGetBusData(long long long ptr long)
+@ stdcall HalGetBusDataByOffset(long long long ptr long long)
+@ stdcall HalGetEnvironmentVariable(str long str)
+@ fastcall -arch=arm HalGetInterruptSource()
+@ stdcall HalGetInterruptVector(long long long long ptr ptr)
+@ stdcall HalHandleNMI(ptr)
+@ stdcall HalInitSystem(long ptr)
+@ stdcall HalInitializeProcessor(long ptr)
+@ stdcall HalMakeBeep(long)
+@ stdcall HalProcessorIdle()
+@ stdcall HalQueryDisplayParameters(ptr ptr ptr ptr)
+@ stdcall HalQueryRealTimeClock(ptr)
+@ stdcall HalReadDmaCounter(ptr)
+@ stdcall HalReportResourceUsage()
+@ stdcall HalRequestIpi(long)
+@ stdcall HalReturnToFirmware(long)
+@ stdcall HalSetBusData(long long long ptr long)
+@ stdcall HalSetBusDataByOffset(long long long ptr long long)
+@ stdcall HalSetDisplayParameters(long long)
+@ stdcall HalSetEnvironmentVariable(str str)
+@ stdcall HalSetProfileInterval(long)
+@ stdcall HalSetRealTimeClock(ptr)
+@ stdcall HalSetTimeIncrement(long)
+@ stdcall HalStartNextProcessor(ptr ptr)
+@ stdcall HalStartProfileInterrupt(long)
+@ stdcall HalStopProfileInterrupt(long)
+@ fastcall -arch=arm HalSweepIcache()
+@ fastcall -arch=arm HalSweepDcache()
+@ stdcall HalTranslateBusAddress(long long long long ptr ptr)
+@ stdcall IoFlushAdapterBuffers(ptr ptr ptr ptr long long)
+@ stdcall IoFreeAdapterChannel(ptr)
+@ stdcall IoFreeMapRegisters(ptr ptr long)
+@ stdcall IoMapTransfer(ptr ptr ptr ptr ptr long)
+@ stdcall -arch=i386,x86_64 IoAssignDriveLetters(ptr str ptr ptr) HalpAssignDriveLetters
+@ stdcall -arch=i386,x86_64 IoReadPartitionTable(ptr long long ptr) HalpReadPartitionTable
+@ stdcall -arch=i386,x86_64 IoSetPartitionInformation(ptr long long long) HalpSetPartitionInformation
+@ stdcall -arch=i386,x86_64 IoWritePartitionTable(ptr long long long ptr) HalpWritePartitionTable
+@ stdcall -arch=i386,arm KeAcquireSpinLock(ptr ptr)
+@ extern KdComPortInUse
+@ stdcall KeFlushWriteBuffer()
+@ stdcall -arch=i386,arm KeGetCurrentIrql()
+@ stdcall -arch=i386,arm KeLowerIrql(long)
+@ stdcall KeQueryPerformanceCounter(ptr)
+@ stdcall -arch=i386,arm KeRaiseIrql(long ptr)
+@ stdcall -arch=i386,arm KeRaiseIrqlToDpcLevel()
+@ stdcall -arch=i386,arm KeRaiseIrqlToSynchLevel()
+@ stdcall -arch=i386,arm KeReleaseSpinLock(ptr long)
+@ stdcall KeStallExecutionProcessor(long)
+@ stdcall -arch=i386,arm READ_PORT_BUFFER_UCHAR(ptr ptr long)
+@ stdcall -arch=i386,arm READ_PORT_BUFFER_ULONG(ptr ptr long)
+@ stdcall -arch=i386,arm READ_PORT_BUFFER_USHORT(ptr ptr long)
+@ stdcall -arch=i386,arm READ_PORT_UCHAR(ptr)
+@ stdcall -arch=i386,arm READ_PORT_ULONG(ptr)
+@ stdcall -arch=i386,arm READ_PORT_USHORT(ptr)
+@ stdcall -arch=i386,arm WRITE_PORT_BUFFER_UCHAR(ptr ptr long)
+@ stdcall -arch=i386,arm WRITE_PORT_BUFFER_ULONG(ptr ptr long)
+@ stdcall -arch=i386,arm WRITE_PORT_BUFFER_USHORT(ptr ptr long)
+@ stdcall -arch=i386,arm WRITE_PORT_UCHAR(ptr long)
+@ stdcall -arch=i386,arm WRITE_PORT_ULONG(ptr long)
+@ stdcall -arch=i386,arm WRITE_PORT_USHORT(ptr long)
+@ stdcall -arch=x86_64 HalInitializeBios(long ptr)
index 98d50f0..a7cf4bb 100644 (file)
@@ -1,21 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE group SYSTEM "../tools/rbuild/project.dtd">
 <group xmlns:xi="http://www.w3.org/2001/XInclude">
-       <directory name="hal">
-               <xi:include href="hal/hal.rbuild" />
+       <directory name="halx86">
+               <xi:include href="halx86/directory.rbuild" />
        </directory>
-       <if property="ARCH" value="i386">
-               <directory name="halx86">
-                       <xi:include href="halx86/hal_generic.rbuild" />
-                       <xi:include href="halx86/hal_generic_up.rbuild" />
-                       <xi:include href="halx86/hal_generic_pc.rbuild" />
-                       <xi:include href="halx86/halup.rbuild" />
-                       <if property="BUILD_MP" value="1">
-                               <xi:include href="halx86/halmp.rbuild" />
-                       </if>
-                       <xi:include href="halx86/halxbox.rbuild" />
-               </directory>
-       </if>
+
        <if property="ARCH" value="powerpc">
                <directory name="halppc">
                        <xi:include href="halppc/directory.rbuild" />
                        <xi:include href="halarm/directory.rbuild" />
                </directory>
        </if>
-       <if property="ARCH" value="amd64">
-               <directory name="halx86">
-                       <xi:include href="halx86/hal_generic_amd64.rbuild" />
-               </directory>
-               <directory name="halamd64">
-                       <xi:include href="halamd64/directory.rbuild" />
-               </directory>
-       </if>
 </group>
diff --git a/reactos/hal/hal/hal.c b/reactos/hal/hal/hal.c
deleted file mode 100644 (file)
index cb255fc..0000000
+++ /dev/null
@@ -1,1109 +0,0 @@
-/*
- * COPYRIGHT:        See COPYING in the top level directory
- * PROJECT:          ReactOS kernel
- * FILE:             hal/hal.c
- * PURPOSE:          Hardware Abstraction Layer DLL
- * PROGRAMMER:       Casper S. Hornstrup (chorns@users.sourceforge.net)
- * REVISION HISTORY:
- *    01-08-2001 CSH Created
- */
-
-/* INCLUDES ******************************************************************/
-
-#include <ntddk.h>
-#include <ntdddisk.h>
-#include <arc/arc.h>
-#include <intrin.h>
-#include <ndk/halfuncs.h>
-#include <ndk/iofuncs.h>
-#include <ndk/kdfuncs.h>
-
-#define NDEBUG
-#include <debug.h>
-
-#undef ExAcquireFastMutex
-#undef ExReleaseFastMutex
-#undef ExTryToAcquireFastMutex
-
-/* DATA **********************************************************************/
-
-PUCHAR KdComPortInUse;
-
-/* FUNCTIONS *****************************************************************/
-
-NTSTATUS
-NTAPI
-DriverEntry(
-  PDRIVER_OBJECT DriverObject,
-  PUNICODE_STRING RegistryPath)
-{
-  UNIMPLEMENTED;
-
-  return STATUS_SUCCESS;
-}
-
-/*
-* @unimplemented
-*/
-VOID
-NTAPI
-HalStopProfileInterrupt(IN KPROFILE_SOURCE ProfileSource)
-{
-    ASSERT(FALSE);
-    return;
-}
-
-/*
-* @unimplemented
-*/
-VOID
-NTAPI
-HalStartProfileInterrupt(IN KPROFILE_SOURCE ProfileSource)
-{
-    ASSERT(FALSE);
-    return;
-}
-
-/*
-* @unimplemented
-*/
-ULONG_PTR
-NTAPI
-HalSetProfileInterval(IN ULONG_PTR Interval)
-{
-    ASSERT(FALSE);
-    return Interval;
-}
-
-#ifndef _M_AMD64
-VOID
-FASTCALL
-ExAcquireFastMutex(
-  PFAST_MUTEX FastMutex)
-{
-  UNIMPLEMENTED;
-}
-
-
-VOID
-FASTCALL
-ExReleaseFastMutex(
-  PFAST_MUTEX FastMutex)
-{
-  UNIMPLEMENTED;
-}
-
-
-BOOLEAN FASTCALL
-ExTryToAcquireFastMutex(
-  PFAST_MUTEX FastMutex)
-{
-  UNIMPLEMENTED;
-
-  return TRUE;
-}
-#endif
-
-VOID
-NTAPI
-HalAcquireDisplayOwnership(
-  PHAL_RESET_DISPLAY_PARAMETERS ResetDisplayParameters)
-{
-  UNIMPLEMENTED;
-}
-
-
-NTSTATUS
-NTAPI
-HalAdjustResourceList(
-  PCM_RESOURCE_LIST Resources)
-{
-  UNIMPLEMENTED;
-
-  return STATUS_SUCCESS;
-}
-
-
-BOOLEAN
-NTAPI
-HalAllProcessorsStarted(VOID)
-{
-  UNIMPLEMENTED;
-
-  return TRUE;
-}
-
-
-NTSTATUS
-NTAPI
-HalAllocateAdapterChannel(
-  PADAPTER_OBJECT AdapterObject,
-  PWAIT_CONTEXT_BLOCK WaitContextBlock,
-  ULONG NumberOfMapRegisters,
-  PDRIVER_CONTROL ExecutionRoutine)
-{
-  UNIMPLEMENTED;
-
-  return STATUS_SUCCESS;
-}
-
-
-PVOID
-NTAPI
-HalAllocateCommonBuffer(
-  PADAPTER_OBJECT AdapterObject,
-  ULONG Length,
-  PPHYSICAL_ADDRESS LogicalAddress,
-  BOOLEAN CacheEnabled)
-{
-  UNIMPLEMENTED;
-
-  return NULL;
-}
-
-
-PVOID
-NTAPI
-HalAllocateCrashDumpRegisters(
-  PADAPTER_OBJECT AdapterObject,
-  PULONG NumberOfMapRegisters)
-{
-  UNIMPLEMENTED;
-  return NULL;
-}
-
-
-NTSTATUS
-NTAPI
-HalAssignSlotResources(
-  PUNICODE_STRING RegistryPath,
-  PUNICODE_STRING DriverClassName,
-  PDRIVER_OBJECT DriverObject,
-  PDEVICE_OBJECT DeviceObject,
-  INTERFACE_TYPE BusType,
-  ULONG BusNumber,
-  ULONG SlotNumber,
-  PCM_RESOURCE_LIST *AllocatedResources)
-{
-  UNIMPLEMENTED;
-
-  return TRUE;
-}
-
-
-BOOLEAN
-NTAPI
-HalBeginSystemInterrupt (KIRQL Irql,
-                        ULONG Vector,
-                        PKIRQL OldIrql)
-{
-  UNIMPLEMENTED;
-
-  return TRUE;
-}
-
-
-VOID
-NTAPI
-HalCalibratePerformanceCounter(
-  volatile LONG *Count,
-  ULONGLONG NewCount)
-{
-  UNIMPLEMENTED;
-}
-
-
-VOID
-NTAPI
-HalDisableSystemInterrupt(ULONG Vector,
-                          KIRQL Irql)
-{
-    UNIMPLEMENTED;
-}
-
-
-VOID
-NTAPI
-HalDisplayString(
-  PCH String)
-{
-  UNIMPLEMENTED;
-}
-
-
-BOOLEAN
-NTAPI
-HalEnableSystemInterrupt(
-  ULONG Vector,
-  KIRQL Irql,
-  KINTERRUPT_MODE InterruptMode)
-{
-  UNIMPLEMENTED;
-
-  return TRUE;
-}
-
-
-VOID
-NTAPI
-HalEndSystemInterrupt(
-  KIRQL Irql,
-  ULONG Unknown2)
-{
-  UNIMPLEMENTED;
-}
-
-
-BOOLEAN
-NTAPI
-HalFlushCommonBuffer(
-  ULONG Unknown1,
-  ULONG Unknown2,
-  ULONG Unknown3,
-  ULONG Unknown4,
-  ULONG Unknown5)
-{
-  UNIMPLEMENTED;
-
-   return TRUE;
-}
-
-
-VOID
-NTAPI
-HalFreeCommonBuffer(
-  PADAPTER_OBJECT AdapterObject,
-  ULONG Length,
-  PHYSICAL_ADDRESS LogicalAddress,
-  PVOID VirtualAddress,
-  BOOLEAN CacheEnabled)
-{
-  UNIMPLEMENTED;
-}
-
-
-PADAPTER_OBJECT
-NTAPI
-HalGetAdapter(
-  PDEVICE_DESCRIPTION DeviceDescription,
-  PULONG NumberOfMapRegisters)
-{
-  UNIMPLEMENTED;
-
-  return (PADAPTER_OBJECT)NULL;
-}
-
-
-ULONG
-NTAPI
-HalGetBusData(
-  BUS_DATA_TYPE BusDataType,
-  ULONG BusNumber,
-  ULONG SlotNumber,
-  PVOID Buffer,
-  ULONG Length)
-{
-  UNIMPLEMENTED;
-
-  return 0;
-}
-
-
-ULONG
-NTAPI
-HalGetBusDataByOffset(
-  BUS_DATA_TYPE BusDataType,
-  ULONG BusNumber,
-  ULONG SlotNumber,
-  PVOID Buffer,
-  ULONG Offset,
-  ULONG Length)
-{
-  UNIMPLEMENTED;
-
-  return 0;
-}
-
-
-ARC_STATUS
-NTAPI
-HalGetEnvironmentVariable(
-  PCH Name,
-  USHORT ValueLength,
-  PCH Value)
-{
-  UNIMPLEMENTED;
-
-  return ENOENT;
-}
-
-
-ULONG
-NTAPI
-HalGetInterruptVector(
-  INTERFACE_TYPE InterfaceType,
-  ULONG BusNumber,
-  ULONG BusInterruptLevel,
-  ULONG BusInterruptVector,
-  PKIRQL Irql,
-  PKAFFINITY Affinity)
-{
-  UNIMPLEMENTED;
-
-  return 0;
-}
-
-
-VOID
-NTAPI
-HalHandleNMI(
-  PVOID NmiData)
-{
-  UNIMPLEMENTED;
-}
-
-
-BOOLEAN
-NTAPI
-HalInitSystem(
-  ULONG BootPhase,
-  PLOADER_PARAMETER_BLOCK LoaderBlock)
-{
-  UNIMPLEMENTED;
-
-  return TRUE;
-}
-
-
-VOID
-NTAPI
-HalInitializeProcessor(ULONG ProcessorNumber,
-                       PLOADER_PARAMETER_BLOCK LoaderBlock)
-{
-  UNIMPLEMENTED;
-}
-
-
-BOOLEAN
-NTAPI
-HalMakeBeep(
-  ULONG Frequency)
-{
-  UNIMPLEMENTED;
-
-  return TRUE;
-}
-
-
-VOID
-NTAPI
-HalProcessorIdle(VOID)
-{
-  UNIMPLEMENTED;
-}
-
-
-BOOLEAN
-NTAPI
-HalQueryDisplayOwnership(VOID)
-{
-  UNIMPLEMENTED;
-
-  return FALSE;
-}
-
-
-VOID
-NTAPI
-HalQueryDisplayParameters(
-  OUT PULONG DispSizeX,
-  OUT PULONG DispSizeY,
-  OUT PULONG CursorPosX,
-  OUT PULONG CursorPosY)
-{
-  UNIMPLEMENTED;
-}
-
-
-BOOLEAN
-NTAPI
-HalQueryRealTimeClock(
-  PTIME_FIELDS Time)
-{
-  UNIMPLEMENTED;
-  return FALSE;
-}
-
-
-ULONG
-NTAPI
-HalReadDmaCounter(
-  PADAPTER_OBJECT AdapterObject)
-{
-  UNIMPLEMENTED;
-
-  return 0;
-}
-
-
-VOID
-NTAPI
-HalReleaseDisplayOwnership(VOID)
-{
-  UNIMPLEMENTED;
-}
-
-VOID
-NTAPI
-HalReportResourceUsage(VOID)
-{
-  UNIMPLEMENTED;
-}
-
-
-VOID
-NTAPI
-HalRequestIpi(
-    KAFFINITY TargetSet)
-{
-  UNIMPLEMENTED;
-}
-
-
-VOID
-FASTCALL
-HalRequestSoftwareInterrupt(
-  KIRQL Request)
-{
-  UNIMPLEMENTED;
-}
-
-VOID FASTCALL
-HalClearSoftwareInterrupt(
-  IN KIRQL Request)
-{
-  UNIMPLEMENTED;
-}
-
-
-VOID
-NTAPI
-HalReturnToFirmware(
-  FIRMWARE_REENTRY Action)
-{
-  UNIMPLEMENTED;
-}
-
-
-ULONG
-NTAPI
-HalSetBusData(
-  BUS_DATA_TYPE BusDataType,
-  ULONG BusNumber,
-  ULONG SlotNumber,
-  PVOID Buffer,
-  ULONG Length)
-{
-  UNIMPLEMENTED;
-
-  return 0;
-}
-
-
-ULONG
-NTAPI
-HalSetBusDataByOffset(
-  BUS_DATA_TYPE BusDataType,
-  ULONG BusNumber,
-  ULONG SlotNumber,
-  PVOID Buffer,
-  ULONG Offset,
-  ULONG Length)
-{
-  UNIMPLEMENTED;
-
-  return 0;
-}
-
-
-VOID
-NTAPI
-HalSetDisplayParameters(
-  ULONG CursorPosX,
-  ULONG CursorPosY)
-{
-  UNIMPLEMENTED;
-}
-
-
-ARC_STATUS
-NTAPI
-HalSetEnvironmentVariable(
-  PCH Name,
-  PCH Value)
-{
-  UNIMPLEMENTED;
-
-  return ESUCCESS;
-}
-
-
-BOOLEAN
-NTAPI
-HalSetRealTimeClock(
-  PTIME_FIELDS Time)
-{
-  UNIMPLEMENTED;
-
-  return TRUE;
-}
-
-
-ULONG
-NTAPI
-HalSetTimeIncrement(
-  ULONG Increment)
-{
-  UNIMPLEMENTED;
-
-  return Increment;
-}
-
-
-BOOLEAN
-NTAPI
-HalStartNextProcessor(IN PLOADER_PARAMETER_BLOCK LoaderBlock,
-                      IN PKPROCESSOR_STATE ProcessorState)
-{
-  UNIMPLEMENTED;
-
-  return TRUE;
-}
-
-
-UCHAR
-FASTCALL
-HalSystemVectorDispatchEntry(IN ULONG Vector,
-                             OUT PKINTERRUPT_ROUTINE **FlatDispatch,
-                             OUT PKINTERRUPT_ROUTINE *NoConnection)
-{
-  UNIMPLEMENTED;
-  return 0;
-}
-
-
-BOOLEAN
-NTAPI
-HalTranslateBusAddress(
-  INTERFACE_TYPE InterfaceType,
-  ULONG BusNumber,
-  PHYSICAL_ADDRESS BusAddress,
-  PULONG AddressSpace,
-  PPHYSICAL_ADDRESS TranslatedAddress)
-{
-  UNIMPLEMENTED;
-
-  return TRUE;
-}
-
-#ifndef _M_ARM
-VOID
-NTAPI
-HalpAssignDriveLetters(IN struct _LOADER_PARAMETER_BLOCK *LoaderBlock,
-                       IN PSTRING NtDeviceName,
-                       OUT PUCHAR NtSystemPath,
-                       OUT PSTRING NtSystemPathString)
-{
-    /* Call the kernel */
-    IoAssignDriveLetters(LoaderBlock,
-                                NtDeviceName,
-                                NtSystemPath,
-                                NtSystemPathString);
-}
-
-NTSTATUS
-NTAPI
-HalpReadPartitionTable(IN PDEVICE_OBJECT DeviceObject,
-                       IN ULONG SectorSize,
-                       IN BOOLEAN ReturnRecognizedPartitions,
-                       IN OUT PDRIVE_LAYOUT_INFORMATION *PartitionBuffer)
-{
-    /* Call the kernel */
-    return IoReadPartitionTable(DeviceObject,
-                                SectorSize,
-                                ReturnRecognizedPartitions,
-                                PartitionBuffer);
-}
-
-NTSTATUS
-NTAPI
-HalpWritePartitionTable(IN PDEVICE_OBJECT DeviceObject,
-                        IN ULONG SectorSize,
-                        IN ULONG SectorsPerTrack,
-                        IN ULONG NumberOfHeads,
-                        IN PDRIVE_LAYOUT_INFORMATION PartitionBuffer)
-{
-    /* Call the kernel */
-    return IoWritePartitionTable(DeviceObject,
-                                 SectorSize,
-                                 SectorsPerTrack,
-                                 NumberOfHeads,
-                                 PartitionBuffer);
-}
-
-NTSTATUS
-NTAPI
-HalpSetPartitionInformation(IN PDEVICE_OBJECT DeviceObject,
-                            IN ULONG SectorSize,
-                            IN ULONG PartitionNumber,
-                            IN ULONG PartitionType)
-{
-    /* Call the kernel */
-    return IoSetPartitionInformation(DeviceObject,
-                                     SectorSize,
-                                     PartitionNumber,
-                                     PartitionType);
-}
-#endif
-
-BOOLEAN
-NTAPI
-IoFlushAdapterBuffers(
-  PADAPTER_OBJECT AdapterObject,
-  PMDL Mdl,
-  PVOID MapRegisterBase,
-  PVOID CurrentVa,
-  ULONG Length,
-  BOOLEAN WriteToDevice)
-{
-  UNIMPLEMENTED;
-
-  return TRUE;
-}
-
-
-VOID
-NTAPI
-IoFreeAdapterChannel(
-  PADAPTER_OBJECT AdapterObject)
-{
-  UNIMPLEMENTED;
-}
-
-
-VOID
-NTAPI
-IoFreeMapRegisters(
-  PADAPTER_OBJECT AdapterObject,
-  PVOID MapRegisterBase,
-  ULONG NumberOfMapRegisters)
-{
-  UNIMPLEMENTED;
-}
-
-
-PHYSICAL_ADDRESS
-NTAPI
-IoMapTransfer(
-  PADAPTER_OBJECT AdapterObject,
-  PMDL Mdl,
-  PVOID MapRegisterBase,
-  PVOID CurrentVa,
-  PULONG Length,
-  BOOLEAN WriteToDevice)
-{
-  PHYSICAL_ADDRESS Address;
-
-  UNIMPLEMENTED;
-
-  Address.QuadPart = 0;
-
-  return Address;
-}
-
-
-#undef KeAcquireSpinLock
-VOID
-NTAPI
-KeAcquireSpinLock(
-  PKSPIN_LOCK SpinLock,
-  PKIRQL OldIrql)
-{
-  UNIMPLEMENTED;
-}
-
-
-KIRQL
-FASTCALL
-KeAcquireSpinLockRaiseToSynch(
-  PKSPIN_LOCK SpinLock)
-{
-  UNIMPLEMENTED;
-
-  return 0;
-}
-
-#ifndef _M_AMD64
-VOID
-FASTCALL
-KeAcquireInStackQueuedSpinLock(
-    IN PKSPIN_LOCK SpinLock,
-    IN PKLOCK_QUEUE_HANDLE LockHandle
-    )
-{
-  UNIMPLEMENTED;
-}
-
-VOID
-FASTCALL
-KeAcquireInStackQueuedSpinLockRaiseToSynch(
-    IN PKSPIN_LOCK SpinLock,
-    IN PKLOCK_QUEUE_HANDLE LockHandle
-    )
-{
-   UNIMPLEMENTED;
-}
-
-VOID
-FASTCALL
-KeReleaseInStackQueuedSpinLock(
-    IN PKLOCK_QUEUE_HANDLE LockHandle
-    )
-{
-  UNIMPLEMENTED;
-}
-#endif
-
-VOID
-NTAPI
-KeFlushWriteBuffer(VOID)
-{
-  UNIMPLEMENTED;
-}
-
-#ifndef _M_AMD64
-#undef KeGetCurrentIrql
-KIRQL
-NTAPI
-KeGetCurrentIrql(VOID)
-{
-  UNIMPLEMENTED;
-
-  return (KIRQL)0;
-}
-
-#undef KeLowerIrql
-VOID
-NTAPI
-KeLowerIrql(
-  KIRQL NewIrql)
-{
-  UNIMPLEMENTED;
-}
-#endif
-
-
-LARGE_INTEGER
-NTAPI
-KeQueryPerformanceCounter(
-  PLARGE_INTEGER PerformanceFreq)
-{
-  LARGE_INTEGER Value;
-
-  UNIMPLEMENTED;
-
-  Value.QuadPart = 0;
-
-  return Value;
-}
-
-#ifndef _M_AMD64
-#undef KeRaiseIrql
-VOID
-NTAPI
-KeRaiseIrql(
-  KIRQL NewIrql,
-  PKIRQL OldIrql)
-{
-  UNIMPLEMENTED;
-}
-
-
-KIRQL
-NTAPI
-KeRaiseIrqlToDpcLevel(VOID)
-{
-  UNIMPLEMENTED;
-
-  return (KIRQL)0;
-}
-
-
-KIRQL
-NTAPI
-KeRaiseIrqlToSynchLevel(VOID)
-{
-  UNIMPLEMENTED;
-
-  return (KIRQL)0;
-}
-#endif
-
-#ifndef _M_AMD64
-#undef KeReleaseSpinLock
-VOID
-NTAPI
-KeReleaseSpinLock(
-  PKSPIN_LOCK SpinLock,
-  KIRQL NewIrql)
-{
-  UNIMPLEMENTED;
-}
-#endif
-
-VOID
-NTAPI
-KeStallExecutionProcessor(
-  ULONG Microseconds)
-{
-  UNIMPLEMENTED;
-}
-
-
-LOGICAL
-FASTCALL
-KeTryToAcquireQueuedSpinLock(
-  KSPIN_LOCK_QUEUE_NUMBER LockNumber,
-  PKIRQL OldIrql)
-{
-  UNIMPLEMENTED;
-
-  return FALSE;
-}
-
-
-BOOLEAN
-FASTCALL
-KeTryToAcquireQueuedSpinLockRaiseToSynch(
-  KSPIN_LOCK_QUEUE_NUMBER LockNumber,
-  PKIRQL OldIrql)
-{
-  UNIMPLEMENTED;
-
-  return FALSE;
-}
-
-#if !defined(_M_AMD64)
-KIRQL
-FASTCALL
-KfAcquireSpinLock(
-  PKSPIN_LOCK SpinLock)
-{
-  UNIMPLEMENTED;
-
-  return (KIRQL)0;
-}
-
-
-VOID
-FASTCALL
-KfLowerIrql(
-  KIRQL NewIrql)
-{
-  UNIMPLEMENTED;
-}
-
-
-KIRQL
-FASTCALL
-KfRaiseIrql(
-  KIRQL NewIrql)
-{
-  UNIMPLEMENTED;
-
-  return (KIRQL)0;
-}
-
-
-VOID
-FASTCALL
-KfReleaseSpinLock(
-  PKSPIN_LOCK SpinLock,
-  KIRQL NewIrql)
-{
-  UNIMPLEMENTED;
-}
-#endif
-
-#if !defined(_M_AMD64)
-VOID
-NTAPI
-READ_PORT_BUFFER_UCHAR(
-  PUCHAR Port,
-  PUCHAR Buffer,
-  ULONG Count)
-{
-  UNIMPLEMENTED;
-}
-
-
-VOID
-NTAPI
-READ_PORT_BUFFER_ULONG(
-  PULONG Port,
-  PULONG Buffer,
-  ULONG Count)
-{
-  UNIMPLEMENTED;
-}
-
-
-VOID
-NTAPI
-READ_PORT_BUFFER_USHORT(
-  PUSHORT Port,
-  PUSHORT Buffer,
-  ULONG Count)
-{
-  UNIMPLEMENTED;
-}
-
-
-UCHAR
-NTAPI
-READ_PORT_UCHAR(
-  PUCHAR Port)
-{
-  UNIMPLEMENTED;
-
-  return 0;
-}
-
-
-ULONG
-NTAPI
-READ_PORT_ULONG(
-  PULONG Port)
-{
-  UNIMPLEMENTED;
-
-  return 0;
-}
-
-
-USHORT
-NTAPI
-READ_PORT_USHORT(
-  PUSHORT Port)
-{
-  UNIMPLEMENTED;
-
-  return 0;
-}
-
-
-VOID
-NTAPI
-WRITE_PORT_BUFFER_UCHAR(
-  PUCHAR Port,
-  PUCHAR Buffer,
-  ULONG Count)
-{
-  UNIMPLEMENTED;
-}
-
-
-VOID
-NTAPI
-WRITE_PORT_BUFFER_USHORT(
-  PUSHORT Port,
-  PUSHORT Buffer,
-  ULONG Count)
-{
-  UNIMPLEMENTED;
-}
-
-
-VOID
-NTAPI
-WRITE_PORT_BUFFER_ULONG(
-  PULONG Port,
-  PULONG Buffer,
-  ULONG Count)
-{
-  UNIMPLEMENTED;
-}
-
-
-VOID
-NTAPI
-WRITE_PORT_UCHAR(
-  PUCHAR Port,
-  UCHAR Value)
-{
-  UNIMPLEMENTED;
-}
-
-VOID
-NTAPI
-WRITE_PORT_ULONG(
-  PULONG Port,
-  ULONG Value)
-{
-  UNIMPLEMENTED;
-}
-
-VOID
-NTAPI
-WRITE_PORT_USHORT(
-  PUSHORT Port,
-  USHORT Value)
-{
-  UNIMPLEMENTED;
-}
-#endif
-
-KIRQL
-FASTCALL
-KeAcquireQueuedSpinLock(IN PKLOCK_QUEUE_HANDLE LockHandle)
-{
-  UNIMPLEMENTED;
-  return (KIRQL)0;
-}
-
-KIRQL
-FASTCALL
-KeAcquireQueuedSpinLockRaiseToSynch(IN PKLOCK_QUEUE_HANDLE LockHandle)
-{
-    UNIMPLEMENTED;
-    return (KIRQL)0;
-}
-
-VOID
-FASTCALL
-KeReleaseQueuedSpinLock(IN PKLOCK_QUEUE_HANDLE LockHandle,
-                        IN KIRQL OldIrql)
-{
-  UNIMPLEMENTED;
-}
-
-VOID
-HalSweepDcache(VOID)
-{
-  UNIMPLEMENTED;
-}
-
-VOID
-HalSweepIcache(VOID)
-{
-    UNIMPLEMENTED;
-}
-
-ULONG
-HalGetInterruptSource(VOID)
-{
-    UNIMPLEMENTED;
-    return 0;
-}
-
-/* EOF */
diff --git a/reactos/hal/hal/hal.pspec b/reactos/hal/hal/hal.pspec
deleted file mode 100644 (file)
index 0a191be..0000000
+++ /dev/null
@@ -1,109 +0,0 @@
-#include "include/reactos/msvctarget.h"
-
-#ifdef _M_ARM
-@ fastcall ExAcquireFastMutex(ptr)
-@ fastcall ExReleaseFastMutex(ptr)
-#else
-@ fastcall ExAcquireFastMutex(ptr) ExiAcquireFastMutex
-@ fastcall ExReleaseFastMutex(ptr) ExiReleaseFastMutex
-#endif
-@ fastcall ExTryToAcquireFastMutex(ptr) ExiTryToAcquireFastMutex
-@ fastcall HalClearSoftwareInterrupt(long)
-@ fastcall HalRequestSoftwareInterrupt(long)
-@ fastcall HalSystemVectorDispatchEntry(long long long)
-@ fastcall KeAcquireInStackQueuedSpinLock(ptr ptr)
-@ fastcall KeAcquireInStackQueuedSpinLockRaiseToSynch(ptr ptr)
-@ fastcall KeAcquireSpinLockRaiseToSynch(ptr)
-@ fastcall KeAcquireQueuedSpinLock(ptr)
-@ fastcall KeAcquireQueuedSpinLockRaiseToSynch(ptr)
-@ fastcall KeReleaseInStackQueuedSpinLock(ptr)
-@ fastcall KeReleaseQueuedSpinLock(ptr long)
-@ fastcall KeTryToAcquireQueuedSpinLock(long ptr)
-@ fastcall KeTryToAcquireQueuedSpinLockRaiseToSynch(long ptr)
-@ fastcall KfAcquireSpinLock(ptr)
-@ fastcall KfLowerIrql(long)
-@ fastcall KfRaiseIrql(long)
-@ fastcall KfReleaseSpinLock(ptr long)
-
-@ stdcall HalAcquireDisplayOwnership(ptr)
-@ stdcall HalAdjustResourceList(ptr)
-@ stdcall HalAllProcessorsStarted()
-@ stdcall HalAllocateAdapterChannel(ptr ptr long ptr)
-@ stdcall HalAllocateCommonBuffer(ptr long ptr long)
-@ stdcall HalAllocateCrashDumpRegisters(ptr ptr)
-@ stdcall HalAssignSlotResources(ptr ptr ptr ptr long long long ptr)
-@ stdcall HalBeginSystemInterrupt(long long ptr)
-@ stdcall HalCalibratePerformanceCounter(ptr long long)
-@ stdcall HalDisableSystemInterrupt(long long)
-@ stdcall HalDisplayString(str)
-@ stdcall HalEnableSystemInterrupt(long long long)
-@ stdcall HalEndSystemInterrupt(long long)
-@ stdcall HalFlushCommonBuffer(long long long long long)
-@ stdcall HalFreeCommonBuffer(ptr long long long ptr long)
-@ stdcall HalGetAdapter(ptr ptr)
-@ stdcall HalGetBusData(long long long ptr long)
-@ stdcall HalGetBusDataByOffset(long long long ptr long long)
-@ stdcall HalGetEnvironmentVariable(str long str)
-#ifdef _M_ARM
-@ fastcall HalGetInterruptSource()
-#endif
-@ stdcall HalGetInterruptVector(long long long long ptr ptr)
-@ stdcall HalHandleNMI(ptr)
-@ stdcall HalInitSystem(long ptr)
-@ stdcall HalInitializeProcessor(long ptr)
-@ stdcall HalMakeBeep(long)
-@ stdcall HalProcessorIdle()
-@ stdcall HalQueryDisplayParameters(ptr ptr ptr ptr)
-@ stdcall HalQueryRealTimeClock(ptr)
-@ stdcall HalReadDmaCounter(ptr)
-@ stdcall HalReportResourceUsage()
-@ stdcall HalRequestIpi(long)
-@ stdcall HalReturnToFirmware(long)
-@ stdcall HalSetBusData(long long long ptr long)
-@ stdcall HalSetBusDataByOffset(long long long ptr long long)
-@ stdcall HalSetDisplayParameters(long long)
-@ stdcall HalSetEnvironmentVariable(str str)
-@ stdcall HalSetProfileInterval(long)
-@ stdcall HalSetRealTimeClock(ptr)
-@ stdcall HalSetTimeIncrement(long)
-@ stdcall HalStartNextProcessor(ptr ptr)
-@ stdcall HalStartProfileInterrupt(long)
-@ stdcall HalStopProfileInterrupt(long)
-#ifdef _M_ARM
-@ fastcall HalSweepIcache()
-@ fastcall HalSweepDcache()
-#endif
-@ stdcall HalTranslateBusAddress(long long long long ptr ptr)
-@ stdcall IoFlushAdapterBuffers(ptr ptr ptr ptr long long)
-@ stdcall IoFreeAdapterChannel(ptr)
-@ stdcall IoFreeMapRegisters(ptr ptr long)
-@ stdcall IoMapTransfer(ptr ptr ptr ptr ptr long)
-#ifndef _M_ARM
-@ stdcall IoAssignDriveLetters(ptr str ptr ptr) HalpAssignDriveLetters
-@ stdcall IoReadPartitionTable(ptr long long ptr) HalpReadPartitionTable
-@ stdcall IoSetPartitionInformation(ptr long long long) HalpSetPartitionInformation
-@ stdcall IoWritePartitionTable(ptr long long long ptr) HalpWritePartitionTable
-#endif
-@ stdcall KeAcquireSpinLock(ptr ptr)
-@ extern KdComPortInUse
-@ stdcall KeFlushWriteBuffer()
-@ stdcall KeGetCurrentIrql()
-@ stdcall KeLowerIrql(long)
-@ stdcall KeQueryPerformanceCounter(ptr)
-@ stdcall KeRaiseIrql(long ptr)
-@ stdcall KeRaiseIrqlToDpcLevel()
-@ stdcall KeRaiseIrqlToSynchLevel()
-@ stdcall KeReleaseSpinLock(ptr long)
-@ stdcall KeStallExecutionProcessor(long)
-@ stdcall READ_PORT_BUFFER_UCHAR(ptr ptr long)
-@ stdcall READ_PORT_BUFFER_ULONG(ptr ptr long)
-@ stdcall READ_PORT_BUFFER_USHORT(ptr ptr long)
-@ stdcall READ_PORT_UCHAR(ptr)
-@ stdcall READ_PORT_ULONG(ptr)
-@ stdcall READ_PORT_USHORT(ptr)
-@ stdcall WRITE_PORT_BUFFER_UCHAR(ptr ptr long)
-@ stdcall WRITE_PORT_BUFFER_ULONG(ptr ptr long)
-@ stdcall WRITE_PORT_BUFFER_USHORT(ptr ptr long)
-@ stdcall WRITE_PORT_UCHAR(ptr long)
-@ stdcall WRITE_PORT_ULONG(ptr long)
-@ stdcall WRITE_PORT_USHORT(ptr long)
diff --git a/reactos/hal/hal/hal.rbuild b/reactos/hal/hal/hal.rbuild
deleted file mode 100644 (file)
index d89871d..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd">
-<group>
-       <if property="ARCH" value="arm">
-       <module name="hal" type="kernelmodedll">
-               <importlibrary definition="hal.pspec" />
-               <include base="ntoskrnl">include</include>
-               <library>ntoskrnl</library>
-               <define name="_NTHAL_" />
-               <file>hal.c</file>
-               <file>hal.rc</file>
-       </module>
-       </if>
-       <if property="ARCH" value="i386">
-       <module name="hal" type="kernelmodedll">
-               <importlibrary definition="hal.pspec" />
-               <include base="ntoskrnl">include</include>
-               <library>ntoskrnl</library>
-               <define name="_NTHAL_" />
-               <file>hal.c</file>
-               <file>hal.rc</file>
-       </module>
-       </if>
-       <if property="ARCH" value="i386">
-               <module ifnot="false" name="halupalias" type="alias" installbase="system32" installname="hal.dll" aliasof="halup">
-               </module>
-               <module if="false" name="halmpalias" type="alias" installbase="system32" installname="hal.dll" aliasof="halmp">
-               </module>
-       </if>
-       <if property="ARCH" value="powerpc">
-               <module name="halupalias" type="alias" installbase="system32" installname="hal.dll" aliasof="halppc_up"/>
-       </if>
-       <if property="ARCH" value="amd64">
-       <module name="hal" type="kernelmodedll">
-               <importlibrary definition="hal_amd64.def" />
-               <include base="ntoskrnl">include</include>
-               <library>ntoskrnl</library>
-               <define name="_NTHAL_" />
-               <file>hal.c</file>
-               <file>hal.rc</file>
-       </module>
-       </if>
-</group>
diff --git a/reactos/hal/hal/hal.rc b/reactos/hal/hal/hal.rc
deleted file mode 100644 (file)
index da2e5db..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-#define REACTOS_VERSION_DLL
-#define REACTOS_STR_FILE_DESCRIPTION   "Template Hardware Abstraction Layer\0"
-#define REACTOS_STR_INTERNAL_NAME      "hal\0"
-#define REACTOS_STR_ORIGINAL_FILENAME  "hal.dll\0"
-#include <reactos/version.rc>
diff --git a/reactos/hal/hal/hal_amd64.def b/reactos/hal/hal/hal_amd64.def
deleted file mode 100644 (file)
index 1d8fa78..0000000
+++ /dev/null
@@ -1,86 +0,0 @@
-; Hardware Abstraction Layer - ReactOS Operating System
-
-LIBRARY hal.dll
-
-EXPORTS
-HalAcquireDisplayOwnership
-HalAdjustResourceList
-HalAllProcessorsStarted
-HalAllocateAdapterChannel
-HalAllocateCommonBuffer
-HalAllocateCrashDumpRegisters
-HalAssignSlotResources
-;HalBugCheckSystem
-HalCalibratePerformanceCounter
-HalClearSoftwareInterrupt
-;HalConvertDeviceIdtToIrql
-;HalDisableInterrupt
-HalDisplayString
-;HalEnableInterrupt
-;HalEnumerateEnvironmentVariablesEx
-;HalEnumerateProcessors
-HalFlushCommonBuffer
-HalFreeCommonBuffer
-HalGetAdapter
-HalGetBusData
-HalGetBusDataByOffset
-HalGetEnvironmentVariable
-;HalGetEnvironmentVariableEx
-;HalGetInterruptTargetInformation
-HalGetInterruptVector
-;HalGetMessageRoutingInfo
-;HalGetProcessorIdByNtNumber
-;HalGetVectorInput
-;HalHandleMcheck
-HalHandleNMI
-HalInitSystem
-;HalInitializeBios
-;HalInitializeOnResume
-HalInitializeProcessor
-;HalIsHyperThreadingEnabled
-HalMakeBeep
-HalProcessorIdle
-HalQueryDisplayParameters
-;HalQueryEnvironmentVariableInfoEx
-;HalQueryMaximumProcessorCount
-HalQueryRealTimeClock
-HalReadDmaCounter
-;HalRegisterDynamicProcessor
-;HalRegisterErrataCallbacks
-HalReportResourceUsage
-HalRequestIpi
-HalRequestSoftwareInterrupt
-HalReturnToFirmware
-;HalSendNMI
-;HalSendSoftwareInterrupt
-HalSetBusData
-HalSetBusDataByOffset
-HalSetDisplayParameters
-HalSetEnvironmentVariable
-;HalSetEnvironmentVariableEx
-HalSetProfileInterval
-HalSetRealTimeClock
-HalSetTimeIncrement
-;HalStartDynamicProcessor
-HalStartNextProcessor
-HalStartProfileInterrupt
-HalStopProfileInterrupt
-HalSystemVectorDispatchEntry
-HalTranslateBusAddress
-IoAssignDriveLetters
-IoFlushAdapterBuffers
-IoFreeAdapterChannel
-IoFreeMapRegisters
-IoMapTransfer
-IoReadPartitionTable
-IoSetPartitionInformation
-IoWritePartitionTable
-KdComPortInUse=_KdComPortInUse DATA
-KeFlushWriteBuffer
-KeQueryPerformanceCounter
-KeStallExecutionProcessor
-;x86BiosAllocateBuffer
-;x86BiosCall
-;x86BiosFreeBuffer
-;x86BiosReadMemory
-;x86BiosWriteMemory
diff --git a/reactos/hal/halamd64/directory.rbuild b/reactos/hal/halamd64/directory.rbuild
deleted file mode 100644 (file)
index 1e0c730..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd">
-<group xmlns:xi="http://www.w3.org/2001/XInclude">
-       <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/generic/generic.rbuild b/reactos/hal/halamd64/generic/generic.rbuild
deleted file mode 100644 (file)
index 8eb4d95..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<group>
-       <module name="hal_generic" type="objectlibrary">
-               <include base="hal_generic">../include</include>
-               <include base="ntoskrnl">include</include>
-               <define name="_NTHAL_" />
-               <file>halinit.c</file>
-               <file>irq.S</file>
-               <file>misc.c</file>
-               <file>mps.S</file>
-               <file>systimer.S</file>
-               <pch>../include/hal.h</pch>
-       </module>
-</group>
diff --git a/reactos/hal/halamd64/generic/halinit.c b/reactos/hal/halamd64/generic/halinit.c
deleted file mode 100644 (file)
index d3d834b..0000000
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
- * PROJECT:         ReactOS HAL
- * LICENSE:         GPL - See COPYING in the top level directory
- * FILE:            hal/halx86/generic/halinit.c
- * PURPOSE:         HAL Entrypoint and Initialization
- * PROGRAMMERS:     Alex Ionescu (alex.ionescu@reactos.org)
- */
-
-/* INCLUDES ******************************************************************/
-
-#include <hal.h>
-#define NDEBUG
-#include <debug.h>
-
-/* GLOBALS *******************************************************************/
-
-BOOLEAN HalpPciLockSettings;
-
-/* PRIVATE FUNCTIONS *********************************************************/
-
-VOID
-NTAPI
-HalpGetParameters(IN PLOADER_PARAMETER_BLOCK LoaderBlock)
-{
-    PCHAR CommandLine;
-
-    /* Make sure we have a loader block and command line */
-    if ((LoaderBlock) && (LoaderBlock->LoadOptions))
-    {
-        /* Read the command line */
-        CommandLine = LoaderBlock->LoadOptions;
-
-        /* Check if PCI is locked */
-        if (strstr(CommandLine, "PCILOCK")) HalpPciLockSettings = TRUE;
-
-        /* Check for initial breakpoint */
-        if (strstr(CommandLine, "BREAK")) DbgBreakPoint();
-    }
-}
-
-/* FUNCTIONS *****************************************************************/
-
-NTSTATUS
-NTAPI
-DriverEntry(
-  PDRIVER_OBJECT DriverObject,
-  PUNICODE_STRING RegistryPath)
-{
-  UNIMPLEMENTED;
-
-  return STATUS_SUCCESS;
-}
-
-/*
- * @implemented
- */
-BOOLEAN
-NTAPI
-HalInitSystem(IN ULONG BootPhase,
-              IN PLOADER_PARAMETER_BLOCK LoaderBlock)
-{
-    PKPRCB Prcb = KeGetCurrentPrcb();
-
-    /* Check the boot phase */
-    if (!BootPhase)
-    {
-        /* Phase 0... save bus type */
-        HalpBusType = LoaderBlock->u.I386.MachineType & 0xFF;
-
-        /* Get command-line parameters */
-        HalpGetParameters(LoaderBlock);
-
-        /* Checked HAL requires checked kernel */
-#if DBG
-        if (!(Prcb->BuildType & PRCB_BUILD_DEBUG))
-        {
-            /* No match, bugcheck */
-            KeBugCheckEx(MISMATCHED_HAL, 2, Prcb->BuildType, 1, 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)
-        {
-            /* Validation failed, bugcheck */
-            KeBugCheckEx(MISMATCHED_HAL, 1, Prcb->MajorVersion, 1, 0);
-        }
-DPRINT1("HalInitSystem 2\n");
-        /* Initialize the PICs */
-        HalpInitPICs();
-DPRINT1("HalInitSystem 3\n");
-        /* Force initial PIC state */
-        KfRaiseIrql(KeGetCurrentIrql());
-DPRINT1("HalInitSystem 4\n");
-        /* Initialize the clock */
-        HalpInitializeClock();
-DPRINT1("HalInitSystem 5\n");
-        /* Setup busy waiting */
-        //HalpCalibrateStallExecution();
-
-        /* Fill out the dispatch tables */
-        HalQuerySystemInformation = HaliQuerySystemInformation;
-        HalSetSystemInformation = HaliSetSystemInformation;
-        HalInitPnpDriver = NULL; // FIXME: TODO
-//        HalGetDmaAdapter = HalpGetDmaAdapter;
-        HalGetInterruptTranslator = NULL;  // FIXME: TODO
-//        HalResetDisplay = HalpBiosDisplayReset;
-DPRINT1("HalInitSystem 6\n");
-        /* Initialize the hardware lock (CMOS) */
-        KeInitializeSpinLock(&HalpSystemHardwareLock);
-
-        /* Do some HAL-specific initialization */
-        HalpInitPhase0(LoaderBlock);
-    }
-    else if (BootPhase == 1)
-    {
-        /* Initialize the default HAL stubs for bus handling functions */
-        HalpInitNonBusHandler();
-
-        /* Enable the clock interrupt */
-        PKIDTENTRY64 IdtEntry = &((PKIPCR)KeGetPcr())->IdtBase[0x30];
-        IdtEntry->OffsetLow = (((ULONG_PTR)HalpClockInterrupt) & 0xFFFF);
-        IdtEntry->OffsetMiddle = (((ULONG_PTR)HalpClockInterrupt >> 16) & 0xFFFF);
-        IdtEntry->OffsetHigh = ((ULONG_PTR)HalpClockInterrupt >> 32);
-//        HalEnableSystemInterrupt(0x30, CLOCK_LEVEL, Latched);
-
-        /* Initialize DMA. NT does this in Phase 0 */
-        HalpInitDma();
-
-        /* Do some HAL-specific initialization */
-        HalpInitPhase1();
-    }
-
-    /* All done, return */
-    return TRUE;
-}
-
-/*
- * @unimplemented
- */
-VOID
-NTAPI
-HalReportResourceUsage(VOID)
-{
-    /* Initialize PCI bus. */
-    HalpInitializePciBus();
-
-    /* FIXME: This is done in ReactOS MP HAL only*/
-    //HaliReconfigurePciInterrupts();
-
-    /* FIXME: Report HAL Usage to kernel */
-}
-
-/* EOF */
diff --git a/reactos/hal/halamd64/generic/irq.S b/reactos/hal/halamd64/generic/irq.S
deleted file mode 100644 (file)
index 1d5bb59..0000000
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * FILE:            hal/halx86/generic/irq.S
- * COPYRIGHT:       See COPYING in the top level directory
- * PURPOSE:         Software, System and Hardware IRQ Management
- * PROGRAMMER:      Alex Ionescu (alex@relsoft.net)
- */
-
-/* INCLUDES ******************************************************************/
-
-#include <asm.h>
-#include <internal/i386/asmmacro.S>
-.intel_syntax noprefix
-
-.macro UNIMPLEMENTED func
-    jmp 2f
-1:
-    .ascii "Sorry, asm function "
-    .ascii func
-    .ascii " is unimplemented!\n\0"
-2:
-    movabs rcx, offset 1b
-    call _DbgPrint
-    ret
-.endm
-
-
-
-/* GLOBALS *******************************************************************/
-
-
-
-/* FUNCTIONS *****************************************************************/
-
-.globl _HalpInitPICs
-.func _HalpInitPICs
-_HalpInitPICs:
-    UNIMPLEMENTED "HalpInitPICs"
-.endfunc
-
-.global _HalEnableInterrupt
-.func _HalEnableInterrupt
-_HalEnableInterrupt:
-    UNIMPLEMENTED "HalEnableInterrupt"
-.endfunc
-
-.global _HalDisableInterrupt
-.func _HalDisableInterrupt
-_HalDisableInterrupt:
-    UNIMPLEMENTED "HalDisableInterrupt"
-.endfunc
-
-.global _HalRequestSoftwareInterrupt
-.func _HalRequestSoftwareInterrupt
-_HalRequestSoftwareInterrupt:
-    UNIMPLEMENTED "HalRequestSoftwareInterrupt"
-.endfunc
-
-.global _HalSendSoftwareInterrupt
-.func _HalSendSoftwareInterrupt
-_HalSendSoftwareInterrupt:
-    UNIMPLEMENTED "HalSendSoftwareInterrupt"
-.endfunc
-
-.global _HalEndSystemInterrupt
-.func _HalEndSystemInterrupt
-_HalEndSystemInterrupt:
-    UNIMPLEMENTED "HalEndSystemInterrupt"
-.endfunc
-
-
-.globl _HalClearSoftwareInterrupt
-.func _HalClearSoftwareInterrupt
-_HalClearSoftwareInterrupt:
-    UNIMPLEMENTED "HalClearSoftwareInterrupt"
-
-    /* Get IRR mask */
-    mov eax, 1
-    shl eax, cl
-    not eax
-
-    /* Set IRR */
-//    and gs:[KPCR_IRR], eax
-    ret
-.endfunc
-
-.globl _HalBeginSystemInterrupt
-.func _HalBeginSystemInterrupt
-_HalBeginSystemInterrupt:
-    UNIMPLEMENTED "HalBeginSystemInterrupt"
-.endfunc
-
diff --git a/reactos/hal/halamd64/generic/misc.c b/reactos/hal/halamd64/generic/misc.c
deleted file mode 100644 (file)
index 5c6f1ba..0000000
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * PROJECT:         ReactOS HAL
- * LICENSE:         GPL - See COPYING in the top level directory
- * FILE:            hal/halx86/generic/misc.c
- * PURPOSE:         Miscellanous Routines
- * PROGRAMMERS:     Alex Ionescu (alex.ionescu@reactos.org)
- *                  Eric Kohl
- */
-
-/* INCLUDES ******************************************************************/
-
-#include <hal.h>
-#define NDEBUG
-#include <debug.h>
-
-/* PRIVATE FUNCTIONS *********************************************************/
-
-VOID
-NTAPI
-HalpCheckPowerButton(VOID)
-{
-    /* Nothing to do on non-ACPI */
-    return;
-}
-
-PVOID
-NTAPI
-HalpMapPhysicalMemory64(IN PHYSICAL_ADDRESS PhysicalAddress,
-                        IN ULONG NumberPage)
-{
-    /* Use kernel memory manager I/O map facilities */
-    return MmMapIoSpace(PhysicalAddress,
-                        NumberPage << PAGE_SHIFT,
-                        MmNonCached);
-}
-
-VOID
-NTAPI
-HalpUnmapVirtualAddress(IN PVOID VirtualAddress,
-                        IN ULONG NumberPages)
-{
-    /* Use kernel memory manager I/O map facilities */
-    MmUnmapIoSpace(VirtualAddress, NumberPages << PAGE_SHIFT);
-}
-
-/* FUNCTIONS *****************************************************************/
-
-/*
- * @implemented
- */
-VOID
-NTAPI
-HalHandleNMI(IN PVOID NmiInfo)
-{
-    UCHAR ucStatus;
-
-    /* Get the NMI Flag */
-    ucStatus = READ_PORT_UCHAR((PUCHAR)0x61);
-
-    /* Display NMI failure string */
-    HalDisplayString ("\n*** Hardware Malfunction\n\n");
-    HalDisplayString ("Call your hardware vendor for support\n\n");
-
-    /* Check for parity error */
-    if (ucStatus & 0x80)
-    {
-        /* Display message */
-        HalDisplayString ("NMI: Parity Check / Memory Parity Error\n");
-    }
-
-    /* Check for I/O failure */
-    if (ucStatus & 0x40)
-    {
-        /* Display message */
-        HalDisplayString ("NMI: Channel Check / IOCHK\n");
-    }
-
-    /* Halt the system */
-    HalDisplayString("\n*** The system has halted ***\n");
-    //KeEnterKernelDebugger();
-}
-
-/*
- * @implemented
- */
-UCHAR
-FASTCALL
-HalSystemVectorDispatchEntry(IN ULONG Vector,
-                             OUT PKINTERRUPT_ROUTINE **FlatDispatch,
-                             OUT PKINTERRUPT_ROUTINE *NoConnection)
-{
-    /* Not implemented on x86 */
-    return FALSE;
-}
-
-/*
- * @implemented
- */
-VOID
-NTAPI
-KeFlushWriteBuffer(VOID)
-{
-    /* Not implemented on x86 */
-    return;
-}
diff --git a/reactos/hal/halamd64/generic/mps.S b/reactos/hal/halamd64/generic/mps.S
deleted file mode 100644 (file)
index 219d651..0000000
+++ /dev/null
@@ -1,95 +0,0 @@
-/* 
- * COPYRIGHT:       See COPYING in the top level directory
- * PROJECT:         ReactOS kernel
- * FILE:            ntoskrnl/hal/amd64/generic/mps.S
- * PURPOSE:         Intel MultiProcessor specification support
- * PROGRAMMER:      Casper S. Hornstrup (chorns@users.sourceforge.net)
- */
-
-/* INCLUDES ******************************************************************/
-
-#include <ndk/asm.h>
-
-/* FUNCTIONS *****************************************************************/
-
-#define BEFORE \
-  cld; \
-  pushq %rax; \
-  pushq %rbx; \
-  pushq %rcx; \
-  pushq %rdx; \
-  pushq %rsi; \
-  pushq %rdi; \
-  pushq %fs; \
-  pushq %gs; \
-  
-#define AFTER \
-  popq  %gs; \
-  popq  %fs; \
-  popq  %rdi; \
-  popq  %rsi; \
-  popq  %rdx; \
-  popq  %rcx; \
-  popq  %rbx; \
-  popq  %rax; \
-
-#ifdef CONFIG_SMP
-.global _MpsIpiInterrupt
-_MpsIpiInterrupt:
-    /* Save registers */       
-    BEFORE
-
-    /* Call the C handler */
-    call  _MpsIpiHandler
-
-    /* Return to the caller */
-    AFTER
-    iret
-#endif
-  
-.globl _MpsErrorInterrupt
-_MpsErrorInterrupt:
-    /* Save registers */       
-    BEFORE
-
-    /* Call the C handler */
-    call  _MpsErrorHandler
-
-    /* Return to the caller */
-    AFTER
-    iret
-
-
-.globl _MpsSpuriousInterrupt
-_MpsSpuriousInterrupt:
-    /* Save registers */       
-    BEFORE
-
-    /* Call the C handler */
-    call  _MpsSpuriousHandler
-
-    /* Return to the caller */
-    AFTER
-    iret
-
-.global _MpsTimerInterrupt
-_MpsTimerInterrupt:
-    /* Save registers */       
-    BEFORE
-
-    movl       $0xef,%ebx              
-       movl    $0xceafbeef,%eax
-       pushq   %rax
-       pushq   %rsp
-       pushq   %rbx
-       call    _MpsTimerHandler
-       popq    %rax
-       popq    %rax
-       popq    %rax
-
-    /* Return to the caller */
-       AFTER
-       iret
-  
-  
-/* EOF */
diff --git a/reactos/hal/halamd64/generic/systimer.S b/reactos/hal/halamd64/generic/systimer.S
deleted file mode 100644 (file)
index 298cea2..0000000
+++ /dev/null
@@ -1,258 +0,0 @@
-/*
- * FILE:            hal/halx86/generic/timer.S
- * COPYRIGHT:       See COPYING in the top level directory
- * PURPOSE:         System Timer Interrupt and Management
- * PROGRAMMER:      Alex Ionescu (alex@relsoft.net)
- */
-
-/* INCLUDES ******************************************************************/
-
-#include <asm.h>
-#include <internal/i386/asmmacro.S>
-.intel_syntax noprefix
-
-/* GLOBALS *******************************************************************/
-
-_HalpLastPerfCounterLow:    .long 0
-_HalpLastPerfCounterHigh:   .long 0
-_HalpPerfCounterLow:        .long 0
-_HalpPerfCounterHigh:       .long 0
-
-_UnhandledMsg:
-    .asciz "\n\x7\x7!!! Unhandled or Unexpected Code at line: %lx!!!\n"
-
-/* FUNCTIONS *****************************************************************/
-
-.globl _KeStallExecutionProcessor
-.func KeStallExecutionProcessor
-_KeStallExecutionProcessor:
-
-    /* Get the number of microseconds required */
-    jecxz Done
-
-    /* Multiply by the stall factor */
-    mov eax, gs:[KPCR_STALL_SCALE_FACTOR]
-    mul ecx
-
-    /* Align to 16 bytes */
-    .align 16
-
-    /* Jump to subtraction loop */
-    jmp SubtractLoop
-
-    /* Align to 16 bytes */
-    .align 16
-
-    /* Subtract one count */
-SubtractLoop:
-    sub eax, 1
-    jnz SubtractLoop
-
-Done:
-    /* Return */
-    ret 4
-.endfunc
-
-.global _KeQueryPerformanceCounter
-.func KeQueryPerformanceCounter
-_KeQueryPerformanceCounter:
-
-    /* Check if we were called too early */
-    cmp dword ptr _HalpCurrentRollOver, 0
-    je NoCount
-
-    /* Save volatiles */
-    push rbx
-    push rsi
-
-LoopPreInt:
-
-    /* Disable interrupts */
-    pushf
-    cli
-
-LoopPostInt:
-
-    /* Get the current value */
-    mov ebx, _HalpPerfCounterLow
-    mov esi, _HalpPerfCounterHigh
-
-    /* Read 8254 timer */
-    mov al, 0
-    out 0x43, al
-    jmp $+2
-    in al, 0x40
-    jmp $+2
-    movzx ecx, al
-    in al, 0x40
-    mov ch, al
-
-    /* Enable interrupts and do a short wait */
-    popf
-    nop
-    jmp $+2
-
-    /* Disable them again */
-    pushf
-    cli
-
-    /* Get the counter value again */
-    mov eax, _HalpPerfCounterLow
-    mov edx, _HalpPerfCounterHigh
-
-    /* Check if someone updated the counter */
-    cmp eax, ebx
-    jnz LoopPostInt
-    cmp edx, esi
-    jnz LoopPostInt
-
-    /* Check if the current 8254 value causes rollover */
-    neg ecx
-    add ecx, _HalpCurrentRollOver
-    jnb DoRollOver
-
-SetSum:
-
-    /* Calculate the sum */
-    add eax, ecx
-    adc edx, 0
-
-    /* Check if we're above or below the last high value */
-    cmp edx, _HalpLastPerfCounterHigh
-    jb short BelowHigh
-    jnz short BelowLow
-
-    /* Check if we're above or below the last low value */
-    cmp eax, _HalpLastPerfCounterLow
-    jb BelowHigh
-
-BelowLow:
-
-    /* Update the last value and bring back interrupts */
-    mov _HalpLastPerfCounterLow, eax
-    mov _HalpLastPerfCounterHigh, edx
-    popf
-
-    /* Check if caller wants frequency */
-    cmp dword ptr [esp+12], 0
-    jz ReturnNoFreq
-
-    /* Save hard-coded frequency */
-    mov ecx, dword ptr [esp+12]
-    mov dword ptr [ecx], 1193182
-    mov dword ptr [ecx+4], 0
-
-ReturnNoFreq:
-
-    /* Restore volatiles */
-    pop rsi
-    pop rbx
-    ret 4
-
-NoCount:
-
-    /* Return empty, called too soon */
-    mov eax, 0
-    mov edx, 0
-    ret 4
-
-DoRollOver:
-
-    /* We might have an incoming interrupt, save EFLAGS and reset rollover */
-    mov esi, [esp]
-    mov ecx, _HalpCurrentRollOver
-    popf
-
-    /* Check if interrupts were enabled and try again */
-    test esi, EFLAGS_INTERRUPT_MASK
-    jnz LoopPreInt
-
-    /* They're not, continue where we left */
-    pushf
-    jmp SetSum
-
-BelowHigh:
-
-    /* Get the last counter values */
-    mov ebx, _HalpLastPerfCounterLow
-    mov esi, _HalpLastPerfCounterHigh
-
-    /* Check if the previous value was 0 and go back if yes */
-    mov ecx, ebx
-    or ecx, esi
-    jz BelowLow
-
-    /* Make sure that the count is still valid */
-    sub ebx, eax
-    sbb esi, edx
-    jnz InvalidCount
-    cmp ebx, _HalpCurrentRollOver
-    jg InvalidCount
-
-    /* Fixup the count with the last known value */
-    sub eax, ebx
-    sbb edx, esi
-
-    /* We might have an incoming interrupt, save EFLAGS */
-    mov ecx, [esp]
-    popf
-
-    /* Check if interrupts were enabled and try again */
-    test ecx, EFLAGS_INTERRUPT_MASK
-    jnz LoopPreInt
-
-    /* They're not, continue where we left */
-    pushf
-    jmp BelowLow
-
-InvalidCount:
-    popf
-    xor eax, eax
-    mov _HalpLastPerfCounterLow, eax
-    mov _HalpLastPerfCounterHigh, eax
-    jmp LoopPreInt
-.endfunc
-
-.globl _HalpClockInterrupt
-.func HalpClockInterrupt
-//TRAP_FIXUPS hci_a, hci_t, DoFixupV86, DoFixupAbios
-_HalpClockInterrupt:
-
-    /* Enter trap */
-//    INT_PROLOG hci_a, hci_t, DoPushFakeErrorCode
-
-    /* Push vector and make stack for IRQL */
-    push 0x30
-    sub esp, 4
-
-    /* Begin the interrupt */
-    push rsp
-    push 0x30
-    push CLOCK_LEVEL
-//    call _HalBeginSystemInterrupt
-
-    /* Check if it's spurious */
-    or al, al
-    jz Spurious
-
-    /* Update the performance counter */
-    xor ebx, ebx
-    mov eax, _HalpCurrentRollOver
-    add _HalpPerfCounterLow, eax
-    adc _HalpPerfCounterHigh, ebx
-
-    /* Get the time increment and check if someone changed the clock rate */
-    mov eax, _HalpCurrentTimeIncrement
-    cmp _HalpClockSetMSRate, ebx
-    jz _KeUpdateSystemTime
-
-    /* FIXME: Someone did! */
-    int 3
-
-Spurious:
-
-    /* Exit the interrupt */
-    add esp, 8
-//    jmp _Kei386EoiHelper
-.endfunc
-
diff --git a/reactos/hal/halamd64/hal_generic.c b/reactos/hal/halamd64/hal_generic.c
deleted file mode 100644 (file)
index a5aa448..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * PROJECT:         ReactOS HAL
- * LICENSE:         GPL - See COPYING in the top level directory
- * FILE:            hal/halamd64/
- * PURPOSE:         I/O HAL Routines for Disk Access
- * PROGRAMMERS:     Timo Kreuzer (timo.kreuzer@reactos.org)
- */
-
-/* INCLUDES ******************************************************************/
-
-#include <hal.h>
-#define NDEBUG
-#include <debug.h>
-
-/* FUNCTIONS *****************************************************************/
-
-
-
-
-NTSTATUS
-NTAPI
-HalpSetPartitionInformation(IN PDEVICE_OBJECT DeviceObject,
-                            IN ULONG SectorSize,
-                            IN ULONG PartitionNumber,
-                            IN ULONG PartitionType)
-{
-    /* Call the kernel */
-    return IoSetPartitionInformation(DeviceObject,
-                                     SectorSize,
-                                     PartitionNumber,
-                                     PartitionType);
-}
-
-
diff --git a/reactos/hal/halamd64/hal_generic.rbuild b/reactos/hal/halamd64/hal_generic.rbuild
deleted file mode 100644 (file)
index c350c68..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd">
-<group>
-       <module name="hal_generic" type="objectlibrary">
-               <include>include</include>
-               <include base="ntoskrnl">include</include>
-               <define name="_NTHAL_" />
-               <file>hal_generic.c</file>
-       </module>
-</group>
diff --git a/reactos/hal/halamd64/include/bus.h b/reactos/hal/halamd64/include/bus.h
deleted file mode 100644 (file)
index 9f58d40..0000000
+++ /dev/null
@@ -1,296 +0,0 @@
-#ifndef __INTERNAL_HAL_BUS_H
-#define __INTERNAL_HAL_BUS_H
-
-//
-// Helper Macros
-//
-#define PASTE2(x,y)                                                     x ## y
-#define POINTER_TO_(x)                                                  PASTE2(P,x)
-#define READ_FROM(x)                                                    PASTE2(READ_PORT_, x)
-#define WRITE_TO(x)                                                     PASTE2(WRITE_PORT_, x)
-
-//
-// Declares a PCI Register Read/Write Routine
-//
-#define TYPE_DEFINE(x, y)                                               \
-    ULONG                                                               \
-    NTAPI                                                               \
-    x(                                                                  \
-        IN PPCIPBUSDATA BusData,                                        \
-        IN y PciCfg,                                                    \
-        IN PUCHAR Buffer,                                               \
-        IN ULONG Offset                                                 \
-    )
-#define TYPE1_DEFINE(x) TYPE_DEFINE(x, PPCI_TYPE1_CFG_BITS);
-#define TYPE2_DEFINE(x) TYPE_DEFINE(x, PPCI_TYPE2_ADDRESS_BITS);
-
-//
-// Defines a PCI Register Read/Write Type 1 Routine Prologue and Epilogue
-//
-#define TYPE1_START(x, y)                                               \
-    TYPE_DEFINE(x, PPCI_TYPE1_CFG_BITS)                                 \
-{                                                                       \
-    ULONG i = Offset % sizeof(ULONG);                                   \
-    PciCfg->u.bits.RegisterNumber = Offset / sizeof(ULONG);             \
-    WRITE_PORT_ULONG(BusData->Config.Type1.Address, PciCfg->u.AsULONG);
-#define TYPE1_END(y)                                                    \
-    return sizeof(y); }
-#define TYPE2_END       TYPE1_END
-
-//
-// PCI Register Read Type 1 Routine
-//
-#define TYPE1_READ(x, y)                                                \
-    TYPE1_START(x, y)                                                   \
-    *((POINTER_TO_(y))Buffer) =                                         \
-    READ_FROM(y)((POINTER_TO_(y))(ULONG_PTR)(BusData->Config.Type1.Data + i));     \
-    TYPE1_END(y)
-
-//
-// PCI Register Write Type 1 Routine
-//
-#define TYPE1_WRITE(x, y)                                               \
-    TYPE1_START(x, y)                                                   \
-    WRITE_TO(y)((POINTER_TO_(y))(ULONG_PTR)(BusData->Config.Type1.Data + i),       \
-                *((POINTER_TO_(y))Buffer));                             \
-    TYPE1_END(y)
-
-//
-// Defines a PCI Register Read/Write Type 2 Routine Prologue and Epilogue
-//
-#define TYPE2_START(x, y)                                               \
-    TYPE_DEFINE(x, PPCI_TYPE2_ADDRESS_BITS)                             \
-{                                                                       \
-    PciCfg->u.bits.RegisterNumber = (USHORT)Offset;
-
-//
-// PCI Register Read Type 2 Routine
-//
-#define TYPE2_READ(x, y)                                                \
-    TYPE2_START(x, y)                                                   \
-    *((POINTER_TO_(y))Buffer) =                                         \
-        READ_FROM(y)((POINTER_TO_(y))(ULONG_PTR)PciCfg->u.AsUSHORT);        \
-    TYPE2_END(y)
-
-//
-// PCI Register Write Type 2 Routine
-//
-#define TYPE2_WRITE(x, y)                                               \
-    TYPE2_START(x, y)                                                   \
-    WRITE_TO(y)((POINTER_TO_(y))(ULONG_PTR)PciCfg->u.AsUSHORT,              \
-                *((POINTER_TO_(y))Buffer));                             \
-    TYPE2_END(y)
-
-typedef struct _PCIPBUSDATA
-{
-    PCIBUSDATA CommonData;
-    union
-    {
-        struct
-        {
-            PULONG Address;
-            ULONG Data;
-        } Type1;
-        struct
-        {
-            PUCHAR CSE;
-            PUCHAR Forward;
-            ULONG Base;
-        } Type2;
-    } Config;
-    ULONG MaxDevice;
-} PCIPBUSDATA, *PPCIPBUSDATA;
-
-typedef ULONG
-(NTAPI *FncConfigIO)(
-    IN PPCIPBUSDATA BusData,
-    IN PVOID State,
-    IN PUCHAR Buffer,
-    IN ULONG Offset
-);
-
-typedef VOID
-(NTAPI *FncSync)(
-    IN PBUS_HANDLER BusHandler,
-    IN PCI_SLOT_NUMBER Slot,
-    IN PKIRQL Irql,
-    IN PVOID State
-);
-
-typedef VOID
-(NTAPI *FncReleaseSync)(
-    IN PBUS_HANDLER BusHandler,
-    IN KIRQL Irql
-);
-
-typedef struct _PCI_CONFIG_HANDLER
-{
-    FncSync Synchronize;
-    FncReleaseSync ReleaseSynchronzation;
-    FncConfigIO ConfigRead[3];
-    FncConfigIO ConfigWrite[3];
-} PCI_CONFIG_HANDLER, *PPCI_CONFIG_HANDLER;
-
-typedef struct _PCI_REGISTRY_INFO_INTERNAL
-{
-    UCHAR MajorRevision;
-    UCHAR MinorRevision;
-    UCHAR NoBuses;
-    UCHAR HardwareMechanism;
-    ULONG ElementCount;
-    PCI_CARD_DESCRIPTOR CardList[ANYSIZE_ARRAY];
-} PCI_REGISTRY_INFO_INTERNAL, *PPCI_REGISTRY_INFO_INTERNAL;
-
-/* FUNCTIONS *****************************************************************/
-
-VOID
-NTAPI
-HalpPCISynchronizeType1(
-    IN PBUS_HANDLER BusHandler,
-    IN PCI_SLOT_NUMBER Slot,
-    IN PKIRQL Irql,
-    IN PPCI_TYPE1_CFG_BITS PciCfg
-);
-
-VOID
-NTAPI
-HalpPCIReleaseSynchronzationType1(
-    IN PBUS_HANDLER BusHandler,
-    IN KIRQL Irql
-);
-
-VOID
-NTAPI
-HalpPCISynchronizeType2(
-    IN PBUS_HANDLER BusHandler,
-    IN PCI_SLOT_NUMBER Slot,
-    IN PKIRQL Irql,
-    IN PPCI_TYPE2_ADDRESS_BITS PciCfg
-);
-
-VOID
-NTAPI
-HalpPCIReleaseSynchronizationType2(
-    IN PBUS_HANDLER BusHandler,
-    IN KIRQL Irql
-);
-
-TYPE1_DEFINE(HalpPCIReadUcharType1);
-TYPE1_DEFINE(HalpPCIReadUshortType1);
-TYPE1_DEFINE(HalpPCIReadUlongType1);
-TYPE2_DEFINE(HalpPCIReadUcharType2);
-TYPE2_DEFINE(HalpPCIReadUshortType2);
-TYPE2_DEFINE(HalpPCIReadUlongType2);
-TYPE1_DEFINE(HalpPCIWriteUcharType1);
-TYPE1_DEFINE(HalpPCIWriteUshortType1);
-TYPE1_DEFINE(HalpPCIWriteUlongType1);
-TYPE2_DEFINE(HalpPCIWriteUcharType2);
-TYPE2_DEFINE(HalpPCIWriteUshortType2);
-TYPE2_DEFINE(HalpPCIWriteUlongType2);
-
-BOOLEAN
-NTAPI
-HalpValidPCISlot(
-    IN PBUS_HANDLER BusHandler,
-    IN PCI_SLOT_NUMBER Slot
-);
-
-VOID
-NTAPI
-HalpReadPCIConfig(
-    IN PBUS_HANDLER BusHandler,
-    IN PCI_SLOT_NUMBER Slot,
-    IN PVOID Buffer,
-    IN ULONG Offset,
-    IN ULONG Length
-);
-
-VOID
-NTAPI
-HalpWritePCIConfig(
-    IN PBUS_HANDLER BusHandler,
-    IN PCI_SLOT_NUMBER Slot,
-    IN PVOID Buffer,
-    IN ULONG Offset,
-    IN ULONG Length
-);
-
-ULONG
-NTAPI
-HalpGetSystemInterruptVector(
-    ULONG BusNumber,
-    ULONG BusInterruptLevel,
-    ULONG BusInterruptVector,
-    PKIRQL Irql,
-    PKAFFINITY Affinity
-);
-
-ULONG
-NTAPI
-HalpGetCmosData(
-    IN ULONG BusNumber,
-    IN ULONG SlotNumber,
-    IN PVOID Buffer,
-    IN ULONG Length
-);
-
-ULONG
-NTAPI
-HalpSetCmosData(
-    IN ULONG BusNumber,
-    IN ULONG SlotNumber,
-    IN PVOID Buffer,
-    IN ULONG Length
-);
-
-ULONG
-NTAPI
-HalpGetPCIData(
-    IN PBUS_HANDLER BusHandler,
-    IN PBUS_HANDLER RootBusHandler,
-    IN PCI_SLOT_NUMBER SlotNumber,
-    IN PUCHAR Buffer,
-    IN ULONG Offset,
-    IN ULONG Length
-);
-
-ULONG
-NTAPI
-HalpSetPCIData(
-    IN PBUS_HANDLER BusHandler,
-    IN PBUS_HANDLER RootBusHandler,
-    IN PCI_SLOT_NUMBER SlotNumber,
-    IN PUCHAR Buffer,
-    IN ULONG Offset,
-    IN ULONG Length
-);
-
-NTSTATUS
-NTAPI
-HalpAssignPCISlotResources(
-    IN PBUS_HANDLER BusHandler,
-    IN PBUS_HANDLER RootHandler,
-    IN PUNICODE_STRING RegistryPath,
-    IN PUNICODE_STRING DriverClassName OPTIONAL,
-    IN PDRIVER_OBJECT DriverObject,
-    IN PDEVICE_OBJECT DeviceObject OPTIONAL,
-    IN ULONG Slot,
-    IN OUT PCM_RESOURCE_LIST *pAllocatedResources
-);
-
-VOID
-NTAPI
-HalpInitializePciBus(
-    VOID
-);
-
-extern ULONG HalpBusType;
-extern BOOLEAN HalpPCIConfigInitialized;
-extern BUS_HANDLER HalpFakePciBusHandler;
-extern ULONG HalpMinPciBus, HalpMaxPciBus;
-
-#endif /* __INTERNAL_HAL_BUS_H */
-
-/* EOF */
-
-
diff --git a/reactos/hal/halamd64/include/hal.h b/reactos/hal/halamd64/include/hal.h
deleted file mode 100644 (file)
index c793782..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * COPYRIGHT:       See COPYING in the top level directory
- * PROJECT:         ReactOS Hardware Abstraction Layer
- * FILE:            hal/halx86/include/hal.h
- * PURPOSE:         HAL Header
- * PROGRAMMER:      Alex Ionescu (alex@relsoft.net)
- */
-
-/* INCLUDES ******************************************************************/
-
-/* C Headers */
-#include <stdio.h>
-
-/* WDK HAL Compilation hack */
-#ifdef _MSC_VER
-#include <excpt.h>
-#include <ntdef.h>
-#undef _NTHAL_
-#undef DECLSPEC_IMPORT
-#define DECLSPEC_IMPORT
-#define __declspec(dllimport)
-#endif
-
-/* IFS/DDK/NDK Headers */
-#include <ntifs.h>
-#include <bugcodes.h>
-#include <ntdddisk.h>
-#include <arc/arc.h>
-#include <iotypes.h>
-#include <kefuncs.h>
-#include <halfuncs.h>
-#include <iofuncs.h>
-#include <ldrtypes.h>
-#include <obfuncs.h>
-
-/* Internal kernel headers */
-#include "internal/pci.h"
-#include "internal/i386/intrin_i.h"
-
-/* Internal HAL Headers */
-//#include "apic.h"
-#include "bus.h"
-//#include "halirq.h"
-//#include "haldma.h"
-#include "halp.h"
-//#include "mps.h"
-//#include "ioapic.h"
-
-/* Helper Header */
-#include <reactos/helper.h>
-
-/* EOF */
diff --git a/reactos/hal/halamd64/include/halp.h b/reactos/hal/halamd64/include/halp.h
deleted file mode 100644 (file)
index bac9ef1..0000000
+++ /dev/null
@@ -1,172 +0,0 @@
-/*
- *
- */
-
-#ifndef __INTERNAL_HAL_HAL_H
-#define __INTERNAL_HAL_HAL_H
-
-#define HAL_APC_REQUEST         0
-#define HAL_DPC_REQUEST         1
-
-/* CMOS Registers and Ports */
-#define CMOS_CONTROL_PORT       (PUCHAR)0x70
-#define CMOS_DATA_PORT          (PUCHAR)0x71
-#define RTC_REGISTER_A          0x0A
-#define RTC_REGISTER_B          0x0B
-#define RTC_REG_A_UIP           0x80
-#define RTC_REGISTER_CENTURY    0x32
-
-/* Timer Registers and Ports */
-#define TIMER_CONTROL_PORT      0x43
-#define TIMER_DATA_PORT0        0x40
-#define TIMER_SC0               0
-#define TIMER_BOTH              0x30
-#define TIMER_MD2               0x4
-
-/* Conversion functions */
-#define BCD_INT(bcd)            \
-    (((bcd & 0xF0) >> 4) * 10 + (bcd & 0x0F))
-#define INT_BCD(int)            \
-    (UCHAR)(((int / 10) << 4) + (int % 10))
-
-/* adapter.c */
-PADAPTER_OBJECT NTAPI HalpAllocateAdapterEx(ULONG NumberOfMapRegisters,BOOLEAN IsMaster, BOOLEAN Dma32BitAddresses);
-
-/* bus.c */
-VOID NTAPI HalpInitNonBusHandler (VOID);
-
-/* irql.c */
-VOID NTAPI HalpInitPICs(VOID);
-
-/* udelay.c */
-VOID NTAPI HalpInitializeClock(VOID);
-
-/* pci.c */
-VOID HalpInitPciBus (VOID);
-
-/* dma.c */
-VOID HalpInitDma (VOID);
-
-/* Non-generic initialization */
-VOID HalpInitPhase0 (PLOADER_PARAMETER_BLOCK LoaderBlock);
-VOID HalpInitPhase1(VOID);
-VOID NTAPI HalpClockInterrupt(VOID);
-
-//
-// KD Support
-//
-VOID
-NTAPI
-HalpCheckPowerButton(
-    VOID
-);
-
-VOID
-NTAPI
-HalpRegisterKdSupportFunctions(
-    VOID
-);
-
-NTSTATUS
-NTAPI
-HalpSetupPciDeviceForDebugging(
-    IN PVOID LoaderBlock,
-    IN OUT PDEBUG_DEVICE_DESCRIPTOR PciDevice
-);
-
-NTSTATUS
-NTAPI
-HalpReleasePciDeviceForDebugging(
-    IN OUT PDEBUG_DEVICE_DESCRIPTOR PciDevice
-);
-
-//
-// Memory routines
-//
-PVOID
-NTAPI
-HalpMapPhysicalMemory64(
-    IN PHYSICAL_ADDRESS PhysicalAddress,
-    IN ULONG NumberPage
-);
-
-VOID
-NTAPI
-HalpUnmapVirtualAddress(
-    IN PVOID VirtualAddress,
-    IN ULONG NumberPages
-);
-
-/* sysinfo.c */
-NTSTATUS
-NTAPI
-HaliQuerySystemInformation(
-    IN HAL_QUERY_INFORMATION_CLASS InformationClass,
-    IN ULONG BufferSize,
-    IN OUT PVOID Buffer,
-    OUT PULONG ReturnedLength
-);
-
-NTSTATUS
-NTAPI
-HaliSetSystemInformation(
-    IN HAL_SET_INFORMATION_CLASS InformationClass,
-    IN ULONG BufferSize,
-    IN OUT PVOID Buffer
-);
-
-//
-// BIOS Routines
-//
-BOOLEAN
-NTAPI
-HalpBiosDisplayReset(
-    VOID
-);
-
-ULONG
-NTAPI
-HalpBorrowTss(
-    VOID
-);
-
-ULONG
-NTAPI
-HalpReturnTss(
-    ULONG SavedTss
-);
-
-VOID
-NTAPI
-HalpBiosCall(
-    VOID
-);
-
-VOID
-NTAPI
-HalpTrap0D(
-    VOID
-);
-
-VOID
-NTAPI
-HalpTrap06(
-    VOID
-);
-
-PDMA_ADAPTER
-NTAPI
-HalpGetDmaAdapter(
-   IN PVOID Context,
-   IN PDEVICE_DESCRIPTION DeviceDescription,
-   OUT PULONG NumberOfMapRegisters);
-
-VOID HaliInitBSP(VOID);
-VOID HaliStartApplicationProcessor(ULONG Cpu, ULONG Stack);
-
-extern PVOID HalpRealModeStart;
-extern PVOID HalpRealModeEnd;
-
-extern KSPIN_LOCK HalpSystemHardwareLock;
-
-#endif /* __INTERNAL_HAL_HAL_H */
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
+++ /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.rbuild b/reactos/hal/halamd64/up/halup.rbuild
deleted file mode 100644 (file)
index c6e85a4..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<module name="halup" type="kernelmodedll" installbase="system32" installname="hal.dll">
-       <importlibrary base="hal" definition="hal_amd64.def" />
-       <bootstrap installbase="$(CDOUTPUT)" nameoncd="hal.dll" />
-       <include base="halup">../include</include>
-       <include base="ntoskrnl">include</include>
-       <define name="_NTHAL_" />
-       <library>hal_generic_amd64</library>
-       <library>hal_generic</library>
-       <library>ntoskrnl</library>
-       <file>halinit_up.c</file>
-       <file>halup.rc</file>
-       <file>processor.c</file>
-</module>
diff --git a/reactos/hal/halamd64/up/halup.rc b/reactos/hal/halamd64/up/halup.rc
deleted file mode 100644 (file)
index 951c358..0000000
+++ /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 669c82b..0000000
+++ /dev/null
@@ -1,87 +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 IDR and stall count */
-//    KeGetPcr()->IDR = 0xFFFFFFFB;
-    KeGetPcr()->StallScaleFactor = INITIAL_STALL_COUNT;
-
-    /* Update the interrupt affinity and processor mask */
-    InterlockedBitTestAndSet(&HalpActiveProcessors, ProcessorNumber);
-    InterlockedBitTestAndSet((PLONG)&HalpDefaultInterruptAffinity,
-                             ProcessorNumber);
-
-    /* Register routines for KDCOM */
-    HalpRegisterKdSupportFunctions();
-}
-
-/*
- * @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();
-    Ke386HaltProcessor();
-}
-
-/*
- * @implemented
- */
-VOID
-NTAPI
-HalRequestIpi(KAFFINITY TargetSet)
-{
-    /* Not implemented on NT */
-    __debugbreak();
-}
-
-/* EOF */
index 00b6da4..b443905 100644 (file)
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<module name="halarm_up" type="kernelmodedll" installbase="system32" installname="hal.dll">
-       <importlibrary base="hal" definition="hal.pspec" />
+<module name="hal" type="kernelmodedll" entrypoint="HalInitSystem" installbase="system32" installname="hal.dll">
+       <importlibrary base="hal" definition="../../hal.pspec" />
        <bootstrap installbase="$(CDOUTPUT)" nameoncd="hal.dll" />
        <include base="halarm_generic">../include</include>
        <include base="ntoskrnl">include</include>
index fde7583..cd94602 100644 (file)
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<module name="halppc_up" type="kernelmodedll">
-       <importlibrary definition="../../hal/hal.def" />
+<module name="hal" type="kernelmodedll" entrypoint="HalInitSystem">
+       <importlibrary definition="../../hal/hal.pspec" />
        <bootstrap installbase="$(CDOUTPUT)" nameoncd="hal.dll" />
        <include base="halppc_generic">../include</include>
        <include base="ntoskrnl">include</include>
diff --git a/reactos/hal/halx86/directory.rbuild b/reactos/hal/halx86/directory.rbuild
new file mode 100644 (file)
index 0000000..e10afdc
--- /dev/null
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<!DOCTYPE group SYSTEM "../tools/rbuild/project.dtd">
+<group xmlns:xi="http://www.w3.org/2001/XInclude">
+
+       <xi:include href="hal_generic.rbuild" />
+       <xi:include href="hal_generic_up.rbuild" />
+       <xi:include href="hal_generic_mp.rbuild" />
+
+       <if property="ARCH" value="i386">
+               <xi:include href="hal.rbuild" />
+               <xi:include href="halxbox.rbuild" />
+               <if property="BUILD_MP" value="1">
+                       <xi:include href="halmps.rbuild" />
+               </if>
+       </if>
+
+       <if property="ARCH" value="amd64">
+               <xi:include href="halamd64.rbuild" />
+       </if>
+
+</group>
similarity index 73%
rename from reactos/hal/halx86/halup.rbuild
rename to reactos/hal/halx86/hal.rbuild
index 319db42..e4f7ea6 100644 (file)
@@ -1,15 +1,14 @@
 <?xml version="1.0"?>
 <!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd">
 <group xmlns:xi="http://www.w3.org/2001/XInclude">
-       <module name="halup" type="kernelmodedll" entrypoint="0" installname="hal.dll">
-               <importlibrary base="hal" definition="hal.pspec" />
+       <module name="hal" type="kernelmodedll" entrypoint="HalInitSystem@8" installbase="system32" installname="hal.dll">
+               <importlibrary base="hal" definition="../hal.pspec" />
                <bootstrap installbase="$(CDOUTPUT)" />
                <include>include</include>
                <include base="ntoskrnl">include</include>
                <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>
index 95b1b44..1ace165 100644 (file)
@@ -10,6 +10,7 @@
                                <file>bushndlr.c</file>
                                <file>isabus.c</file>
                                <file>halbus.c</file>
+                               <file>pcibus.c</file>
                                <file>pcidata.c</file>
                                <file>sysbus.c</file>
                        </directory>
diff --git a/reactos/hal/halx86/hal_generic_amd64.rbuild b/reactos/hal/halx86/hal_generic_amd64.rbuild
deleted file mode 100644 (file)
index 9d8e760..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd">
-<group>
-       <module name="hal_generic_amd64" type="objectlibrary">
-               <include>include</include>
-               <include base="ntoskrnl">include</include>
-               <define name="_NTHAL_" />
-               <directory name="generic">
-                       <directory name="bus">
-                               <file>bushndlr.c</file>
-                               <file>isabus.c</file>
-                               <file>halbus.c</file>
-                               <file>pcibus.c</file>
-                               <file>pcidata.c</file>
-                               <file>sysbus.c</file>
-                       </directory>
-                       <file>beep.c</file>
-                       <file>cmos.c</file>
-                       <file>dma.c</file>
-                       <file>drive.c</file>
-                       <file>display.c</file>
-                       <file>profil.c</file>
-                       <file>reboot.c</file>
-                       <file>sysinfo.c</file>
-                       <file>timer.c</file>
-               </directory>
-               <directory name="mp">
-                       <file>apic.c</file>
-               </directory>
-               <directory name="include">
-                       <pch>hal.h</pch>
-               </directory>
-       </module>
-</group>
diff --git a/reactos/hal/halx86/hal_generic_mp.rbuild b/reactos/hal/halx86/hal_generic_mp.rbuild
new file mode 100644 (file)
index 0000000..7867574
--- /dev/null
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd">
+<group>
+       <module name="hal_generic_mp" type="objectlibrary">
+               <include>include</include>
+               <include base="ntoskrnl">include</include>
+               <define name="_NTHAL_" />
+               <define name="CONFIG_SMP" />
+               <directory name="mp">
+                       <file>apic.c</file>
+                       <file>halinit_mp.c</file>
+                       <file>ioapic.c</file>
+                       <file>ipi_mp.c</file>
+                       <file>mpconfig.c</file>
+                       <file>processor_mp.c</file>
+                       <file>spinlock.c</file>
+                       <file>halmp.rc</file>
+               </directory>
+       </module>
+</group>
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
+++ /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/halx86/halamd64.rbuild b/reactos/hal/halx86/halamd64.rbuild
new file mode 100644 (file)
index 0000000..8b13789
--- /dev/null
@@ -0,0 +1 @@
+
similarity index 58%
rename from reactos/hal/halx86/halmp.rbuild
rename to reactos/hal/halx86/halmps.rbuild
index 9ba7c68..74a9f82 100644 (file)
@@ -1,28 +1,21 @@
 <?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="0">
-               <importlibrary base="hal" definition="hal.pspec" />
+       <module name="halmps" type="kernelmodedll" entrypoint="HalInitSystem@8">
+               <importlibrary base="hal" definition="../hal.pspec" />
                <bootstrap installbase="$(CDOUTPUT)" />
                <include>include</include>
                <include base="ntoskrnl">include</include>
                <define name="CONFIG_SMP" />
                <define name="_NTHAL_" />
                <library>hal_generic</library>
-               <library>hal_generic_pc</library>
+               <library>hal_generic_mp</library>
                <library>ntoskrnl</library>
                <directory name="mp">
-                       <file>apic.c</file>
-                       <file>halinit_mp.c</file>
-                       <file>ioapic.c</file>
-                       <file>ipi_mp.c</file>
-                       <file>mpconfig.c</file>
                        <file>mps.S</file>
                        <file>mpsboot.asm</file>
                        <file>mpsirql.c</file>
-                       <file>processor_mp.c</file>
-                       <file>spinlock.c</file>
-                       <file>halmp.rc</file>
+
                </directory>
        </module>
 </group>
index 2b5f0de..7996e65 100644 (file)
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd">
 <group xmlns:xi="http://www.w3.org/2001/XInclude">
-       <module name="halxbox" type="kernelmodedll" entrypoint="0">
-               <importlibrary base="hal" definition="hal.pspec" />
+       <module name="halxbox" type="kernelmodedll" entrypoint="HalInitSystem@8">
+               <importlibrary base="hal" definition="../hal.pspec" />
                <include>include</include>
                <include base="ntoskrnl">include</include>
                <define name="_NTHAL_" />
                <library>hal_generic</library>
                <library>hal_generic_up</library>
                <library>ntoskrnl</library>
-               <directory name="generic">
-                       <directory name="bus">
-                               <file>pcibus.c</file>
-                       </directory>
-               </directory>
                <directory name="xbox">
                        <file>halinit_xbox.c</file>
                        <file>part_xbox.c</file>