From: Vizzini <vizzini@plasmic.com>
Date: Wed, 15 Oct 2003 22:16:44 +0000 (+0000)
Subject: merged in MDL fix and a makefile mod from the 0.1.4 release branch.  This represents... 
X-Git-Tag: backups/keyboard_heavy_lifting@12441~259
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=46fe6c1b8473e6e1ddf2026831e438cd640e0bbd;hp=194a827c38f94bc0dc374e306a78918ec42052c7;ds=sidebyside

merged in MDL fix and a makefile mod from the 0.1.4 release branch.  This represents the last of the merging from the branch and officially closes it out.

svn path=/trunk/; revision=6332
---

diff --git a/reactos/Makefile b/reactos/Makefile
index d5579a943ac..589a4d77033 100644
--- a/reactos/Makefile
+++ b/reactos/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.174 2003/10/07 07:47:21 gvg Exp $
+# $Id: Makefile,v 1.175 2003/10/15 22:16:43 vizzini Exp $
 #
 # Global makefile
 #
@@ -166,7 +166,6 @@ bootcd_directory_layout: freeldr
 	$(CP) ${FREELDR_DIR}/bootsect/fat32.bin ${BOOTCD_DIR}/loader/fat32.bin
 	$(CP) ${FREELDR_DIR}/bootsect/isoboot.bin ${BOOTCD_DIR}/loader/isoboot.bin
 	$(CP) ${FREELDR_DIR}/freeldr/obj/i386/freeldr.sys ${BOOTCD_DIR}/loader/freeldr.sys
-	$(CP) ${FREELDR_DIR}/FREELDR.INI ${BOOTCD_DIR}/loader/freeldr.ini
 	$(CP) ${FREELDR_DIR}/freeldr/obj/i386/setupldr.sys ${BOOTCD_DIR}/loader/setupldr.sys
 
 bootcd_bootstrap_files: $(COMPONENTS:%=%_bootcd) $(HALS:%=%_bootcd) $(BUS:%=%_bootcd) \
diff --git a/reactos/drivers/storage/class2/class2.c b/reactos/drivers/storage/class2/class2.c
index 4f2a5b4739f..55c3238e594 100644
--- a/reactos/drivers/storage/class2/class2.c
+++ b/reactos/drivers/storage/class2/class2.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: class2.c,v 1.40 2003/09/20 22:44:22 weiden Exp $
+/* $Id: class2.c,v 1.41 2003/10/15 22:16:44 vizzini Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -1880,7 +1880,7 @@ ScsiClassSplitRequest(IN PDEVICE_OBJECT DeviceObject,
   DeviceExtension = DeviceObject->DeviceExtension;
   CurrentStack = IoGetCurrentIrpStackLocation(Irp);
   NextStack = IoGetNextIrpStackLocation(Irp);
-  DataBuffer = MmGetMdlVirtualAddress(Irp->MdlAddress);
+  DataBuffer = MmGetSystemAddressForMdl(Irp->MdlAddress);
 
   /* Initialize transfer data for first request */
   Offset = CurrentStack->Parameters.Read.ByteOffset;