Netvmin680 fix (#805)

* add NDIS_SUPPORT_NDIS680 in #if directive in adapter.c

* add NDIS_SUPPORT_NDIS680 in #if directive in miniport.c

* fix driver isolation violation 1323 for netvmini680.inf

* fix driver isolation violation 1322 for netvmini680.inf

* set NIC_PHYSICAL_MEDIUM to NdisPhysicalMedium802_3 in hardware.h

* change local type from ULONG to UINT8 to match return type

* Remove AddReg TextModeFlags in inf for netvmini680

4 files changed, 26 insertions, 7 deletions

diff --git a/network/ndis/netvmini/6x/680/netvmini680.inf b/network/ndis/netvmini/6x/680/netvmini680.inf
index 876441f2..ac471b09 100644
--- a/network/ndis/netvmini/6x/680/netvmini680.inf
+++ b/network/ndis/netvmini/6x/680/netvmini680.inf
diff --git a/network/ndis/netvmini/6x/adapter.c b/network/ndis/netvmini/6x/adapter.c
index f1beefc8..3cf0ce59 100644
--- a/network/ndis/netvmini/6x/adapter.c
+++ b/network/ndis/netvmini/6x/adapter.c
@@ -427,11 +427,26 @@ Arguments:
         // Set the power management capabilities.  The format used is NDIS
         // version-specific.
         //
-#if (NDIS_SUPPORT_NDIS620)
+#if (NDIS_SUPPORT_NDIS680)
+
+        NdisZeroMemory(&PmCapabilities, sizeof(PmCapabilities));
+
+        {C_ASSERT(sizeof(PmCapabilities) >= NDIS_SIZEOF_NDIS_PM_CAPABILITIES_REVISION_2); }
+        PmCapabilities.Header.Type = NDIS_OBJECT_TYPE_DEFAULT;
+        PmCapabilities.Header.Size = NDIS_SIZEOF_NDIS_PM_CAPABILITIES_REVISION_2;
+        PmCapabilities.Header.Revision = NDIS_PM_CAPABILITIES_REVISION_2;
+
+        PmCapabilities.MinMagicPacketWakeUp = NIC_MAGIC_PACKET_WAKEUP;
+        PmCapabilities.MinPatternWakeUp = NIC_PATTERN_WAKEUP;
+        PmCapabilities.MinLinkChangeWakeUp = NIC_LINK_CHANGE_WAKEUP;
+
+        AdapterGeneral.PowerManagementCapabilitiesEx = &PmCapabilities;
+
+#elif (NDIS_SUPPORT_NDIS620)
 
         NdisZeroMemory(&PmCapabilities, sizeof(PmCapabilities));
 
-        {C_ASSERT(sizeof(PmCapabilities) >= NDIS_SIZEOF_NDIS_PM_CAPABILITIES_REVISION_1);}
+        {C_ASSERT(sizeof(PmCapabilities) >= NDIS_SIZEOF_NDIS_PM_CAPABILITIES_REVISION_1); }
         PmCapabilities.Header.Type = NDIS_OBJECT_TYPE_DEFAULT;
         PmCapabilities.Header.Size = NDIS_SIZEOF_NDIS_PM_CAPABILITIES_REVISION_1;
         PmCapabilities.Header.Revision = NDIS_PM_CAPABILITIES_REVISION_1;
@@ -2326,4 +2341,4 @@ Return Value:
     {
         *RefCount = Count;
     }
-}
+}
\ No newline at end of file
diff --git a/network/ndis/netvmini/6x/hardware.h b/network/ndis/netvmini/6x/hardware.h
index c3076429..ddc4c4a3 100644
--- a/network/ndis/netvmini/6x/hardware.h
+++ b/network/ndis/netvmini/6x/hardware.h
@@ -90,7 +90,7 @@ C_ASSERT(sizeof(NIC_FRAME_HEADER) == HW_FRAME_HEADER_SIZE);
 #define NIC_MEDIUM_TYPE                    NdisMedium802_3
 
 // If you have physical hardware on 802.3, use NdisPhysicalMedium802_3.
-#define NIC_PHYSICAL_MEDIUM                NdisPhysicalMediumUnspecified
+#define NIC_PHYSICAL_MEDIUM                NdisPhysicalMedium802_3
 
 
 // Set this value to TRUE if there is a physical adapter.
diff --git a/network/ndis/netvmini/6x/miniport.c b/network/ndis/netvmini/6x/miniport.c
index 317f8c54..9ec793af 100644
--- a/network/ndis/netvmini/6x/miniport.c
+++ b/network/ndis/netvmini/6x/miniport.c
@@ -122,8 +122,13 @@ Arguments:
         NdisZeroMemory(&MPChar, sizeof(MPChar));
 
 
-#if (NDIS_SUPPORT_NDIS620)
-        {C_ASSERT(sizeof(MPChar) >= NDIS_SIZEOF_MINIPORT_DRIVER_CHARACTERISTICS_REVISION_2);}
+#if (NDIS_SUPPORT_NDIS680)
+        {C_ASSERT(sizeof(MPChar) >= NDIS_SIZEOF_MINIPORT_DRIVER_CHARACTERISTICS_REVISION_3); }
+        MPChar.Header.Type = NDIS_OBJECT_TYPE_MINIPORT_DRIVER_CHARACTERISTICS;
+        MPChar.Header.Size = NDIS_SIZEOF_MINIPORT_DRIVER_CHARACTERISTICS_REVISION_3;
+        MPChar.Header.Revision = NDIS_MINIPORT_DRIVER_CHARACTERISTICS_REVISION_3;
+#elif (NDIS_SUPPORT_NDIS620)
+        {C_ASSERT(sizeof(MPChar) >= NDIS_SIZEOF_MINIPORT_DRIVER_CHARACTERISTICS_REVISION_2); }
         MPChar.Header.Type = NDIS_OBJECT_TYPE_MINIPORT_DRIVER_CHARACTERISTICS;
         MPChar.Header.Size = NDIS_SIZEOF_MINIPORT_DRIVER_CHARACTERISTICS_REVISION_2;
         MPChar.Header.Revision = NDIS_MINIPORT_DRIVER_CHARACTERISTICS_REVISION_2;
@@ -628,4 +633,3 @@ DbgPrintAddress(
 
 
 #endif //DBG
-