Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Netvmin680 fix #805

Merged
merged 7 commits into from
Dec 3, 2022
Merged

Netvmin680 fix #805

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
74dc589
add NDIS_SUPPORT_NDIS680 in #if directive in adapter.c
kahashimoto-ms Nov 22, 2022
b3376b9
add NDIS_SUPPORT_NDIS680 in #if directive in miniport.c
kahashimoto-ms Nov 22, 2022
dce19f6
fix driver isolation violation 1323 for netvmini680.inf
kahashimoto-ms Nov 22, 2022
f7620f3
fix driver isolation violation 1322 for netvmini680.inf
kahashimoto-ms Nov 22, 2022
1eb0f70
set NIC_PHYSICAL_MEDIUM to NdisPhysicalMedium802_3 in hardware.h
kahashimoto-ms Nov 22, 2022
927b0f2
change local type from ULONG to UINT8 to match return type
kahashimoto-ms Nov 22, 2022
44c73b6
Remove AddReg TextModeFlags in inf for netvmini680
kahashimoto-ms Dec 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified network/ndis/netvmini/6x/680/netvmini680.inf
View file
Open in desktop
Binary file not shown.
21 changes: 18 additions & 3 deletions network/ndis/netvmini/6x/adapter.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -427,11 +427,26 @@ Routine Description:
// 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;
Expand Down Expand Up @@ -2326,4 +2341,4 @@ Return Value:
{
*RefCount = Count;
}
}
}
2 changes: 1 addition & 1 deletion network/ndis/netvmini/6x/hardware.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
10 changes: 7 additions & 3 deletions network/ndis/netvmini/6x/miniport.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,13 @@ Routine Description:
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;
Expand Down Expand Up @@ -628,4 +633,3 @@ DbgPrintAddress(


#endif //DBG

2 changes: 1 addition & 1 deletion network/ndis/netvmini/6x/rssv2.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ Return Value:

--*/
{
ULONG index;
UINT8 index;
PNDIS_RSS_PROCESSOR processor;

for (index = 0;
Expand Down