[win-pv-devel] [PATCH 1/2] Update to NDIS 6.1

[Paul Durrant <pdurrant@xxxxxxxxx>]

Signed-off-by: Paul Durrant <paul.durrant@xxxxxxxxxx>
---
 src/xennet/miniport.c        | 52 ++++++++++++++++++++++++++++++++++++++++----
 vs2012/xennet/xennet.vcxproj |  2 +-
 vs2013/xennet/xennet.vcxproj |  2 +-
 3 files changed, 50 insertions(+), 6 deletions(-)

diff --git a/src/xennet/miniport.c b/src/xennet/miniport.c
index 476cee4..5500418 100644
--- a/src/xennet/miniport.c
+++ b/src/xennet/miniport.c
@@ -39,6 +39,22 @@
 #include "assert.h"
 
 static
+_Function_class_(SET_OPTIONS)
+NDIS_STATUS
+MiniportSetOptions(
+    IN  NDIS_HANDLE NdisDriverHandle,
+    IN  NDIS_HANDLE DriverContext
+    )
+{
+    UNREFERENCED_PARAMETER(NdisDriverHandle);
+    UNREFERENCED_PARAMETER(DriverContext);
+
+    Trace("<===>\n");
+
+    return NDIS_STATUS_SUCCESS;
+}
+
+static
 _Function_class_(MINIPORT_INITIALIZE)
 NDIS_STATUS
 MiniportInitializeEx(
@@ -301,6 +317,32 @@ MiniportCancelOidRequest(
     Trace("<===>\n");
 }
 
+static
+_Function_class_(MINIPORT_DIRECT_OID_REQUEST)
+NDIS_STATUS
+MiniportDirectOidRequest(
+    IN  NDIS_HANDLE         MiniportAdapterContext,
+    IN  PNDIS_OID_REQUEST   OidRequest
+    )
+{
+    UNREFERENCED_PARAMETER(MiniportAdapterContext);
+    UNREFERENCED_PARAMETER(OidRequest);
+
+    return NDIS_STATUS_INVALID_OID;
+}
+
+static
+_Function_class_(MINIPORT_CANCEL_DIRECT_OID_REQUEST)
+VOID
+MiniportCancelDirectOidRequest(
+    IN  NDIS_HANDLE MiniportAdapterContext,
+    IN  PVOID       RequestId
+    )
+{
+    UNREFERENCED_PARAMETER(MiniportAdapterContext);
+    UNREFERENCED_PARAMETER(RequestId);
+}
+
 NDIS_STATUS
 MiniportRegister(
     IN  PDRIVER_OBJECT                      DriverObject,
@@ -316,11 +358,11 @@ MiniportRegister(
     NdisZeroMemory(&MiniportDriverCharacteristics, sizeof 
(MiniportDriverCharacteristics));
 
     MiniportDriverCharacteristics.Header.Type = 
NDIS_OBJECT_TYPE_MINIPORT_DRIVER_CHARACTERISTICS,
-    MiniportDriverCharacteristics.Header.Size = 
NDIS_SIZEOF_MINIPORT_DRIVER_CHARACTERISTICS_REVISION_1;
-    MiniportDriverCharacteristics.Header.Revision = 
NDIS_MINIPORT_DRIVER_CHARACTERISTICS_REVISION_1;
+    MiniportDriverCharacteristics.Header.Size = 
NDIS_SIZEOF_MINIPORT_DRIVER_CHARACTERISTICS_REVISION_2;
+    MiniportDriverCharacteristics.Header.Revision = 
NDIS_MINIPORT_DRIVER_CHARACTERISTICS_REVISION_2;
 
-    MiniportDriverCharacteristics.MajorNdisVersion = 6;
-    MiniportDriverCharacteristics.MinorNdisVersion = 0;
+    MiniportDriverCharacteristics.MajorNdisVersion = 
NDIS_MINIPORT_MAJOR_VERSION;
+    MiniportDriverCharacteristics.MinorNdisVersion = 
NDIS_MINIPORT_MINOR_VERSION;
     MiniportDriverCharacteristics.MajorDriverVersion = MAJOR_VERSION;
     MiniportDriverCharacteristics.MinorDriverVersion = MINOR_VERSION;
     MiniportDriverCharacteristics.Flags = NDIS_WDM_DRIVER;
@@ -339,6 +381,8 @@ MiniportRegister(
     MiniportDriverCharacteristics.SendNetBufferListsHandler = 
MiniportSendNetBufferLists;
     MiniportDriverCharacteristics.ShutdownHandlerEx = MiniportShutdownEx;
     MiniportDriverCharacteristics.UnloadHandler = MiniportDriverUnload;
+    MiniportDriverCharacteristics.DirectOidRequestHandler = 
MiniportDirectOidRequest;
+    MiniportDriverCharacteristics.CancelDirectOidRequestHandler = 
MiniportCancelDirectOidRequest;
 
     NdisStatus = NdisMRegisterMiniportDriver(DriverObject,
                                              RegistryPath,
diff --git a/vs2012/xennet/xennet.vcxproj b/vs2012/xennet/xennet.vcxproj
index 8c1862e..d69391e 100644
--- a/vs2012/xennet/xennet.vcxproj
+++ b/vs2012/xennet/xennet.vcxproj
@@ -32,7 +32,7 @@
        
     <ItemDefinitionGroup>
                <ClCompile>
-                       
<PreprocessorDefinitions>__MODULE__="XENNET";NDIS_MINIPORT_DRIVER;NDIS_WDM=1;NDIS60_MINIPORT=1;POOL_NX_OPTIN=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+                       
<PreprocessorDefinitions>__MODULE__="XENNET";NDIS_MINIPORT_DRIVER;NDIS_WDM=1;NDIS61_MINIPORT=1;POOL_NX_OPTIN=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
                        <WarningLevel>EnableAllWarnings</WarningLevel>
                        
<DisableSpecificWarnings>4711;4548;4820;4668;4255;6001;6054;28196;%(DisableSpecificWarnings)</DisableSpecificWarnings>
                        
<MultiProcessorCompilation>true</MultiProcessorCompilation>
diff --git a/vs2013/xennet/xennet.vcxproj b/vs2013/xennet/xennet.vcxproj
index 0aa30a6..c50bb44 100644
--- a/vs2013/xennet/xennet.vcxproj
+++ b/vs2013/xennet/xennet.vcxproj
@@ -64,7 +64,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
-      
<PreprocessorDefinitions>__MODULE__="XENNET";NDIS_MINIPORT_DRIVER;NDIS_WDM=1;NDIS60_MINIPORT=1;POOL_NX_OPTIN=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      
<PreprocessorDefinitions>__MODULE__="XENNET";NDIS_MINIPORT_DRIVER;NDIS_WDM=1;NDIS61_MINIPORT=1;POOL_NX_OPTIN=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <WarningLevel>EnableAllWarnings</WarningLevel>
       
<DisableSpecificWarnings>4711;4548;4820;4668;4255;6001;6054;28196;%(DisableSpecificWarnings)</DisableSpecificWarnings>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
-- 
2.1.1


_______________________________________________
win-pv-devel mailing list
win-pv-devel@xxxxxxxxxxxxxxxxxxxx
http://lists.xenproject.org/cgi-bin/mailman/listinfo/win-pv-devel