From 5e4ab4ede768b7e1b20799c83260998de0110d80 Mon Sep 17 00:00:00 2001
From: Timo Kreuzer <timo.kreuzer@reactos.org>
Date: Wed, 23 Jun 2010 21:06:00 +0000
Subject: [PATCH] [SCSIPORT] - undefine macros that are defined by DDK headers,
 before implementing the functions - add missing definitions for amd64

svn path=/trunk/; revision=47838
---
 reactos/drivers/storage/scsiport/scsiport.c |  6 ++++-
 reactos/drivers/storage/scsiport/stubs.c    | 25 +++++++++++++++++++++
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/reactos/drivers/storage/scsiport/scsiport.c b/reactos/drivers/storage/scsiport/scsiport.c
index 3e3fb5488e8..c1fe5f63384 100644
--- a/reactos/drivers/storage/scsiport/scsiport.c
+++ b/reactos/drivers/storage/scsiport/scsiport.c
@@ -45,6 +45,8 @@
 
 ULONG InternalDebugLevel = 0x00;
 
+#undef ScsiPortMoveMemory
+
 /* TYPES *********************************************************************/
 
 /* GLOBALS *******************************************************************/
@@ -216,7 +218,9 @@ SpiHandleAttachRelease(PSCSI_PORT_DEVICE_EXTENSION DeviceExtension,
 static NTSTATUS
 SpiAllocateCommonBuffer(PSCSI_PORT_DEVICE_EXTENSION DeviceExtension, ULONG NonCachedSize);
 
-
+NTHALAPI ULONG NTAPI HalGetBusData(BUS_DATA_TYPE, ULONG, ULONG, PVOID, ULONG);
+NTHALAPI ULONG NTAPI HalGetInterruptVector(INTERFACE_TYPE, ULONG, ULONG, ULONG, PKIRQL, PKAFFINITY);
+NTHALAPI NTSTATUS NTAPI HalAssignSlotResources(PUNICODE_STRING, PUNICODE_STRING, PDRIVER_OBJECT, PDEVICE_OBJECT, INTERFACE_TYPE, ULONG, ULONG, PCM_RESOURCE_LIST *);
 
 /* FUNCTIONS *****************************************************************/
 
diff --git a/reactos/drivers/storage/scsiport/stubs.c b/reactos/drivers/storage/scsiport/stubs.c
index 478c35b4d08..b4bc2f5ed25 100644
--- a/reactos/drivers/storage/scsiport/stubs.c
+++ b/reactos/drivers/storage/scsiport/stubs.c
@@ -14,6 +14,31 @@
 #define NDEBUG
 #include <debug.h>
 
+#undef ScsiPortReadPortBufferUchar
+#undef ScsiPortReadPortBufferUshort
+#undef ScsiPortReadPortBufferUlong
+#undef ScsiPortReadPortUchar
+#undef ScsiPortReadPortUshort
+#undef ScsiPortReadPortUlong
+#undef ScsiPortReadRegisterBufferUchar
+#undef ScsiPortReadRegisterBufferUshort
+#undef ScsiPortReadRegisterBufferUlong
+#undef ScsiPortReadRegisterUchar
+#undef ScsiPortReadRegisterUshort
+#undef ScsiPortReadRegisterUlong
+#undef ScsiPortWritePortBufferUchar
+#undef ScsiPortWritePortBufferUshort
+#undef ScsiPortWritePortBufferUlong
+#undef ScsiPortWritePortUchar
+#undef ScsiPortWritePortUshort
+#undef ScsiPortWritePortUlong
+#undef ScsiPortWriteRegisterBufferUchar
+#undef ScsiPortWriteRegisterBufferUshort
+#undef ScsiPortWriteRegisterBufferUlong
+#undef ScsiPortWriteRegisterUchar
+#undef ScsiPortWriteRegisterUshort
+#undef ScsiPortWriteRegisterUlong
+
 SCSI_PHYSICAL_ADDRESS
 NTAPI
 ScsiPortConvertUlongToPhysicalAddress(