From f66a43b26e6e0f4c1e5871dd3a88f2970b3abf87 Mon Sep 17 00:00:00 2001
From: Jiamin Ma <mjmthy@gmail.com>
Date: Sat, 12 Oct 2013 06:31:55 +0000
Subject: We enabled X64 native version NT32, and made it works on Windows 7
 X64 OS.

Signed-off-by: Jiamin Ma <mjmthy@gmail.com>
Reviewed by: Ruiyu Ni <ruiyu.ni@intel.com>
Reviewed by: Liming Gao <liming.gao@intel.com>
Reviewed by: Jiewen Yao <jiewen.yao@intel.com>


git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@14766 6f19259b-4bc3-4df7-8a09-765794883524
---
 Nt32Pkg/SnpNt32Dxe/SnpNt32.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'Nt32Pkg/SnpNt32Dxe')

diff --git a/Nt32Pkg/SnpNt32Dxe/SnpNt32.c b/Nt32Pkg/SnpNt32Dxe/SnpNt32.c
index 86414696c4..4dee182ad8 100644
--- a/Nt32Pkg/SnpNt32Dxe/SnpNt32.c
+++ b/Nt32Pkg/SnpNt32Dxe/SnpNt32.c
@@ -1,6 +1,6 @@
 /** @file
 
-Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
 which accompanies this distribution.  The full text of the license may be found at
@@ -704,7 +704,7 @@ SnpNt32ReceiveFilters (
   ReturnValue = GlobalData->NtNetUtilityTable.SetReceiveFilter (
                                                 Instance->InterfaceInfo.InterfaceIndex,
                                                 EnableBits,
-                                                McastFilterCount,
+                                                (UINT32)McastFilterCount,
                                                 McastFilter
                                                 );
 
@@ -863,7 +863,7 @@ SnpNt32GetStatus (
 {
 
   if (TxBuffer != NULL) {
-    *((UINT8 **) TxBuffer) = (UINT8 *) 1;
+    *((UINT8 **) TxBuffer) = (UINT8 *)(UINTN) 1;
   }
 
   if (InterruptStatus != NULL) {
@@ -933,8 +933,8 @@ SnpNt32Transmit (
 
   ReturnValue = GlobalData->NtNetUtilityTable.Transmit (
                                                 Instance->InterfaceInfo.InterfaceIndex,
-                                                HeaderSize,
-                                                BufferSize,
+                                                (UINT32)HeaderSize,
+                                                (UINT32)BufferSize,
                                                 Buffer,
                                                 SrcAddr,
                                                 DestAddr,
@@ -1189,7 +1189,7 @@ SnpNt32InitializeGlobalData (
     //
     //  Set the interface information.
     //
-    Instance->InterfaceInfo = NetInterfaceInfoBuffer[Index];
+    CopyMem (&Instance->InterfaceInfo, &NetInterfaceInfoBuffer[Index], sizeof(Instance->InterfaceInfo));
     //
     //  Initialize this instance
     //
@@ -1265,8 +1265,8 @@ SnpNt32InitializeInstanceData (
   //
   //  Copy Current/PermanentAddress MAC address
   //
-  Instance->Mode.CurrentAddress   = Instance->InterfaceInfo.MacAddr;
-  Instance->Mode.PermanentAddress = Instance->InterfaceInfo.MacAddr;
+  CopyMem (&Instance->Mode.CurrentAddress, &Instance->InterfaceInfo.MacAddr, sizeof(Instance->Mode.CurrentAddress));
+  CopyMem (&Instance->Mode.PermanentAddress, &Instance->InterfaceInfo.MacAddr, sizeof(Instance->Mode.PermanentAddress));
 
   //
   //  Since the fake SNP is based on a real NIC, to avoid conflict with the host
-- 
cgit v1.2.3