Reverted latest changes.

[reactos.git] / reactos / drivers / storage / scsiport / scsiport.c

diff --git a/reactos/drivers/storage/scsiport/scsiport.c b/reactos/drivers/storage/scsiport/scsiport.c
index d4f3256..a2c6908 100644 (file)
--- a/reactos/drivers/storage/scsiport/scsiport.c
+++ b/reactos/drivers/storage/scsiport/scsiport.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: scsiport.c,v 1.19 2002/09/07 15:12:10 chorns Exp $
+/* $Id: scsiport.c,v 1.20 2002/09/08 10:22:23 chorns Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -28,9 +28,9 @@
 /* INCLUDES *****************************************************************/
 
 #include <ddk/ntddk.h>
-#include <ddk/scsi.h>
-#include <ddk/srb.h>
-#include <ddk/ntddscsi.h>
+#include "../include/srb.h"
+#include "../include/scsi.h"
+#include "../include/ntddscsi.h"
 
 #define NDEBUG
 #include <debug.h>
@@ -247,7 +247,6 @@ ScsiPortCompleteRequest(IN PVOID HwDeviceExtension,
   UNIMPLEMENTED;
 }
 
-#undef ScsiPortConvertPhysicalAddressToUlong
 
 ULONG STDCALL
 ScsiPortConvertPhysicalAddressToUlong(IN SCSI_PHYSICAL_ADDRESS Address)
@@ -1160,12 +1159,12 @@ ScsiPortCreatePortDevice(IN PDRIVER_OBJECT DriverObject,
   PortCapabilities->MaximumTransferLength =
     PortDeviceExtension->PortConfig.MaximumTransferLength;
   PortCapabilities->MaximumPhysicalPages =
-    PortCapabilities->MaximumTransferLength / PAGE_SIZE;
+    PortCapabilities->MaximumTransferLength / PAGESIZE;
   PortCapabilities->SupportedAsynchronousEvents = 0; /* FIXME */
   PortCapabilities->AlignmentMask =
     PortDeviceExtension->PortConfig.AlignmentMask;
   PortCapabilities->TaggedQueuing =
-    PortDeviceExtension->PortConfig.TaggedQueueing;
+    PortDeviceExtension->PortConfig.TaggedQueuing;
   PortCapabilities->AdapterScansDown =
     PortDeviceExtension->PortConfig.AdapterScansDown;
   PortCapabilities->AdapterUsesPio = TRUE; /* FIXME */