From fdcebd514369fb66c0fcbb453e9800841f03d7f7 Mon Sep 17 00:00:00 2001
From: Timo Kreuzer <timo.kreuzer@reactos.org>
Date: Thu, 24 Jul 2008 14:26:53 +0000
Subject: [PATCH] hal: fix HalRequestIpi prototype, comment out IO access
 functions for amd64, add hal_amd64.def and a tiny amd64/hal_generic.c

svn path=/branches/ros-amd64-bringup/; revision=34743
---
 reactos/hal/hal.rbuild                  |  5 ++
 reactos/hal/hal/hal.c                   |  5 +-
 reactos/hal/hal/hal_amd64.def           | 69 +++++++++++++++++++++++++
 reactos/hal/halamd64/hal_generic.c      | 34 ++++++++++++
 reactos/hal/halamd64/hal_generic.rbuild | 11 ++++
 5 files changed, 122 insertions(+), 2 deletions(-)
 create mode 100644 reactos/hal/hal/hal_amd64.def
 create mode 100644 reactos/hal/halamd64/hal_generic.c
 create mode 100644 reactos/hal/halamd64/hal_generic.rbuild

diff --git a/reactos/hal/hal.rbuild b/reactos/hal/hal.rbuild
index b2f85e41607..34a2e86248b 100644
--- a/reactos/hal/hal.rbuild
+++ b/reactos/hal/hal.rbuild
@@ -24,4 +24,9 @@
 			<xi:include href="halarm/directory.rbuild" />
 		</directory>
 	</if>
+	<if property="ARCH" value="amd64">
+		<directory name="halamd64">
+			<xi:include href="halamd64/hal_generic.rbuild" />
+		</directory>
+	</if>
 </group>
diff --git a/reactos/hal/hal/hal.c b/reactos/hal/hal/hal.c
index 8d09ee9981f..1e963ec8dfa 100644
--- a/reactos/hal/hal/hal.c
+++ b/reactos/hal/hal/hal.c
@@ -466,7 +466,7 @@ HalReportResourceUsage(VOID)
 VOID
 NTAPI
 HalRequestIpi(
-  ULONG Unknown)
+    KAFFINITY TargetSet)
 {
   UNIMPLEMENTED;
 }
@@ -932,7 +932,7 @@ KfReleaseSpinLock(
   UNIMPLEMENTED;
 }
 
-
+#if !defined(_M_AMD64)
 VOID
 NTAPI
 READ_PORT_BUFFER_UCHAR(
@@ -1058,6 +1058,7 @@ WRITE_PORT_USHORT(
 {
   UNIMPLEMENTED;
 }
+#endif
 
 KIRQL
 FASTCALL
diff --git a/reactos/hal/hal/hal_amd64.def b/reactos/hal/hal/hal_amd64.def
new file mode 100644
index 00000000000..27f67d97045
--- /dev/null
+++ b/reactos/hal/hal/hal_amd64.def
@@ -0,0 +1,69 @@
+; Hardware Abstraction Layer - ReactOS Operating System
+
+LIBRARY hal.dll
+
+EXPORTS
+HalAcquireDisplayOwnership
+HalAdjustResourceList
+HalAllProcessorsStarted
+HalAllocateAdapterChannel
+HalAllocateCommonBuffer
+HalAllocateCrashDumpRegisters
+HalAssignSlotResources
+HalCalibratePerformanceCounter
+;HalCallBios
+HalClearSoftwareInterrupt
+HalDisableSystemInterrupt
+HalDisplayString
+HalEnableSystemInterrupt
+HalFlushCommonBuffer
+HalFreeCommonBuffer
+HalGetAdapter
+HalGetBusData
+HalGetBusDataByOffset
+HalGetEnvironmentVariable
+HalGetInterruptVector
+;HalHandleMcheck
+HalHandleNMI
+HalInitSystem
+HalInitializeProcessor
+;HalIsHyperThreadingEnabled
+HalMakeBeep
+HalProcessorIdle
+HalQueryDisplayParameters
+HalQueryRealTimeClock
+HalReadDmaCounter
+HalReportResourceUsage
+HalRequestIpi
+HalRequestSoftwareInterrupt
+HalReturnToFirmware
+;HalSendNMI
+;HalSendSoftwareInterrupt
+HalSetBusData
+HalSetBusDataByOffset
+HalSetDisplayParameters
+HalSetEnvironmentVariable
+HalSetProfileInterval
+HalSetRealTimeClock
+HalSetTimeIncrement
+HalStartNextProcessor
+HalStartProfileInterrupt
+HalStopProfileInterrupt
+HalSystemVectorDispatchEntry
+HalTranslateBusAddress
+;IoAssignDriveLetters
+IoFlushAdapterBuffers
+IoFreeAdapterChannel
+IoFreeMapRegisters
+IoMapTransfer
+;IoReadPartitionTable
+;IoSetPartitionInformation
+;IoWritePartitionTable
+;KdComPortInUse
+KeFlushWriteBuffer
+KeQueryPerformanceCounter
+KeStallExecutionProcessor
+;x86BiosExecuteInterrupt
+;x86BiosInitializeBiosEx
+;x86BiosTranslateAddress
+;DllEntryPoint
diff --git a/reactos/hal/halamd64/hal_generic.c b/reactos/hal/halamd64/hal_generic.c
new file mode 100644
index 00000000000..a5aa4488c65
--- /dev/null
+++ b/reactos/hal/halamd64/hal_generic.c
@@ -0,0 +1,34 @@
+/*
+ * 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
new file mode 100644
index 00000000000..1e0fdc00088
--- /dev/null
+++ b/reactos/hal/halamd64/hal_generic.rbuild
@@ -0,0 +1,11 @@
+<?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="_DISABLE_TIDENTS" />
+		<define name="_NTHAL_" />
+		<file>hal_generic.c</file>
+	</module>
+</group>